物流信息详情增加无需物流

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

@@ -84,7 +84,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		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.eq(null != queryParam && null != queryParam.getTel(), "t1.`tel`", queryParam.getTel());
+		queryWrapper.eq(null != queryParam && StringUtils.isNotBlank(queryParam.getTel()) , "t1.`tel`", queryParam.getTel());
 		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());
@@ -104,6 +104,9 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	 */
 	@PostMapping("/detail")
 	@ApiOperation(value = "订单详情", notes = "在订单列表页面查看详情")
+	@ApiResponses(
+			@ApiResponse(code = 200, message = "OK", response = UserDeliverOrderVO.class)
+	)
 	@PreAuthorize("@ss.hasPermi('order:deliver:query')")
 	public AjaxResult query(@RequestBody UserDeliverOrder order) {
 		if (null == order || StringUtils.isBlank(order.getOrderId())) {

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

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -15,6 +18,7 @@ import lombok.Data;
  */
 @TableName("mp_user_deliver_order_item")
 @Data
+@ApiModel("用户提货订单明细实体类")
 public class UserDeliverOrderItem implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -23,65 +27,76 @@ public class UserDeliverOrderItem implements Serializable {
    * 主键
    */
   @TableId(value = "item_id", type = IdType.INPUT)
+  @ApiModelProperty("项目id")
   private String itemId;
 
   /**
    * 订单ID
    */
   @TableField("order_id")
+  @ApiModelProperty("订单id")
   private String orderId;
 
   /**
    * 奖品库ID
    */
   @TableField("storage_id")
+  @ApiModelProperty("奖品库id")
   private String storageId;
 
   /**
    * 商品ID
    */
   @TableField("goods_id")
+  @ApiModelProperty("商品id")
   private Long goodsId;
 
   /**
    * sku ID
    */
+  @ApiModelProperty("skuId")
   @TableField("sku_id")
   private Long skuId;
 
   /**
    * sku 属性
    */
+  @ApiModelProperty("sku属性")
   @TableField("properties")
   private String properties;
 
   /**
    * 商品标题
    */
+  @ApiModelProperty("商品标题")
   @TableField("title")
   private String title;
 
   /**
    * 商品图片
    */
+  @ApiModelProperty("商品图片")
   @TableField("pic_url")
   private String picUrl;
 
   /**
    * 商品数量
    */
+  @ApiModelProperty("商品数量")
   @TableField("goods_num")
   private Integer goodsNum;
 
   /**
    * 物流公司ID
    */
+  @ApiModelProperty("物流公司id")
   @TableField("delivery_id")
   private Long deliveryId;
 
   /**
    * 物流单号ID
    */
+  @ApiModelProperty("物流单号id")
   @TableField("delivery_flow_id")
   private String deliveryFlowId;
 
@@ -89,18 +104,21 @@ public class UserDeliverOrderItem implements Serializable {
   /**
    * 发货时间
    */
+  @ApiModelProperty("发货时间")
   @TableField("delivery_time")
   private Date deliveryTime;
   
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   private Date updatedTime;
 

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

@@ -5,6 +5,9 @@ import com.qs.mp.user.domain.UserDeliverOrderItem;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,36 +15,44 @@ import lombok.Data;
  * @Date 2022/3/17
  */
 @Data
+@ApiModel("用户提货订单物流信息")
 public class OrderDeliverItemVO {
 
 	/**
 	   * 物流公司ID
 	   */
+	@ApiModelProperty("物流公司id")
 	  private Long deliveryId;
 
 	  // 物流公司名称
+	@ApiModelProperty("物流公司名称")
 	  private  String companyName;
 
 	  /**
 	   * 公司主页
 	   */
+	  @ApiModelProperty("公司主页")
 	  private String companyHomeUrl;
 
 	  /**
 	   * 物流查询接口
 	   */
+	  @ApiModelProperty("物流查询接口")
 	  private String queryUrl;
 
 	  /**
 	   * 物流单号ID
 	   */
+	  @ApiModelProperty("物流单号id")
 	  private String deliveryFlowId;
 
 	  /**
 	   * 发货时间
 	   */
+	  @ApiModelProperty("发货时间")
 	  private Date deliveryTime;
 
 	  // 物流商品清单
+	  @ApiModelProperty("物流商品清单")
 	  List<UserDeliverOrderItemVO> items = new ArrayList<>();
 }

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

@@ -2,6 +2,8 @@ package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,18 +11,22 @@ import lombok.Data;
  * @Date 2022/3/17
  */
 @Data
+@ApiModel("用户提货订单项VO")
 public class UserDeliverOrderItemVO  extends UserDeliverOrderItem {
 
 	  // 物流公司名称
+	@ApiModelProperty("物流公司名称")
 	  private  String companyName;
 
 	  /**
 	   * 公司主页
 	   */
+	  @ApiModelProperty("公司主页")
 	  private String companyHomeUrl;
 
 	  /**
 	   * 物流查询接口
 	   */
+	  @ApiModelProperty("物流查询接口")
 	  private String queryUrl;
 }

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

@@ -2,6 +2,9 @@ package com.qs.mp.user.domain.vo;
 
 import com.qs.mp.user.domain.UserDeliverOrder;
 import java.util.List;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -9,15 +12,19 @@ import lombok.Data;
  * @Date 2022/3/17
  */
 @Data
+@ApiModel("用户提货订单详情")
 public class UserDeliverOrderVO extends UserDeliverOrder {
 
 	// 明细
+	@ApiModelProperty("提货订单项明细")
 	List<UserDeliverOrderItemVO> items;
 
 	// 用户昵称
+	@ApiModelProperty("用户昵称")
 	private String nickName;
 
 	// 物流信息
+	@ApiModelProperty("物流信息")
 	List<OrderDeliverItemVO> deliverList;
 
 }

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

@@ -1,5 +1,7 @@
 package com.qs.mp.user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
 import com.qs.mp.user.domain.vo.OrderDeliverItemVO;
 import com.qs.mp.user.domain.vo.UserDeliverOrderItemVO;
@@ -8,8 +10,10 @@ import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
@@ -39,10 +43,29 @@ public class UserDeliverOrderItemServiceImpl extends ServiceImpl<UserDeliverOrde
 		List<OrderDeliverItemVO> itemList = new ArrayList<OrderDeliverItemVO>();
 		// 1.查询物流公司信息
 		itemList = selectOrderDeliverItemVOList(orderId);
-		// 2.查询物流包裹内的商品信息
+
+		HashMap<String, List<OrderDeliverItemVO>> deliverItemListMap = new HashMap<>(16);
+
 		for (OrderDeliverItemVO itemVO : itemList) {
+			String deliveryFlowId = itemVO.getDeliveryFlowId();
+			// 无需物流的设置一个默认的物流公司id
+			if (StringUtils.isBlank(deliveryFlowId)) {
+				deliveryFlowId = "no";
+			}
+
 			for (UserDeliverOrderItemVO item : orderItems) {
-				if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
+
+				if (item.getDeliveryTime() == null) {
+					continue;
+				}
+
+
+				String itemDeliveryFlowId = item.getDeliveryFlowId();
+				if (StringUtils.isBlank(itemDeliveryFlowId)) {
+					itemDeliveryFlowId = "no";
+				}
+
+				if (deliveryFlowId.equals(itemDeliveryFlowId)){
 					UserDeliverOrderItemVO flowItem = new UserDeliverOrderItemVO();
 					BeanUtils.copyProperties(item, flowItem);
 					itemVO.getItems().add(flowItem);

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

@@ -31,7 +31,7 @@
 		select DISTINCT t1.delivery_id , t1.delivery_flow_id, t1.delivery_time, 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} and t1.delivery_flow_id is not null
+		where t1.order_id = #{orderId} and t1.delivery_time is not null
 	</select>
 	
 	 <!-- 查询用户订单明细列表 -->