Merge branch 'dev' of 113.31.163.91:quanshu/mp-server into dev

mp-admin/src/main/java/com/qs/mp/web/controller/common/LogisticsController.java

@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.common;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.json.*;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.google.gson.Gson;
 import com.kuaidi100.sdk.api.AutoNum;
 import com.kuaidi100.sdk.api.QueryTrack;
@@ -102,6 +103,13 @@ public class LogisticsController extends BaseApiController {
                 return AjaxResult.error(jsonObject.getStr("message"));
             }
             List<LogisticsQueryVO> data = JSONUtil.toList(jsonObject.getStr("data"), LogisticsQueryVO.class);
+            if (CollectionUtils.isNotEmpty(data) && data.size() > 1) {
+                for (int i = data.size() - 1; i > 0; i--) {
+                    if (data.get(i).getStatus().equals(data.get(i-1).getStatus())) {
+                        data.get(i).setStatus("");
+                    }
+                }
+            }
             return AjaxResult.success(data);
 
         } catch (Exception e) {

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

@@ -224,8 +224,10 @@ public class ChannelOrderServiceImpl extends
             }
         }
 
-        // 获取支付订单号
-        PayOrder payOrder = payOrderService.getOne(new LambdaQueryWrapper<PayOrder>().eq(PayOrder::getBizId, channelOrder.getOrderId()));
+        // 获取支付成功的订单号
+        PayOrder payOrder = payOrderService.getOne(new LambdaQueryWrapper<PayOrder>()
+                .eq(PayOrder::getBizId, channelOrder.getOrderId())
+                .eq(PayOrder::getOrderStatus, PayOrderStatusEnum.SUCCESS));
         if (Objects.isNull(payOrder)) {
             throw new ServiceException("支付订单不存在");
         }

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

@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
 import java.io.Serializable;
 import java.util.Date;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -16,6 +19,7 @@ import lombok.Data;
  */
 @TableName("mp_user_ticket_order_item")
 @Data
+@ApiModel("用户盲票订单明细实体类")
 public class UserTicketOrderItem implements Serializable {
 
   private static final long serialVersionUID = 1L;
@@ -23,42 +27,63 @@ public class UserTicketOrderItem implements Serializable {
   /**
    * 主键
    */
+  @ApiModelProperty("明细id,主键")
   @TableId(value = "item_id", type = IdType.INPUT)
   private String itemId;
 
   /**
    * 订单ID
    */
+  @ApiModelProperty("订单id")
   @TableField("order_id")
   private String orderId;
 
   /**
    * 用户ID
    */
+  @ApiModelProperty("用户id")
   @TableField("user_id")
   private Long userId;
 
   /**
    * 盲票组ID
    */
+  @ApiModelProperty("盲票组id")
   @TableField("box_id")
   private String boxId;
 
   /**
    * 盲票ID
    */
+  @ApiModelProperty("盲票id")
   @TableField("ticket_id")
   private String ticketId;
 
+  /**
+   * 盲票组标题
+   */
+  @ApiModelProperty("盲票组标题")
+  @TableField("title")
+  private String title;
+
+  /**
+   * 主图url
+   */
+  @ApiModelProperty("主图url")
+  @TableField("pic_url")
+  private String picUrl;
+
   /**
    * 创建时间
    */
+  @ApiModelProperty("创建时间")
   @TableField("created_time")
   private Date createdTime;
 
   /**
    * 更新时间
    */
+  @ApiModelProperty("更新时间")
   @TableField("updated_time")
   @Version
   private Date updatedTime;

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

@@ -204,6 +204,9 @@ public class UserTicketOrderServiceImpl extends
       orderItem.setUserId(userId);
       orderItem.setBoxId(ticketBox.getBoxId());
       orderItem.setTicketId(null); // 付款成功后再分配具体盲票
+      // 保存名称和图片快照
+      orderItem.setTitle(ticketBox.getTitle());
+      orderItem.setPicUrl(ticketBox.getPicUrl());
       userTicketOrderItemService.save(orderItem);
     }
 
@@ -264,6 +267,9 @@ public class UserTicketOrderServiceImpl extends
     orderItem.setUserId(userId);
     orderItem.setBoxId(ticket.getBoxId());
     orderItem.setTicketId(ticket.getTicketId());
+    // 保存名称和图片快照
+    orderItem.setTitle(orderSettleVO.getTitle());
+    orderItem.setPicUrl(orderSettleVO.getPicUrl());
     userTicketOrderItemService.save(orderItem);
 
     if (orderSettleVO.getPayAmt() == 0) {

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

@@ -26,7 +26,18 @@
     </select>
 
     <select id="listMyTicketVO" resultType="com.qs.mp.admin.domain.vo.TicketListVO">
-        select t1.item_id, t3.*, t4.pic_url, t6.title prizeInfo, t6.`value`,t6.prize_type
+        select t1.item_id,
+                t1.title,
+                t1.pic_url,
+                t3.ticket_id,
+                t3.box_id,
+                t3.serial_no,
+                t3.face_price,
+                t3.plain_lucky_num,
+                t3.`status`,
+                t6.title prizeInfo,
+                t6.`value`,
+                t6.prize_type
         from mp_user_ticket_order_item t1
          left join mp_user_ticket_order t2 on t1.order_id = t2.order_id
          left join mp_ticket t3 on t1.ticket_id = t3.ticket_id