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

Dev

See merge request quanshu/mp-server!444

mp-quartz/src/main/java/com/qs/mp/quartz/task/DayStatTask.java

@@ -139,8 +139,8 @@ public class DayStatTask {
                 .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
                 .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
                 .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED)
-                .ge(UserTicketOrder::getCreatedTime, bizDay)
-                .lt(UserTicketOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
+                .ge(UserTicketOrder::getUpdatedTime, bizDay)
+                .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
         if (null != orderMap) {
           BigDecimal orderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(orderMap.get("orderAmt")))).divide(new BigDecimal(100),
@@ -151,7 +151,8 @@ public class DayStatTask {
               new QueryWrapper<UserTicketOrder>()
                   .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
                   .lambda().eq(UserTicketOrder::getBoxId, ticketBox.getBoxId())
-                  .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED));
+                  .eq(UserTicketOrder::getStatus, UserTicketOrderStatusEnum.FINISHED)
+                  .lt(UserTicketOrder::getUpdatedTime, DateUtils.addDays(bizDay, 1)));
           BigDecimal allOrderAmt = new BigDecimal(
               Integer.valueOf(String.valueOf(allOrderMap.get("orderAmt")))).divide(new BigDecimal(100),
               2, RoundingMode.DOWN);
@@ -180,11 +181,11 @@ public class DayStatTask {
             .select("IFNULL(sum(comm_amt) ,0) as commAmt"));
     if (null != commMap) {
       sb.append("累计分佣：").append(
-          new BigDecimal(Integer.valueOf(String.valueOf(allCommMap.get("commAmt")))).divide(
-              new BigDecimal(100), 2, RoundingMode.DOWN))
+              new BigDecimal(Integer.valueOf(String.valueOf(allCommMap.get("commAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN))
           .append("元，当日：").append(
-          new BigDecimal(Integer.valueOf(String.valueOf(commMap.get("commAmt")))).divide(
-              new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+              new BigDecimal(Integer.valueOf(String.valueOf(commMap.get("commAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
     Map<String, Object> couponMap = channelCouponVerifyLogService.getMap(
@@ -218,11 +219,11 @@ public class DayStatTask {
             .lambda().eq(ChannelWithdraw::getStatus, ChannelWithdrawStatusEnum.FINISHED));
     if (null != withdrawMap) {
       sb.append("累计提现：").append(
-          new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
-              new BigDecimal(100), 2, RoundingMode.DOWN))
+              new BigDecimal(Integer.valueOf(String.valueOf(allWithdrawMap.get("withdrawAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN))
           .append("元，当日：").append(
-          new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
-              new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+              new BigDecimal(Integer.valueOf(String.valueOf(withdrawMap.get("withdrawAmt")))).divide(
+                  new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
     int exCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()

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);
     }
 

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -63,12 +63,12 @@
            left join mp_channel t2 on t1.parent_id = t2.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as site_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level= 0
                       group by q1.channel_id) t3 on t3.channel_id = t1.channel_id
            left join (select q1.channel_id, count(q2.channel_id) as child_cnt
                       from mp_channel q1
-                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_id, '.%')
+                             left join mp_channel q2 on q2.channel_no like concat(q1.channel_no, '.%')
                       where q1.level > 0 and q2.level> 0
                       group by q1.channel_id) t4 on t4.channel_id = t1.channel_id
            left join (select q1.channel_id,sum(q2.user_cnt) as user_cnt

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

@@ -26,7 +26,13 @@
     </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.*,
+                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