Merge branch 'dev' into 'master'

Dev

See merge request quanshu/mp-server!401

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

@@ -27,9 +27,7 @@ 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.domain.DeliveryCompany;
-import com.qs.mp.common.enums.BusinessType;
-import com.qs.mp.common.enums.ErrorCodeEnum;
-import com.qs.mp.common.enums.TicketPkgStatusEnum;
+import com.qs.mp.common.enums.*;
 import com.qs.mp.common.service.IDeliveryCompanyService;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
@@ -44,6 +42,9 @@ import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 
@@ -161,6 +162,9 @@ public class ChannelOrderMgrController extends BaseApiController {
   @Log(title = "经销商订单发货", businessType = BusinessType.UPDATE)
   @PostMapping("/ship")
   @ApiOperation(value = "订单发货" , notes = "在订单发货页面提交")
+  @ApiResponses(
+		  @ApiResponse(code = 200, message = "操作成功", response = AjaxResult.class)
+  )
   @PreAuthorize("@ss.hasPermi('order:channel:ship')")
   public AjaxResult ship(@RequestBody ChannelOrderShipParam shipParam) {
 		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
@@ -173,14 +177,31 @@ public class ChannelOrderMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
+	  Integer deliveryType = shipParam.getDeliveryType();
+	  if (null == deliveryType) {
+		  deliveryType = 0;
+	  }
+
 		if(null != shipParam && null != shipParam.getPkgIds()
 				&& shipParam.getPkgIds().size() > 0) {
 			ChannelOrder channelOrder = new ChannelOrder();
-			channelOrder.setOrderId(shipParam.getOrderId());
-			channelOrder.setChannelId(order.getChannelId());
-			channelOrder.setDeliveryId(shipParam.getDeliveryId());
-			channelOrder.setDeliveryFlowId(shipParam.getDeliveryFlowId());
-			channelOrder.setDeliveryTime(new Date());
+
+
+
+			if (DeliverTypeEnum.NO_DELIVER.getValue().equals(deliveryType)) {
+				// 无需物流，设置发货时间为当前时间
+				channelOrder.setOrderId(shipParam.getOrderId());
+				channelOrder.setChannelId(order.getChannelId());
+				channelOrder.setDeliveryTime(new Date());
+
+			} else if (DeliverTypeEnum.DELIVER.getValue().equals(deliveryType)) {
+				// 快递发货，设置物流信息
+				channelOrder.setOrderId(shipParam.getOrderId());
+				channelOrder.setChannelId(order.getChannelId());
+				channelOrder.setDeliveryId(shipParam.getDeliveryId());
+				channelOrder.setDeliveryFlowId(shipParam.getDeliveryFlowId());
+				channelOrder.setDeliveryTime(new Date());
+			}
 			boolean rtn = channelOrderService.channelOrderShip(channelOrder, shipParam.getPkgIds());
 			return rtn ? AjaxResult.success() : AjaxResult.error("发货失败");
 		}
@@ -193,10 +214,12 @@ public class ChannelOrderMgrController extends BaseApiController {
 	@Log(title = "经销商订单发货单号修改", businessType = BusinessType.UPDATE)
 	@PostMapping("/ship/update")
 	@ApiOperation(value = "订单发货单号修改" , notes = "在订单发货页面提交")
+	@ApiResponses(
+			@ApiResponse(code = 200, message = "操作成功", response = AjaxResult.class)
+	)
 	@PreAuthorize("@ss.hasPermi('order:channel:ship')")
 	public AjaxResult updateShipInfo(@RequestBody ChannelOrderShipParam shipParam) {
-		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())
-			|| null == shipParam.getDeliveryId() || StringUtils.isBlank(shipParam.getDeliveryFlowId())) {
+		if(null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
@@ -206,10 +229,30 @@ public class ChannelOrderMgrController extends BaseApiController {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
-		boolean rtn = channelOrderService.update(new LambdaUpdateWrapper<ChannelOrder>()
-				.set(ChannelOrder::getDeliveryId, shipParam.getDeliveryId())
-				.set(ChannelOrder::getDeliveryFlowId, shipParam.getDeliveryFlowId())
-				.eq(ChannelOrder::getOrderId, shipParam.getOrderId()));
+		Integer deliveryType = shipParam.getDeliveryType();
+		if (null == deliveryType) {
+			deliveryType = 0;
+		}
+
+
+		boolean rtn = false;
+		if (DeliverTypeEnum.NO_DELIVER.getValue().equals(deliveryType)) {
+			// 无需物流，设置单号为空，物流公司为空
+			rtn = channelOrderService.update(new LambdaUpdateWrapper<ChannelOrder>()
+					.set(ChannelOrder::getDeliveryId, null)
+					.set(ChannelOrder::getDeliveryFlowId, null)
+					.set(ChannelOrder::getStatus, DeliverOrderStatusEnum.FINISHED)
+					.eq(ChannelOrder::getOrderId, shipParam.getOrderId()));
+
+		} else if (DeliverTypeEnum.DELIVER.getValue().equals(deliveryType)) {
+			// 快递发货，原逻辑
+			rtn = channelOrderService.update(new LambdaUpdateWrapper<ChannelOrder>()
+					.set(ChannelOrder::getDeliveryId, shipParam.getDeliveryId())
+					.set(ChannelOrder::getDeliveryFlowId, shipParam.getDeliveryFlowId())
+					.eq(ChannelOrder::getOrderId, shipParam.getOrderId()));
+		}
+
+
 		return rtn ? AjaxResult.success() : AjaxResult.error("修改失败");
 
 	}

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

@@ -1,5 +1,6 @@
 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.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.admin.domain.param.UserDeliverOrderQueryParam;
@@ -8,6 +9,8 @@ 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.enums.BusinessType;
+import com.qs.mp.common.enums.DeliverOrderStatusEnum;
+import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
@@ -25,6 +28,9 @@ import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
+
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.lang3.StringUtils;
@@ -69,13 +75,16 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	 */
 	@PostMapping("/list")
 	@ApiOperation(value = "用户提货订单列表", notes = "获取用户提货订单列表")
+	@ApiResponses(
+			@ApiResponse(code = 200, message = "OK", response = UserDeliverOrderVO.class)
+	)
 	@PreAuthorize("@ss.hasPermi('order:deliver:list')")
 	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.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());
@@ -95,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())) {
@@ -124,16 +136,31 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 		if (null == shipParam || StringUtils.isBlank(shipParam.getOrderId())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
+
+		Integer deliveryType = shipParam.getDeliveryType();
+		if (null == deliveryType) {
+			deliveryType = 0;
+		}
+
 		List<UserDeliverOrderItem> itemList = new ArrayList<UserDeliverOrderItem>();
 		if (null != shipParam && null != shipParam.getItemIds() && shipParam.getItemIds().size() > 0) {
 			Date deliveryTime = new Date();
 			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);
+
+					if (DeliverTypeEnum.NO_DELIVER.getValue().equals(deliveryType)) {
+						// 无需物流，设置发货时间为当前时间
+						item.setItemId(itemId);
+						item.setDeliveryTime(deliveryTime);
+
+					} else if (DeliverTypeEnum.DELIVER.getValue().equals(deliveryType)) {
+						// 快递发货，设置物流信息
+						item.setItemId(itemId);
+						item.setDeliveryId(shipParam.getDeliveryId());
+						item.setDeliveryFlowId(shipParam.getDeliveryFlowId());
+						item.setDeliveryTime(deliveryTime);
+					}
 					itemList.add(item);
 				}
 			}
@@ -142,6 +169,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 			boolean rtn = userDeliverOrderService.userDeliverOrderShip(shipParam.getOrderId(), itemList);
 			return rtn ? AjaxResult.success() : AjaxResult.error("发货失败");
 		}
