Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git

into dev

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

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

@@ -7,39 +7,33 @@ import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
 import com.qs.mp.common.annotation.Log;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
-import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.ErrorCodeEnum;
-import com.qs.mp.pay.service.IWalletService;
 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.UserDeliverOrderVO;
-import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.qs.mp.user.service.IUserDeliverOrderService;
-import com.qs.mp.user.service.IUserPrizeStorageService;
 import com.qs.mp.utils.ExcelUtil;
 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.Comparator;
 import java.util.Date;
 import java.util.List;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
-
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/api/v1/mp/admin/deliver/order")
@@ -53,20 +47,20 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	@Autowired
 	private IUserDeliverOrderItemService userDeliverOrderItemService;
 
-	@Autowired
-	private IUserPrizeStorageService userPrizeStorageService;
-
-	@Autowired
-	private IUserAddrService userAddrService;
-
-	@Autowired
-	private IWalletService walletService;
+//	@Autowired
+//	private IUserPrizeStorageService userPrizeStorageService;
+//
+//	@Autowired
+//	private IUserAddrService userAddrService;
+//
+//	@Autowired
+//	private IWalletService walletService;
 
 	@Autowired
 	private MapperFacade mapperFacade;
 
-	@Autowired
-	private RedisCache redisCache;
+//	@Autowired
+//	private RedisCache redisCache;
 
 	/**
 	 * 用户提货订单列表
@@ -77,10 +71,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	public TableDataInfo list(@RequestBody UserDeliverOrderQueryParam queryParam) {
 		startPage();
 		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<UserDeliverOrder>();
-		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.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.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());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t3.title", queryParam.getTitle());
 		queryWrapper.orderByDesc("t1.order_id");
@@ -104,36 +98,35 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		UserDeliverOrderVO userDeliverOrderVO = userDeliverOrderService.selectUserDeliverOrderVo(order.getOrderId());
-		if(null == userDeliverOrderVO || StringUtils.isBlank(userDeliverOrderVO.getOrderId())) {
+		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<UserDeliverOrderItem> orderItems = userDeliverOrderItemService
+				.list(new LambdaQueryWrapper<UserDeliverOrderItem>().eq(UserDeliverOrderItem::getOrderId,
+						userDeliverOrderVO.getOrderId()));
 		userDeliverOrderVO.setItems(orderItems);
 		// 获取物流详情
-		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId()));
+		userDeliverOrderVO.setDeliverList(getDeliverItemList(order.getOrderId(), orderItems));
 		return AjaxResult.success(userDeliverOrderVO);
 	}
-	
+
 	// 获取用户提货订单物流封装列表
-	private List<OrderDeliverItemVO> getDeliverItemList(String orderId){
+	private List<OrderDeliverItemVO> getDeliverItemList(String orderId, List<UserDeliverOrderItem> orderItems) {
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
 		// 1.查询物流公司信息
 		itemList = userDeliverOrderItemService.selectOrderDeliverItemVOList(orderId);
 		// 2.查询物流包裹内的商品信息
-		if(null != itemList && itemList.size() >0 ) {
-			for(OrderDeliverItemVO itemVO : itemList) {
-				if(null != itemVO && StringUtils.isNotBlank(itemVO.getDeliveryFlowId())) {
-					List<UserDeliverOrderItem> items = userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-							.eq(UserDeliverOrderItem::getOrderId, orderId).eq(UserDeliverOrderItem::getDeliveryFlowId, itemVO.getDeliveryFlowId()));
-					itemVO.setItems(items);
+		for (OrderDeliverItemVO itemVO : itemList) {
+			for (UserDeliverOrderItem item : orderItems) {
+				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
+					UserDeliverOrderItem flowItem = new UserDeliverOrderItem();
+					BeanUtils.copyProperties(item, flowItem);
+					itemVO.getItems().add(flowItem);
 				}
 			}
 		}
 		return itemList;
 	}
-	
 
 	/**
 	 * 订单发货
@@ -143,25 +136,24 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	@ApiOperation(value = "订单发货", notes = "在订单发货页面提交")
 	@PreAuthorize("@ss.hasPermi('order:deliver:ship')")
 	public AjaxResult ship(@RequestBody UserDeliverOrderShipParam shipParam) {
-		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
+		if (null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		List<UserDeliverOrderItem> itemList = new ArrayList<UserDeliverOrderItem>();
-		if(null != shipParam && null != shipParam.getItemIds()
-				&& shipParam.getItemIds().size() > 0) {
+		if (null != shipParam && null != shipParam.getItemIds() && shipParam.getItemIds().size() > 0) {
 			Date deliveryTime = new Date();
-			for(String itemId : shipParam.getItemIds() ) {
-				if(StringUtils.isNotBlank(itemId)) {
+			for (String itemId : shipParam.getItemIds()) {
+				if (StringUtils.isNotBlank(itemId)) {
 					UserDeliverOrderItem item = new UserDeliverOrderItem();
-		        	item.setItemId(itemId);
-		        	item.setDeliveryId(shipParam.getDeliveryId());
-		        	item.setDeliveryFlowId(shipParam.getDeliveryFlowId());
-		        	item.setDeliveryTime(deliveryTime);
-		        	itemList.add(item);
+					item.setItemId(itemId);
+					item.setDeliveryId(shipParam.getDeliveryId());
+					item.setDeliveryFlowId(shipParam.getDeliveryFlowId());
+					item.setDeliveryTime(deliveryTime);
+					itemList.add(item);
 				}
 			}
 		}
-		if(null != itemList && itemList.size() > 0) {
+		if (null != itemList && itemList.size() > 0) {
 			boolean rtn = userDeliverOrderService.userDeliverOrderShip(shipParam.getOrderId(), itemList);
 			return rtn ? AjaxResult.success() : AjaxResult.error("发货失败");
 		}
@@ -177,10 +169,10 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		List<UserDeliverOrderVO> listAll = new ArrayList<UserDeliverOrderVO>();
 		// 首先查询要导出的数据总数
 		QueryWrapper<UserDeliverOrder> queryWrapper = new QueryWrapper<UserDeliverOrder>();
-		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.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.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());
 		queryWrapper.like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), "t3.title", queryParam.getTitle());
 		queryWrapper.orderByDesc("t1.order_id");
@@ -196,7 +188,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 				List<UserDeliverOrderVO> userDeliverOrderVOList = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 				for (UserDeliverOrderVO userDeliverOrderVO : userDeliverOrderVOList) {
 					userDeliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-							.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
+									.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
 				}
 				if (null != userDeliverOrderVOList && userDeliverOrderVOList.size() > 0) {
 					listAll.addAll(userDeliverOrderVOList);
@@ -206,7 +198,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			listAll = userDeliverOrderService.selectUserDeliverOrderVoList(queryWrapper);
 			for (UserDeliverOrderVO userDeliverOrderVO : listAll) {
 				userDeliverOrderVO.setItems(userDeliverOrderItemService.list(new LambdaQueryWrapper<UserDeliverOrderItem>()
-						.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
+								.eq(UserDeliverOrderItem::getOrderId, userDeliverOrderVO.getOrderId())));
 			}
 		}
 
@@ -235,7 +227,8 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 									+ deliverOrder.getArea() + deliverOrder.getAddress();
 							deliverOrderExcel.setAddress(address);
 							deliverOrderExcel.setStatus(deliverOrder.getStatus().getDesc());
-							deliverOrderExcel.setItemStatus(StringUtils.isNotBlank(userDeliverOrderItem.getDeliveryFlowId())?"已发货":"未发货");
+							deliverOrderExcel.setItemStatus(
+									StringUtils.isNotBlank(userDeliverOrderItem.getDeliveryFlowId()) ? "已发货" : "未发货");
 							excelList.add(deliverOrderExcel);
 						}
 					}

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

@@ -2,6 +2,7 @@ package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import lombok.Data;
@@ -12,12 +13,12 @@ import lombok.Data;
  */
 @Data
 public class OrderDeliverItemVO {
-	
+
 	/**
 	   * 物流公司ID
 	   */
 	  private Long deliveryId;
-	  
+
 	  // 物流公司名称
 	  private  String companyName;
 
@@ -30,17 +31,17 @@ public class OrderDeliverItemVO {
 	   * 物流查询接口
 	   */
 	  private String queryUrl;
-	  
+
 	  /**
 	   * 物流单号ID
 	   */
 	  private String deliveryFlowId;
-	  
+
 	  /**
 	   * 发货时间
 	   */
 	  private Date deliveryTime;
 
 	  // 物流商品清单
-	  List<UserDeliverOrderItem> items;
+	  List<UserDeliverOrderItem> items = new ArrayList<>();
 }