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

Mp server test

See merge request quanshu/mp-server!272

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

@@ -104,27 +104,11 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		List<UserDeliverOrderItemVO> orderItems = userDeliverOrderItemService.selectUserDeliverOrderItemVOList(userDeliverOrderVO.getOrderId());
 		userDeliverOrderVO.setItems(orderItems);
 		// 获取物流详情
-		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId(), orderItems));
+		userDeliverOrderVO.setDeliverList(userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), orderItems));
 		return AjaxResult.success(userDeliverOrderVO);
 	}
 
-	// 获取用户提货订单物流封装列表
-	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 (UserDeliverOrderItemVO item : orderItems) {
-				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
-					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
-					BeanUtils.copyProperties(item, flowItem);
-					itemVO.getItems().add(flowItem);
-				}
-			}
-		}
-		return itemList;
-	}
+
 
 	/**
 	 * 订单发货

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

@@ -1,6 +1,8 @@
 package com.qs.mp.web.controller.api.user;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.mp.channel.domain.ChannelOrder;
 import com.qs.mp.channel.domain.ChannelOrderItem;
@@ -12,6 +14,8 @@ import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.service.IDeliveryCompanyService;
+import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.redis.RedisKey;
 import com.qs.mp.pay.service.IWalletService;
 import com.qs.mp.user.domain.UserAddr;
@@ -29,12 +33,15 @@ import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import javax.validation.Valid;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -62,6 +69,9 @@ public class UserDeliverOrderController extends BaseApiController {
   @Autowired
   private IWalletService walletService;
 
+  @Autowired
+  private IDeliveryCompanyService deliveryCompanyService;
+
   @Autowired
   private MapperFacade mapperFacade;
 
@@ -75,16 +85,22 @@ public class UserDeliverOrderController extends BaseApiController {
   @ApiOperation(value = "订单列表" , notes = "获取所有订单信息")
   public TableDataInfo list(@RequestBody JSONObject param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
-    Integer status = param.getInteger("status");
+    String status = param.getString("status");
+    List<Integer> statusList = new ArrayList<>();
+    if (StringUtils.isNotBlank(status)) {
+      String[] arr = status.split(",");
+      for (int i = 0; i < arr.length; i++) {
+        statusList.add(Integer.valueOf(arr[i]));
+      }
+    }
     startPage();
     List<UserDeliverOrder> deliverOrders = userDeliverOrderService.list(
         new LambdaQueryWrapper<UserDeliverOrder>().eq(UserDeliverOrder::getUserId, userId)
-            .eq(null != status, UserDeliverOrder::getStatus, status)
+            .in(!CollectionUtils.isEmpty(statusList), UserDeliverOrder::getStatus, statusList)
             .orderByDesc(UserDeliverOrder::getCreatedTime));
     List<DeliverOrderVO> deliverOrderVOList = mapperFacade.mapAsList(deliverOrders, DeliverOrderVO.class);
     for (DeliverOrderVO deliverOrderVO : deliverOrderVOList) {
-      deliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-          .eq(UserDeliverOrderItem::getOrderId, deliverOrderVO.getOrderId())));
+      deliverOrderVO.setItems(userDeliverOrderItemService.selectUserDeliverOrderItemVOList(deliverOrderVO.getOrderId()));
     }
     TableDataInfo rspData = getDataTable(deliverOrders);
     rspData.setRows(deliverOrderVOList);
@@ -101,8 +117,8 @@ public class UserDeliverOrderController extends BaseApiController {
     UserDeliverOrder deliverOrder = userDeliverOrderService.getOne(new LambdaQueryWrapper<UserDeliverOrder>()
         .eq(UserDeliverOrder::getOrderId, order.getOrderId()).eq(UserDeliverOrder::getUserId, userId));
     DeliverOrderVO deliverOrderVO = mapperFacade.map(deliverOrder, DeliverOrderVO.class);
-    deliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-        .eq(UserDeliverOrderItem::getOrderId, deliverOrderVO.getOrderId())));
+    deliverOrderVO.setItems(userDeliverOrderItemService.selectUserDeliverOrderItemVOList(deliverOrder.getOrderId()));
+    deliverOrderVO.setDeliverList(userDeliverOrderItemService.getDeliverItemList(order.getOrderId(), deliverOrderVO.getItems()));
     return AjaxResult.success(deliverOrderVO);
   }
 

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

@@ -11,5 +11,7 @@ import lombok.Data;
  */
 @Data
 public class DeliverOrderVO extends UserDeliverOrder {
-  List<UserDeliverOrderItem> items;
+  List<UserDeliverOrderItemVO> items;
+  // 物流信息
+  List<OrderDeliverItemVO> deliverList;
 }

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

@@ -21,21 +21,30 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IUserDeliverOrderItemService extends IService<UserDeliverOrderItem> {
 
-	
+
 	/**
 	 * 获取用户提货订单物流列表信息
-	 * 
-	 * @param wrapper
+	 *
+	 * @param orderId
 	 * @return
 	 */
-	public List<OrderDeliverItemVO> selectOrderDeliverItemVOList(String orderId);
-	
+	List<OrderDeliverItemVO> selectOrderDeliverItemVOList(String orderId);
+
 	/**
 	 * 获取用户提货订单明细列表信息
-	 * 
-	 * @param wrapper
+	 *
+	 * @param orderId
+	 * @return
+	 */
+	List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(String orderId);
+
+
+	/**
+	 * 查询发货列表
+	 * @param orderId
+	 * @param orderItems
 	 * @return
 	 */
-	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(String orderId);
-	
+	List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems);
+
 }

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

@@ -7,8 +7,10 @@ import com.qs.mp.user.mapper.UserDeliverOrderItemMapper;
 import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -31,4 +33,22 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 	public List<UserDeliverOrderItemVO> selectUserDeliverOrderItemVOList(String orderId) {
 		return getBaseMapper().selectUserDeliverOrderItemVOList(orderId);
 	}
+
+	@Override
+	public List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItemVO> orderItems) {
+		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
+		// 1.查询物流公司信息
+		itemList = selectOrderDeliverItemVOList(orderId);
+		// 2.查询物流包裹内的商品信息
+		for (OrderDeliverItemVO itemVO : itemList) {
+			for (UserDeliverOrderItemVO item : orderItems) {
+				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
+					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
+					BeanUtils.copyProperties(item, flowItem);
+					itemVO.getItems().add(flowItem);
+				}
+			}
+		}
+		return itemList;
+	}
 }