Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

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

@@ -15,6 +15,7 @@ import com.qs.mp.channel.domain.ChannelOrderItem;
 import com.qs.mp.channel.domain.vo.ChannelOrderInfoVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderItemVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderVO;
+import com.qs.mp.channel.domain.vo.ChannelVO;
 import com.qs.mp.channel.service.IChannelOrderDetailService;
 import com.qs.mp.channel.service.IChannelOrderItemService;
 import com.qs.mp.channel.service.IChannelOrderService;
@@ -114,7 +115,7 @@ public class ChannelOrderMgrController extends BaseApiController {
     ChannelOrderInfoVO channelOrderInfoVO = mapperFacade.map(channelOrder, ChannelOrderInfoVO.class);
 
     if(null != channelOrderInfoVO && null != channelOrderInfoVO.getChannelId()) {
-    	Channel channel = channelService.getById(channelOrderInfoVO.getChannelId());
+    	ChannelVO channel = channelService.getChannelVoById(channelOrderInfoVO.getChannelId());
     	channelOrderInfoVO.setChannel(channel);
     }
     if(null != channelOrderInfoVO && null != channelOrderInfoVO.getDeliveryId()) {

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderInfoVO.java

@@ -1,11 +1,7 @@
 package com.qs.mp.channel.domain.vo;
 
-import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelOrder;
-import com.qs.mp.channel.domain.ChannelOrderItem;
 import com.qs.mp.common.domain.DeliveryCompany;
-import com.qs.mp.common.mapper.DeliveryCompanyMapper;
-
 import java.util.List;
 import lombok.Data;
 
@@ -17,7 +13,7 @@ import lombok.Data;
 public class ChannelOrderInfoVO extends ChannelOrder {
 	
   // 渠道名称
-  private Channel channel;
+  private ChannelVO channel;
   
   // 渠道名称
   private DeliveryCompany deliveryCompany;

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelOrderVO.java

@@ -15,6 +15,8 @@ public class ChannelOrderVO extends ChannelOrder {
   private List<ChannelOrderItem> items;
 
   private String channelName;  // 经销商名称
+  
+  private String parentName;  // 上级渠道名称
 
   private String companyName; // 物流公司名称
 }

mp-service/src/main/resources/mapper/channel/ChannelOrderMapper.xml

@@ -34,9 +34,10 @@
     
     <!-- 查询用户提货订单列表 -->
     <select id="selectChannelOrderVoList" resultType="com.qs.mp.channel.domain.vo.ChannelOrderVO">
-		select DISTINCT t1.* , t2.name channelName
+		select DISTINCT t1.* , t2.name channelName, t3.name parentName
 		from mp_channel_order t1
 		left join mp_channel t2 on t1.channel_id = t2.channel_id
+		left join mp_channel t3 on t2.parent_id = t3.channel_id
 		${ew.customSqlSegment}
 	</select>