+
 		return AjaxResult.error("发货失败");
 	}
 
@@ -151,21 +179,26 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 	@Log(title = "用户提货订单发货单号修改", businessType = BusinessType.UPDATE)
 	@PostMapping("/ship/update")
 	@ApiOperation(value = "订单发货修改", notes = "在订单发货页面提交")
+	@ApiResponses(
+			@ApiResponse(code = 200, message = "success", response = AjaxResult.class)
+	)
 	@PreAuthorize("@ss.hasPermi('order:deliver:ship')")
 	public AjaxResult updateShipInfo(@RequestBody UserDeliverOrderShipParam shipParam) {
 		if (null == shipParam || StringUtils.isBlank(shipParam.getOrderId())
-				|| null == shipParam.getDeliveryId() || StringUtils.isBlank(shipParam.getDeliveryFlowId())
 				|| CollectionUtils.isEmpty(shipParam.getItemIds())) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 
-		for (String itemId : shipParam.getItemIds()) {
-			userDeliverOrderItemService.update(new LambdaUpdateWrapper<UserDeliverOrderItem>()
-					.set(UserDeliverOrderItem::getDeliveryId, shipParam.getDeliveryId())
-					.set(UserDeliverOrderItem::getDeliveryFlowId, shipParam.getDeliveryFlowId())
-					.eq(UserDeliverOrderItem::getItemId, itemId));
+		Integer deliveryType = shipParam.getDeliveryType();
+		if (null == deliveryType) {
+			deliveryType = 0;
 		}
-		return AjaxResult.success();
+
+		// 修改物流信息
+		boolean res = userDeliverOrderService.updateShipInfo(shipParam);
+
+
+		return res ? AjaxResult.success() : AjaxResult.error("消息修改失败");
 	}
 
 	@Log(title = "提货订单导出", businessType = BusinessType.EXPORT)

mp-admin/src/main/resources/application-test.yml

@@ -99,11 +99,6 @@ server:
   # 环境标识
   env: test
 
-# Swagger配置
-swagger:
-  # 请求前缀
-  pathMapping: /test-api
-
 
 #API访问
 client:

mp-common/src/main/java/com/qs/mp/common/enums/DeliverTypeEnum.java

@@ -0,0 +1,36 @@
+package com.qs.mp.common.enums;
+
+import com.baomidou.mybatisplus.annotation.IEnum;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+
+/**
+ * 物流配送方式枚举类
+ * @author Cup
+ * @date 2022/4/19
+ */
+@ApiModel("物流配送方式枚举类")
+public enum DeliverTypeEnum implements IEnum<Integer> {
+
+    DELIVER(1,"快递"),
+
+    NO_DELIVER(2, "无需物流");
+
+    DeliverTypeEnum(int value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+
+    private final int value;
+
+    private final String desc;
+
+    @Override
+    public Integer getValue() {
+        return value;
+    }
+
+}

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

@@ -28,6 +28,10 @@ public class ChannelOrderShipParam {
 	@ApiModelProperty(value = "订单编号", required = false)
 	private String orderId;
 
+	@NotNull(message = "配送类型不能为空")
+	@ApiModelProperty(value = "配送类型 1快递 2 无需物流", required = false)
+	private Integer deliveryType;
+
 	/**
 	 * 物流公司ID
 	 */

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

@@ -26,6 +26,10 @@ public class UserDeliverOrderShipParam {
 	@ApiModelProperty(value = "订单编号", required = false)
 	private String orderId;
 
+	@NotNull(message = "配送类型不能为空")
+	@ApiModelProperty(value = "配送类型 1快递 2 无需物流", required = false)
+	private Integer deliveryType;
+
 	/**
 	 * 物流公司ID
 	 */

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrder.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.annotation.Version;
 import com.qs.mp.common.enums.ChannelOrderStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -138,6 +140,10 @@ public class ChannelOrder implements Serializable {
   @TableField("delivery_time")
   private Date deliveryTime;
 
+  @TableField("confirm_time")
+  @ApiModelProperty("确认收货时间")
+  private Date confirmTime;
+
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelOrderServiceImpl.java

@@ -209,7 +209,7 @@ public class ChannelOrderServiceImpl extends
   }
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public boolean channelOrderShip(ChannelOrder channelOrder, List<String> pkgIdList) {
 		if(null == channelOrder || StringUtils.isBlank(channelOrder.getOrderId())) {
 			throw new ServiceException("发货订单异常，发货失败");
@@ -271,8 +271,15 @@ public class ChannelOrderServiceImpl extends
 			boolean rtn = ticketPackageService.update(updateWrapper);
 			if(rtn){
 				// 修改订单信息
-				channelOrder.setStatus(ChannelOrderStatusEnum.NOT_CONFIRM);
-				return updateById(channelOrder);
+                String deliveryFlowId = channelOrder.getDeliveryFlowId();
+
+                // 物流单号为空则表示无需物流发货
+                if (StringUtils.isBlank(deliveryFlowId)) {
+                    channelOrder.setStatus(ChannelOrderStatusEnum.FINISHED);
+                } else {
+                    channelOrder.setStatus(ChannelOrderStatusEnum.NOT_CONFIRM);
+                }
+                return updateById(channelOrder);
 			}
 		}
 		return false;

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

@@ -10,6 +10,9 @@ import com.baomidou.mybatisplus.annotation.Version;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -19,6 +22,7 @@ import lombok.Data;
  */
 @TableName("mp_user_deliver_order")
 @Data
+@ApiModel("用户提货订单实体类")
 public class UserDeliverOrder implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -26,91 +30,110 @@ public class UserDeliverOrder implements Serializable {
   /**
    * 主键
    */
+  @ApiModelProperty("订单 id")
   @TableId(value = "order_id", type = IdType.INPUT)
   private String orderId;
 
   /**
    * 用户ID
    */
+  @ApiModelProperty("用户ID")
   @TableField("user_id")
   private Long userId;
 
   /**
    * 收货人
    */
+  @ApiModelProperty("收货人")
   @TableField("receiver")
   private String receiver;
 
   /**
    * 收货人电话
    */
+  @ApiModelProperty("收货人电话")
   @TableField("tel")
   private String tel;
 
   /**
    * 省
    */
+  @ApiModelProperty("省")
   @TableField("province")
   private String province;
 
   /**
    * 市
    */
+  @ApiModelProperty("市")
   @TableField("city")
   private String city;
 
   /**
    * 区
    */
+  @ApiModelProperty("区")
   @TableField("area")
   private String area;
 
   /**
    * 详细地址
    */
+  @ApiModelProperty("详细地址")
   @TableField("address")
   private String address;
 
   /**
    * 总商品数
    */
+  @ApiModelProperty("总商品数")
   @TableField("order_num")
   private Integer orderNum;
 
   /**
    * 支付金额
    */
+  @ApiModelProperty("支付金额")
   @TableField("pay_amt")
   private Integer payAmt;
 
   /**
    * 运费
    */
+  @ApiModelProperty("运费")
   @TableField("freight_amt")
   private Integer freightAmt;
 
   /**
    * 备注
    */
+  @ApiModelProperty("备注")
   @TableField("memo")
   private String memo;
 
   /**
    * 订单状态;-1 已取消 0:待付款 1:待发货 2:待收货 3:已完成
    */
+  @ApiModelProperty("订单状态;-1 已取消 0:待付款 1:待发货 2:待收货 3:已完成")
   @TableField("status")
   @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private DeliverOrderStatusEnum status;
 
+  @TableField("confirm_Time")
+  @ApiModelProperty("确认收货时间")
+  private Date confirmTime;
+
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   @Version
   private Date updatedTime;

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

@@ -1,5 +1,6 @@
 package com.qs.mp.user.service;
 
+import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
 import com.qs.mp.pay.domain.PayOrder;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
@@ -83,4 +84,12 @@ public interface IUserDeliverOrderService extends IService<UserDeliverOrder> {
 	 * @return
 	 */
 	boolean userDeliverOrderShip(String orderId, List<UserDeliverOrderItem> itemList);
+
+	/**
+	 * 修改物流信息
+	 * @param shipParam
+	 * @return
+	 */
+    boolean updateShipInfo(UserDeliverOrderShipParam shipParam);
+
 }

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/java/com/qs/mp/user/service/impl/UserDeliverOrderServiceImpl.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.qs.mp.admin.domain.param.UserDeliverOrderShipParam;
 import com.qs.mp.common.enums.DeliverOrderStatusEnum;
+import com.qs.mp.common.enums.DeliverTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
@@ -23,6 +25,8 @@ import com.qs.mp.user.service.IUserDeliverOrderItemService;
 import com.qs.mp.user.service.IUserDeliverOrderService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.mp.user.service.IUserPrizeStorageService;
+
+import java.util.Date;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -150,21 +154,41 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
 	}
 
 	@Override
-	@Transactional
+	@Transactional(rollbackFor = Exception.class)
 	public boolean userDeliverOrderShip(String orderId, List<UserDeliverOrderItem> itemList) {
 		boolean res = userDeliverOrderItemService.updateBatchById(itemList);
 		if(res) {
 			// 检测订单是否全部提货完成
 			LambdaQueryWrapper<UserDeliverOrderItem> queryWrapper = new LambdaQueryWrapper<UserDeliverOrderItem>();
 			queryWrapper.eq(UserDeliverOrderItem::getOrderId, orderId);
-			queryWrapper.isNull(UserDeliverOrderItem::getDeliveryFlowId);
+			queryWrapper.isNull(UserDeliverOrderItem::getDeliveryTime);
 			int noShipCnt = userDeliverOrderItemService.count(queryWrapper);
 			// 部分发货是订单状态仍保留待发货状态， 全部发完的时候再修改订单状态为待收货
 			LambdaUpdateWrapper<UserDeliverOrder> updateWrapper = new LambdaUpdateWrapper<UserDeliverOrder>();
 			updateWrapper.eq(UserDeliverOrder::getOrderId, orderId);
 			if(noShipCnt == 0) {
-				updateWrapper.set(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.NOT_CONFIRM);
-			}else {
+                // 判断订单是否全部都是无需物流； 有发货时间并且物流单号是空的就是无需物流
+                LambdaQueryWrapper<UserDeliverOrderItem> userDeliverOrderItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                userDeliverOrderItemLambdaQueryWrapper.eq(UserDeliverOrderItem::getOrderId, orderId);
+                // 获取订单下所有提货统计
+                int orderItemCount = userDeliverOrderItemService.count(userDeliverOrderItemLambdaQueryWrapper);
+
+                userDeliverOrderItemLambdaQueryWrapper.isNotNull(UserDeliverOrderItem::getDeliveryTime);
+                userDeliverOrderItemLambdaQueryWrapper.isNull(UserDeliverOrderItem::getDeliveryFlowId);
+
+                // 获取无需物流状态数量
+                int noNeedShipCnt = userDeliverOrderItemService.count(userDeliverOrderItemLambdaQueryWrapper);
+
+                // 如果相等则表示所有商品都是无需物流，直接设置订单状态为已完成，并且设置订单的收货时间
+                if (orderItemCount == noNeedShipCnt) {
+                    updateWrapper.set(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.FINISHED);
+                    updateWrapper.set(UserDeliverOrder::getConfirmTime, new Date());
+                } else {
+                    // 否则订单状态为待收货
+                    updateWrapper.set(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.NOT_CONFIRM);
+                }
+
+            }else {
 				updateWrapper.set(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.PART_DELIVER);
 			}
 			return userDeliverOrderService.update(updateWrapper);
@@ -172,7 +196,53 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
 		return false;
 	}
 
-	@Override
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean updateShipInfo(UserDeliverOrderShipParam shipParam) {
+        Integer deliveryType = shipParam.getDeliveryType();
+        boolean res = false;
+
+        for (String itemId : shipParam.getItemIds()) {
+
+            if (DeliverTypeEnum.NO_DELIVER.getValue().equals(deliveryType)) {
+                // 无需物流，设置物流信息为空
+                res = userDeliverOrderItemService.update(new LambdaUpdateWrapper<UserDeliverOrderItem>()
+                        .set(UserDeliverOrderItem::getDeliveryId, null)
+                        .set(UserDeliverOrderItem::getDeliveryFlowId, null)
+                        .eq(UserDeliverOrderItem::getItemId, itemId));
+                // 查询判断是否所有都是无需物流
+                LambdaQueryWrapper<UserDeliverOrderItem> userDeliverOrderItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+                userDeliverOrderItemLambdaQueryWrapper.eq(UserDeliverOrderItem::getOrderId, shipParam.getOrderId());
+                // 获取订单下所有提货统计数
+                int orderItemCount = userDeliverOrderItemService.count(userDeliverOrderItemLambdaQueryWrapper);
+
+                userDeliverOrderItemLambdaQueryWrapper.isNotNull(UserDeliverOrderItem::getDeliveryTime);
+                userDeliverOrderItemLambdaQueryWrapper.isNull(UserDeliverOrderItem::getDeliveryFlowId);
+
+                // 获取无需物流状态数量
+                int noNeedShipCnt = userDeliverOrderItemService.count(userDeliverOrderItemLambdaQueryWrapper);
+
+                // 如果相等则表示所有商品都是无需物流，直接设置订单状态为已完成，并且设置订单的收货时间
+                if (orderItemCount == noNeedShipCnt) {
+                    res = userDeliverOrderService.update(new LambdaUpdateWrapper<UserDeliverOrder>()
+                            .set(UserDeliverOrder::getStatus, DeliverOrderStatusEnum.FINISHED)
+                            .eq(UserDeliverOrder::getOrderId, shipParam.getOrderId()));
+                }
+
+
+            } else if (DeliverTypeEnum.DELIVER.getValue().equals(deliveryType)) {
+                // 快递发货，原逻辑
+                res = userDeliverOrderItemService.update(new LambdaUpdateWrapper<UserDeliverOrderItem>()
+                        .set(UserDeliverOrderItem::getDeliveryId, shipParam.getDeliveryId())
+                        .set(UserDeliverOrderItem::getDeliveryFlowId, shipParam.getDeliveryFlowId())
+                        .eq(UserDeliverOrderItem::getItemId, itemId));
+            }
+
+        }
+        return res;
+    }
+
+    @Override
 	public UserDeliverOrderVO selectUserDeliverOrderVo(String orderId) {
 		return getBaseMapper().selectUserDeliverOrderVo(orderId);
 	}

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>
 	
 	 <!-- 查询用户订单明细列表 -->