Merge branch 'channeloff_0518' into dev

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -141,7 +141,7 @@ public class ChannelOrderServiceImpl extends
     ChannelOrder channelOrder = new ChannelOrder();
     channelOrder.setOrderId(orderId);
     channelOrder.setChannelId(channelId);
-    channelOrder.setTitle(title.substring(0, title.length() - 1));
+    channelOrder.setTitle(title.substring(0, title.length() > 100 ? 100 : title.length() - 1));
     channelOrder.setOrderAmt(orderSettleVO.getOrderAmt());
     channelOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     channelOrder.setFreightAmt(orderSettleVO.getFreightAmt());
@@ -357,6 +357,6 @@ public class ChannelOrderServiceImpl extends
 	public int selectChannelOrderCount(Wrapper<ChannelOrder> wrapper) {
 		return getBaseMapper().selectChannelOrderCount(wrapper);
 	}
-	
-	
+
+
 }