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/UserDeliverOrderMgrController.java

@@ -1,6 +1,5 @@
 package com.qs.mp.web.controller.api.admin;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.param.UserDeliverOrderQueryParam;
 import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
@@ -13,6 +12,7 @@ import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.excel.DeliverOrderExcel;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
+import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
 import com.qs.mp.user.domain.vo.UserDeliverOrderVO;
 import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.qs.mp.user.service.IUserDeliverOrderService;
@@ -80,8 +80,8 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		queryWrapper.orderByDesc("t1.order_id");
 		List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 		for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
-			userDeliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-					.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
+			List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+			userDeliverOrderVO.setItems(orderItems);
 		}
 		TableDataInfo rspData = getDataTable(userDeliverOrderVOList);
 		return rspData;
@@ -101,8 +101,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		if (null == userDeliverOrderVO || StringUtils.isBlank(userDeliverOrderVO.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
-		List<UserDeliverOrderItem> orderItems = userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-				.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId()));
+		List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
 		userDeliverOrderVO.setItems(orderItems);
 		// 获取物流详情
 		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId(), orderItems));
@@ -110,15 +109,15 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	}
 
 	// 获取用户提货订单物流封装列表
-	private List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItem> orderItems) {
+	private List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems) {
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
 		// 1.查询物流公司信息
 		itemList = userDeliverOrderItemService.selectOrderDeliverItemVOList(orderId);
 		// 2.查询物流包裹内的商品信息
 		for (OrderDeliverItemVO itemVO : itemList) {
-			for (UserDeliverOrderItem item : orderItems) {
+			for (UserDeliverOrderItemVO item : orderItems) {
 				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
-					UserDeliverOrderItem flowItem = new UserDeliverOrderItem();
+					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
 					BeanUtils.copyProperties(item, flowItem);
 					itemVO.getItems().add(flowItem);
 				}
@@ -186,8 +185,8 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 				queryWrapper.last("limit " + (i * pageSize) + ", " + pageSize);
 				List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 				for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
-					userDeliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-									.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
+					List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+					userDeliverOrderVO.setItems(orderItems);
 				}
 				if (null != userDeliverOrderVOList && userDeliverOrderVOList.size() > 0) {
 					listAll.addAll(userDeliverOrderVOList);
@@ -196,13 +195,13 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		} else {
 			listAll = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 			for (UserDeliverOrderVO userDeliverOrderVO : listAll) {
-				userDeliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-								.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
+				List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
+				userDeliverOrderVO.setItems(orderItems);
 			}
 		}
 
 		if (null != listAll && listAll.size() > 0) {
-			listAll.sort(Comparator.comparing(UserDeliverOrderVO::getOrderId));
+			// listAll.sort(Comparator.comparing(UserDeliverOrderVO::getOrderId));
 			for (UserDeliverOrderVO deliverOrder : listAll) {
 				if (null != deliverOrder && StringUtils.isNotBlank(deliverOrder.getOrderId())
 						&& StringUtils.isNotBlank(deliverOrder.getReceiver())

mp-service/src/main/java/com/qs/mp/user/domain/vo/OrderDeliverItemVO.java

@@ -43,5 +43,5 @@ public class OrderDeliverItemVO {
 	  private Date deliveryTime;
 
 	  // 物流商品清单
-	  List<UserDeliverOrderItem> items = new ArrayList<>();
+	  List<UserDeliverOrderItemVO> items = new ArrayList<>();
 }

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserDeliverOrderItemVO.java

@@ -0,0 +1,26 @@
+package com.qs.mp.user.domain.vo;
+
+import com.qs.mp.user.domain.UserDeliverOrderItem;
+
+import lombok.Data;
+
+/**
+ * @author 用户提货订单物流信息
+ * @Date 2022/3/17
+ */
+@Data
+public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
+
+	  // 物流公司名称
+	  private  String companyName;
+
+	  /**
+	   * 公司主页
+	   */
+	  private String companyHomeUrl;
+
+	  /**
+	   * 物流查询接口
+	   */
+	  private String queryUrl;
+}

mp-service/src/main/java/com/qs/mp/user/domain/vo/UserDeliverOrderVO.java

@@ -1,7 +1,6 @@
 package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrder;
-import com.qs.mp.user.domain.UserDeliverOrderItem;
 import java.util.List;
 import lombok.Data;
 
@@ -11,12 +10,14 @@ import lombok.Data;
  */
 @Data
 public class UserDeliverOrderVO extends UserDeliverOrder {
-  List<UserDeliverOrderItem> items;
-  
-  // 用户昵称
-  private String nickName;
-  
-  // 物流信息
-  List<OrderDeliverItemVO> deliverList;
-  
+
+	// 明细
+	List<UserDeliverOrderItemVO> items;
+
+	// 用户昵称
+	private String nickName;
+
+	// 物流信息
+	List<OrderDeliverItemVO> deliverList;
+
 }

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

@@ -2,6 +2,7 @@ package com.qs.mp.user.mapper;
 
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
+import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
 
 import java.util.List;
 
@@ -22,4 +23,12 @@ public interface UserDeliverOrderItemMapper extends BaseMapper<UserDeliverOrderI
 	 * @return
 	 */
 	public List<OrderDeliverItemVO> selectOrderDeliverItemVOList(@Param("orderId") String orderId);
+	
+	/**
+	 * 获取用户提货订单明细列表信息
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(@Param("orderId") String orderId);
 }

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

@@ -3,6 +3,7 @@ package com.qs.mp.user.service;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
+import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
 import com.qs.mp.user.domain.vo.UserDeliverOrderVO;
 
 import java.util.List;
@@ -29,4 +30,12 @@ public interface IUserDeliverOrderItemService extends IService<UserDeliverOrderI
 	 */
 	public List<OrderDeliverItemVO> selectOrderDeliverItemVOList(String orderId);
 	
+	/**
+	 * 获取用户提货订单明细列表信息
+	 * 
+	 * @param wrapper
+	 * @return
+	 */
+	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(String orderId);
+	
 }

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

@@ -2,6 +2,7 @@ package com.qs.mp.user.service.impl;
 
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
+import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
 import com.qs.mp.user.mapper.UserDeliverOrderItemMapper;
 import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -26,5 +27,8 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 		return getBaseMapper().selectOrderDeliverItemVOList(orderId);
 	}
 
-	
+	@Override
+	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(String orderId) {
+		return getBaseMapper().selectUserDeliverOrderItemVOList(orderId);
+	}
 }

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

@@ -33,5 +33,13 @@
 		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
 		where t1.order_id = #{orderId} and t1.delivery_flow_id is not null
 	</select>
+	
+	 <!-- 查询用户订单明细列表 -->
+    <select id="selectUserDeliverOrderItemVOList" resultType="com.qs.mp.user.domain.vo.UserDeliverOrderItemVO">
+		select t1.*, t2.company_name ,t2.company_home_url ,t2.query_url
+		from mp_user_deliver_order_item t1
+		left join mp_delivery_company t2 on t1.delivery_id = t2.delivery_id
+		where t1.order_id = #{orderId}
+	</select>
 
 </mapper>