经销商订单发货接口BUG修复

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/ChannelOrderMgrController.java

@@ -165,10 +165,18 @@ public class ChannelOrderMgrController extends BaseApiController {
 		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
+		
+		ChannelOrder order  = channelOrderService.getById(shipParam.getOrderId());
+		if(null == order || StringUtils.isBlank(order.getOrderId()) 
+				|| null == order.getChannelId()) {
+			return error(ErrorCodeEnum.ERROR_CODE_1001);
+		}
+		
 		if(null != shipParam && null != shipParam.getPkgIds()
 				&& shipParam.getPkgIds().size() > 0) {
 			ChannelOrder channelOrder = new ChannelOrder();
 			channelOrder.setOrderId(shipParam.getOrderId());
+			channelOrder.setChannelId(order.getChannelId());
 			channelOrder.setDeliveryId(shipParam.getDeliveryId());
 			channelOrder.setDeliveryFlowId(shipParam.getDeliveryFlowId());
 			channelOrder.setDeliveryTime(new Date());