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

Dev

See merge request quanshu/mp-server!493

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

@@ -165,6 +165,10 @@ public class ChannelOrder implements Serializable {
   @ApiModelProperty("确认收货时间")
   private Date confirmTime;
 
+  @ApiModelProperty("支付时间")
+  @TableField("pay_time")
+  private Date payTime;
+
   /**
    * 创建时间
    */

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

@@ -36,6 +36,7 @@ import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.pay.domain.PayOrder;
 import com.qs.mp.system.service.id.BizIdGenerator;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -146,6 +147,7 @@ public class ChannelOrderServiceImpl extends
     channelOrder.setPayAmt(orderSettleVO.getPayAmt());
     channelOrder.setStatus(ChannelOrderStatusEnum.NOT_PAY);
     channelOrder.setPkgNum(orderSettleVO.getPkgNum());
+    channelOrder.setPayTime(new Date());
     channelOrder.setMemo(memo);
     channelOrder.setReceiver(addr.getReceiver());
     channelOrder.setTel(addr.getMobile());

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

@@ -127,6 +127,10 @@ public class UserDeliverOrder implements Serializable {
   @ApiModelProperty("确认收货时间")
   private Date confirmTime;
 
+  @ApiModelProperty("支付时间")
+  @TableField("pay_time")
+  private Date payTime;
+
   /**
    * 创建时间
    */

mp-service/src/main/java/com/qs/mp/user/domain/UserExchangeOrder.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_exchange_order")
 @Data
+@ApiModel("用户盲豆兑换订单实体类")
 public class UserExchangeOrder implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -22,42 +26,53 @@ public class UserExchangeOrder implements Serializable {
   /**
    * 主键
    */
+  @ApiModelProperty("订单id")
   @TableId(value = "order_id", type = IdType.INPUT)
   private String orderId;
 
   /**
    * 用户ID
    */
+  @ApiModelProperty("用户id")
   @TableField("user_id")
   private Long userId;
 
   /**
    * 商品ID
    */
+  @ApiModelProperty("商品id")
   @TableField("goods_id")
   private Long goodsId;
 
   /**
    * sku ID
    */
+  @ApiModelProperty("sku id")
   @TableField("sku_id")
   private Long skuId;
 
+  @ApiModelProperty("兑换数量")
+  @TableField("num")
+  private Integer num;
+
   /**
    * 消耗代币数
    */
+  @ApiModelProperty("消耗代币数")
   @TableField("order_coin")
   private Integer orderCoin;
 
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   private Date updatedTime;
 

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

@@ -147,6 +147,10 @@ public class UserTicketOrder implements Serializable {
   @TableField("channel_id")
   private Long channelId;
 
+  @ApiModelProperty("支付时间")
+  @TableField("pay_time")
+  private Date payTime;
+
   /**
    * 创建时间
    */

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

@@ -42,6 +42,12 @@ public class DeliverOrderExcel {
     @Excel(name = "数量")
     private Integer goodsNum;
 
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty("商品采购链接")
+    private String shoppingLink;
+
     /**
      * 创建时间
      */
@@ -83,12 +89,6 @@ public class DeliverOrderExcel {
     @Excel(name = "商品发货状态")
     private String itemStatus;
 
-    @ApiModelProperty("供应商")
-    private String supplierName;
-
-
-    @ApiModelProperty("商品采购链接")
-    private String shoppingLink;
 
     @Excel(name = "买家留言")
     private String memo;

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

@@ -78,6 +78,7 @@ public class UserDeliverOrderServiceImpl extends ServiceImpl<UserDeliverOrderMap
     userDeliverOrder.setCity(userAddr.getCity());
     userDeliverOrder.setArea(userAddr.getArea());
     userDeliverOrder.setAddress(userAddr.getAddr());
+    userDeliverOrder.setPayTime(new Date());
     userDeliverOrder.setOrderNum(orderSettleVO.getPrizeList().stream().mapToInt(UserPrizeStorage::getGoodsNum).sum());
     userDeliverOrder.setPayAmt(orderSettleVO.getPayAmt());
     userDeliverOrder.setFreightAmt(orderSettleVO.getFreightAmt());

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

@@ -72,7 +72,7 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
   }
 
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public boolean exchange(Long userId, Long goodsId, Long skuId, int orderNum) {
     int orderAmt = 0;
     Goods goods = goodsService.getById(goodsId);
@@ -103,6 +103,7 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
     exchangeOrder.setUserId(userId);
     exchangeOrder.setGoodsId(goodsId);
     exchangeOrder.setSkuId(skuId);
+    exchangeOrder.setNum(orderNum);
     exchangeOrder.setOrderCoin(orderAmt);
     save(exchangeOrder);
 

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

@@ -163,6 +163,7 @@ public class UserTicketOrderServiceImpl extends
     userTicketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     userTicketOrder.setPayAmt(orderSettleVO.getPayAmt());
     userTicketOrder.setTicketNum(orderSettleVO.getOrderNum());
+    userTicketOrder.setPayTime(new Date());
     userTicketOrder.setMemo("");
     userTicketOrder.setResource(TicketTypeEnum.ONLINE);
     userTicketOrder.setCouponInfo(couponIds);
@@ -250,6 +251,7 @@ public class UserTicketOrderServiceImpl extends
     ticketOrder.setDiscountAmt(orderSettleVO.getDiscountAmt());
     ticketOrder.setPayAmt(orderSettleVO.getPayAmt());
     ticketOrder.setTicketNum(1);
+    ticketOrder.setPayTime(new Date());
     ticketOrder.setMemo("");
     ticketOrder.setResource(TicketTypeEnum.OFFLINE);
     ticketOrder.setCouponInfo(couponIds);

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

@@ -38,7 +38,7 @@
                t3.name sku,
                t4.nick_name,
                t4.phonenumber phone,
-               1 as num
+                t1.num
         from mp_user_exchange_order t1
                  left join mp_goods t2 on t1.goods_id = t2.goods_id
                  left join mp_goods_sku t3 on t1.sku_id = t3.sku_id