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

提货订单增加供应商筛选条件

See merge request quanshu/mp-server!745

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

@@ -95,12 +95,16 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		queryWrapper.eq(null != queryParam && null != queryParam.getResource(), "t1.`resource`", queryParam.getResource());
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
+		queryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t3.supplier_id", queryParam.getSupplierId());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t3.title", queryParam.getTitle());
 		queryWrapper.orderByDesc("t1.order_id");
 		List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 		for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
-			List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+			QueryWrapper<UserDeliverOrderItemVO> userDeliverOrderItemVOQueryWrapper = new QueryWrapper<>();
+			userDeliverOrderItemVOQueryWrapper.eq("t1.order_id", userDeliverOrderVO.getOrderId());
+			userDeliverOrderItemVOQueryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t1.supplier_id", queryParam.getSupplierId());
+			List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOListByQueryWrapper(userDeliverOrderItemVOQueryWrapper);
 			userDeliverOrderVO.setItems(orderItems);
 		}
 		TableDataInfo rspData = getDataTable(userDeliverOrderVOList);
@@ -282,6 +286,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		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.eq(null != queryParam && null != queryParam.getResource(), "t1.`resource`", queryParam.getResource());
+		queryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t3.supplier_id", queryParam.getSupplierId());
 		queryWrapper.ge(null != queryParam && null != queryParam.getStartTime(), "t1.created_time", queryParam.getStartTime());
 		queryWrapper.le(null != queryParam && null != queryParam.getEndTime(), "t1.created_time", queryParam.getEndTime());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getNickName()), "t2.nick_name", queryParam.getNickName());
@@ -298,7 +303,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 				queryWrapper.last("limit " + (i * pageSize) + ", " + pageSize);
 				List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 				for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
-					List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+					QueryWrapper<UserDeliverOrderItemVO> userDeliverOrderItemVOQueryWrapper = new QueryWrapper<>();
+					userDeliverOrderItemVOQueryWrapper.eq("t1.order_id", userDeliverOrderVO.getOrderId());
+					userDeliverOrderItemVOQueryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t1.supplier_id", queryParam.getSupplierId());
+					List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOListByQueryWrapper(userDeliverOrderItemVOQueryWrapper);
 					userDeliverOrderVO.setItems(orderItems);
 				}
 				if (null != userDeliverOrderVOList && userDeliverOrderVOList.size() > 0) {
@@ -308,7 +316,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		} else {
 			listAll = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 			for (UserDeliverOrderVO userDeliverOrderVO : listAll) {
-				List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+				QueryWrapper<UserDeliverOrderItemVO> userDeliverOrderItemVOQueryWrapper = new QueryWrapper<>();
+				userDeliverOrderItemVOQueryWrapper.eq("t1.order_id", userDeliverOrderVO.getOrderId());
+				userDeliverOrderItemVOQueryWrapper.eq(null != queryParam && null != queryParam.getSupplierId(), "t1.supplier_id", queryParam.getSupplierId());
+				List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOListByQueryWrapper(userDeliverOrderItemVOQueryWrapper);
 				userDeliverOrderVO.setItems(orderItems);
 			}
 		}

mp-service/src/main/java/com/qs/mp/admin/domain/param/UserDeliverOrderQueryParam.java

@@ -32,6 +32,9 @@ public class UserDeliverOrderQueryParam {
 	@ApiModelProperty(value = "收货人手机号", required = false)
 	private String tel;
 
+	@ApiModelProperty("供应商id")
+	private Long supplierId;
+
 	/**
 	 * 下单区间-开始时间
 	 */

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

@@ -1,5 +1,7 @@
 package com.qs.mp.user.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
 import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
@@ -31,4 +33,11 @@ public interface UserDeliverOrderItemMapper extends BaseMapper<UserDeliverOrderI
 	 * @return
 	 */
 	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(@Param("orderId") String orderId);
+
+	/**
+	 * 根据条件查询订单明细信息
+	 * @param queryWrapper
+	 * @return
+	 */
+    List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOListByQueryWrapper(@Param(Constants.WRAPPER) QueryWrapper<UserDeliverOrderItemVO> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderItemService.java

@@ -1,5 +1,6 @@
 package com.qs.mp.user.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
@@ -47,4 +48,10 @@ public interface IUserDeliverOrderItemService extends IService<UserDeliverOrderI
 	 */
 	List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems);
 
+	/**
+	 * 根据条件查询订单明细信息
+	 * @param userDeliverOrderItemVOQueryWrapper
+	 * @return
+	 */
+    List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOListByQueryWrapper(QueryWrapper<UserDeliverOrderItemVO> queryWrapper);
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderItemServiceImpl.java

@@ -1,6 +1,7 @@
 package com.qs.mp.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
@@ -38,6 +39,11 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 		return getBaseMapper().selectUserDeliverOrderItemVOList(orderId);
 	}
 
+	@Override
+	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOListByQueryWrapper(QueryWrapper<UserDeliverOrderItemVO> queryWrapper) {
+		return getBaseMapper().selectUserDeliverOrderItemVOListByQueryWrapper(queryWrapper);
+	}
+
 	@Override
 	public List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems) {
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -45,4 +45,14 @@
 		where t1.order_id = #{orderId}
 	</select>
 
+    <select id="selectUserDeliverOrderItemVOListByQueryWrapper"
+            resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
+        select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url,t3.goods_code,t3.value goodsValue,t3.cost goodsCost,t4.value skuValue,t4.sku_code,t5.name supplierName
+        from mp_user_deliver_order_item t1
+        left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
+        left join mp_goods t3 on t1.goods_id = t3.goods_id
+        LEFT JOIN mp_goods_sku t4 on t1.sku_id = t4.sku_id
+        LEFT JOIN mp_supplier t5 on t1.supplier_id = t5.id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

mp-service/src/main/resources/mapper/user/UserDeliverOrderMapper.xml

@@ -33,6 +33,7 @@
 		from mp_user_deliver_order t1
 		left join sys_user t2 on t1.user_id = t2.user_id
 		left join mp_user_deliver_order_item t3 on t1.order_id = t3.order_id
+        left join mp_supplier t4 on t3.supplier_id = t4.id
 		${ew.customSqlSegment}
 	</select>
 	
@@ -43,6 +44,7 @@
 		from mp_user_deliver_order t1
 		left join sys_user t2 on t1.user_id = t2.user_id
 		left join mp_user_deliver_order_item t3 on t1.order_id = t3.order_id
+        left join mp_supplier t4 on t3.supplier_id = t4.id
 		${ew.customSqlSegment}
 	</select>