Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!256

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

@@ -81,23 +81,20 @@ public class ChannelOrderMgrController extends BaseApiController {
   @PreAuthorize("@ss.hasPermi('order:channel:list')")
   public TableDataInfo list(@RequestBody ChannelOrderQueryParam queryParam) {
     startPage();
-    LambdaQueryWrapper<ChannelOrder> queryWrapper = new LambdaQueryWrapper<ChannelOrder>();
-    queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), ChannelOrder::getChannelId ,queryParam.getChannelId());
-    queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), ChannelOrder::getOrderId ,queryParam.getOrderId());
-	queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), ChannelOrder::getStatus ,queryParam.getStatus());
-	queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(),  ChannelOrder::getCreatedTime, queryParam.getStartTime());
-	queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), ChannelOrder::getCreatedTime, queryParam.getEndTime());
-	queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), ChannelOrder::getTitle, queryParam.getTitle());
-    queryWrapper.orderByDesc(ChannelOrder::getCreatedTime);
-    List<ChannelOrder> channelOrders = channelOrderService.list(queryWrapper);
-    List<ChannelOrderVO> channelOrderVOList = mapperFacade.mapAsList(channelOrders, ChannelOrderVO.class);
+    QueryWrapper<ChannelOrder> queryWrapper = new QueryWrapper<ChannelOrder>();
+    queryWrapper.eq(null != queryParam && null != queryParam.getChannelId(), "t1.channel_id" ,queryParam.getChannelId());
+    queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getOrderId()), "t1.order_id" ,queryParam.getOrderId());
+	queryWrapper.eq(null != queryParam && null != queryParam.getStatus(), "t1.`status`" ,queryParam.getStatus());
+	queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(),  "t1.create_time", queryParam.getStartTime());
+	queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.create_time", queryParam.getEndTime());
+	queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t1.title", queryParam.getTitle());
+    queryWrapper.orderByDesc("t1.order_id");
+    List<ChannelOrderVO> channelOrderVOList = channelOrderService.selectChannelOrderVoList(queryWrapper);
     for (ChannelOrderVO channelOrderVO : channelOrderVOList) {
       channelOrderVO.setItems(channelOrderItemService.list(new LambdaQueryWrapper<ChannelOrderItem>()
           .eq(ChannelOrderItem::getOrderId, channelOrderVO.getOrderId())));
     }
-    TableDataInfo rspData = getDataTable(channelOrders);
-    rspData.setRows(channelOrderVOList);
-    return rspData;
+    return getDataTable(channelOrderVOList);
   }
 
   /**

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

@@ -11,5 +11,8 @@ import lombok.Data;
  */
 @Data
 public class ChannelOrderVO extends ChannelOrder {
+	
   private List<ChannelOrderItem> items;
+  
+  private String channelName;  // 经销商名称
 }

mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelOrderMapper.java

@@ -1,7 +1,15 @@
 package com.qs.mp.channel.mapper;
 
 import com.qs.mp.channel.domain.ChannelOrder;
+import com.qs.mp.channel.domain.vo.ChannelOrderVO;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 
 /**
  * @auther quanshu
@@ -10,4 +18,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ChannelOrderMapper extends BaseMapper<ChannelOrder> {
 
+
+	/**
+	 * 获取经销商订单列表信息，支持翻页
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public List<ChannelOrderVO> selectChannelOrderVoList(@Param(Constants.WRAPPER) Wrapper<ChannelOrder> wrapper);
 }

mp-service/src/main/java/com/qs/mp/channel/service/IChannelOrderService.java

@@ -4,9 +4,13 @@ import com.qs.mp.channel.domain.ChannelOrder;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.channel.domain.vo.ChannelOrderSettleVO;
+import com.qs.mp.channel.domain.vo.ChannelOrderVO;
 import com.qs.mp.pay.domain.PayOrder;
+import com.qs.mp.user.domain.UserDeliverOrder;
+import com.qs.mp.user.domain.vo.UserDeliverOrderVO;
 
 /**
  * <p>
@@ -49,4 +53,13 @@ public interface IChannelOrderService extends IService<ChannelOrder> {
 	 * @return
 	 */
 	boolean channelOrderShip(ChannelOrder channelOrder, List<String> pkgIdList);
+	
+	
+	/**
+	 * 获取经销商订单列表信息，支持翻页
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public List<ChannelOrderVO> selectChannelOrderVoList(Wrapper<ChannelOrder> wrapper);
 }

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

@@ -1,6 +1,7 @@
 package com.qs.mp.channel.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -15,6 +16,7 @@ import com.qs.mp.channel.domain.ChannelOrderDetail;
 import com.qs.mp.channel.domain.ChannelOrderItem;
 import com.qs.mp.channel.domain.vo.ChannelCartVO;
 import com.qs.mp.channel.domain.vo.ChannelOrderSettleVO;
+import com.qs.mp.channel.domain.vo.ChannelOrderVO;
 import com.qs.mp.channel.mapper.ChannelOrderMapper;
 import com.qs.mp.channel.service.IChannelCartService;
 import com.qs.mp.channel.service.IChannelOrderDetailService;
@@ -273,9 +275,11 @@ public class ChannelOrderServiceImpl extends
 				return updateById(channelOrder);
 			}
 		}
-
 		return false;
 	}
 
-
+	@Override
+	public List<ChannelOrderVO> selectChannelOrderVoList(Wrapper<ChannelOrder> wrapper) {
+		return getBaseMapper().selectChannelOrderVoList(wrapper);
+	}
 }

mp-service/src/main/java/com/qs/mp/user/mapper/UserDeliverOrderMapper.java

@@ -1,7 +1,5 @@
 package com.qs.mp.user.mapper;
 
-import com.qs.mp.channel.domain.Channel;
-import com.qs.mp.channel.domain.vo.ChannelVO;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.vo.UserDeliverOrderVO;
 

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

@@ -31,5 +31,13 @@
     <sql id="Base_Column_List">
         order_id, channel_id, title, order_amt, discount_amt, freight_amt, pay_amt, status, pkg_num, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, delivery_time, created_time, updated_time
     </sql>
+    
+    <!-- 查询用户提货订单列表 -->
+    <select id="selectChannelOrderVoList" resultType="com.qs.mp.channel.domain.vo.ChannelOrderVO">
+		select DISTINCT t1.* , t2.name channelName
+		from mp_channel_order t1
+		left join mp_channel t2 on t1.channel_id = t2.channel_id
+		${ew.customSqlSegment}
+	</select>
 
 </mapper>