Browse Source

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

Dev

See merge request quanshu/mp-server!734
jiang hao 2 years ago
parent
commit
b0540428ca

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

@@ -6,12 +6,7 @@ import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.channel.domain.*;
 import com.qs.mp.channel.service.*;
-import com.qs.mp.common.enums.ChannelWithdrawStatusEnum;
-import com.qs.mp.common.enums.CoinLogTypeEnum;
-import com.qs.mp.common.enums.CouponDiscountTypeEnum;
-import com.qs.mp.common.enums.TicketBoxStatusEnum;
-import com.qs.mp.common.enums.TicketTypeEnum;
-import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
+import com.qs.mp.common.enums.*;
 import com.qs.mp.common.utils.DateUtils;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
@@ -19,9 +14,11 @@ import com.qs.mp.common.utils.WebhookService;
 import com.qs.mp.system.domain.SysUser;
 import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.UserCoinLog;
+import com.qs.mp.user.domain.UserCoupon;
 import com.qs.mp.user.domain.UserExchangeOrder;
 import com.qs.mp.user.domain.UserTicketOrder;
 import com.qs.mp.user.service.IUserCoinLogService;
+import com.qs.mp.user.service.IUserCouponService;
 import com.qs.mp.user.service.IUserExchangeOrderService;
 import com.qs.mp.user.service.IUserTicketOrderService;
 import java.math.BigDecimal;
@@ -78,6 +75,9 @@ public class DayStatTask {
   @Autowired
   private IChannelOrderService channelOrderService;
 
+  @Autowired
+  private IUserCouponService userCouponService;
+
   @Value("${export.page-size}")
   private int pageSize;
 
@@ -128,6 +128,16 @@ public class DayStatTask {
     }
     BigDecimal sumSaleAmt = BigDecimal.ZERO;
     BigDecimal sumAllSaleAmt = BigDecimal.ZERO;
+
+
+    // 线上销售额和汇总
+    BigDecimal onlineSumSaleAmt = BigDecimal.ZERO;
+    BigDecimal onlineSumAllSaleAmt = BigDecimal.ZERO;
+    // 线下销售额和汇总
+    BigDecimal offlineSumSaleAmt = BigDecimal.ZERO;
+    BigDecimal offlineSumAllSaleAmt = BigDecimal.ZERO;
+
+
     // 预付的金额统计
     BigDecimal sumPreSaleAmt = BigDecimal.ZERO;
     BigDecimal sumAllPreSaleAmt = BigDecimal.ZERO;
@@ -135,7 +145,13 @@ public class DayStatTask {
       queryWrapper.orderByAsc(TicketBox::getBoxNo);
       queryWrapper.last("limit " + (i * pageSize) + ", " + pageSize);
       List<TicketBox> ticketBoxList = ticketBoxService.list(queryWrapper);
+      // 区分线上和线下标识
+      boolean isOnline = true;
       for (TicketBox ticketBox : ticketBoxList) {
+        if (TicketTypeEnum.OFFLINE.equals(ticketBox.getType())) {
+          isOnline = false;
+        }
+
         Map<String, Object> orderMap = userTicketOrderService.getMap(
             new QueryWrapper<UserTicketOrder>()
                 .select("IFNULL(sum(pay_amt) ,0) as orderAmt")
@@ -160,7 +176,12 @@ public class DayStatTask {
             orderAmt = new BigDecimal(
                     Integer.valueOf(String.valueOf(orderMap.get("orderAmt")))).divide(new BigDecimal(100),
                     2, RoundingMode.DOWN);
-            sumSaleAmt = sumSaleAmt.add(orderAmt);
+//            sumSaleAmt = sumSaleAmt.add(orderAmt);
+            if (isOnline) {
+              onlineSumSaleAmt = onlineSumSaleAmt.add(orderAmt);
+            } else {
+              offlineSumSaleAmt = offlineSumSaleAmt.add(orderAmt);
+            }
           }
 
 
@@ -179,7 +200,12 @@ public class DayStatTask {
             allOrderAmt = new BigDecimal(
                 Integer.valueOf(String.valueOf(allOrderMap.get("orderAmt")))).divide(new BigDecimal(100),
                 2, RoundingMode.DOWN);
-            sumAllSaleAmt = sumAllSaleAmt.add(allOrderAmt);
+//            sumAllSaleAmt = sumAllSaleAmt.add(allOrderAmt);
+            if (isOnline) {
+              onlineSumAllSaleAmt = onlineSumAllSaleAmt.add(allOrderAmt);
+            } else {
+              offlineSumAllSaleAmt = offlineSumAllSaleAmt.add(allOrderAmt);
+            }
           }
 
           // 预付累积金额
@@ -215,8 +241,11 @@ public class DayStatTask {
       }
     }
 
-    sb.append("累计零售销售额:").append(sumAllSaleAmt).append("元,当日:").append(sumSaleAmt).append("元\n");
-    sb.append("累计预付销售额:").append(sumAllPreSaleAmt).append("元,当日:").append(sumPreSaleAmt).append("元\n");
+    sb.append("线上累计零售销售金额:").append(onlineSumAllSaleAmt).append("元,当日:").append(onlineSumSaleAmt).append("元\n");
+    sb.append("线下累计零售销售金额:").append(offlineSumAllSaleAmt).append("元,当日:").append(offlineSumSaleAmt).append("元,").append("累计预付销售金额:").append(sumAllPreSaleAmt).append("元,当日:").append(sumPreSaleAmt).append("元\n");
+
+//    sb.append("累计零售销售额:").append(sumAllSaleAmt).append("元,当日:").append(sumSaleAmt).append("元\n");
+//    sb.append("累计预付销售额:").append(sumAllPreSaleAmt).append("元,当日:").append(sumPreSaleAmt).append("元\n");
     Map<String, Object> commMap = channelCommissionService.getMap(
         new QueryWrapper<ChannelCommission>()
             .select("IFNULL(sum(comm_amt) ,0) as commAmt")
@@ -235,24 +264,48 @@ public class DayStatTask {
                   new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
-    Map<String, Object> couponMap = channelCouponVerifyLogService.getMap(
-        new QueryWrapper<ChannelCouponVerifyLog>()
-            .select("IFNULL(sum(discount) ,0) as discount")
-            .lambda().ge(ChannelCouponVerifyLog::getCreatedTime, bizDay)
-            .lt(ChannelCouponVerifyLog::getCreatedTime, DateUtils.addDays(bizDay, 1))
-            .eq(ChannelCouponVerifyLog::getDiscountType, CouponDiscountTypeEnum.MONEY_OFF));
-    Map<String, Object> allCouponMap = channelCouponVerifyLogService.getMap(
-        new QueryWrapper<ChannelCouponVerifyLog>()
-            .select("IFNULL(sum(discount) ,0) as discount")
-            .lambda().lt(ChannelCouponVerifyLog::getCreatedTime, DateUtils.addDays(bizDay, 1))
-            .eq(ChannelCouponVerifyLog::getDiscountType, CouponDiscountTypeEnum.MONEY_OFF));
     if (null != commMap) {
-      sb.append("累计核销:").append(
-              new BigDecimal(Integer.valueOf(String.valueOf(allCouponMap.get("discount")))).divide(
-                  new BigDecimal(100), 2, RoundingMode.DOWN))
-          .append("元,当日:").append(
-              new BigDecimal(Integer.valueOf(String.valueOf(couponMap.get("discount")))).divide(
-                  new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+      // 线上核销统计
+      QueryWrapper<ChannelCouponVerifyLog> onlineDisCountQueryWrapper = new QueryWrapper<>();
+      onlineDisCountQueryWrapper.ge("t1.created_time", bizDay);
+      onlineDisCountQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+      onlineDisCountQueryWrapper.eq("t1.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      onlineDisCountQueryWrapper.eq("t3.type", CouponTypeEnum.TICKET_ORDER);
+      Integer onlineDisCount = channelCouponVerifyLogService.sumDisCountByQueryWrapper(onlineDisCountQueryWrapper);
+      QueryWrapper<ChannelCouponVerifyLog> onlineAllDisCountQueryWrapper = new QueryWrapper<>();
+      onlineAllDisCountQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+      onlineAllDisCountQueryWrapper.eq("t1.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      onlineAllDisCountQueryWrapper.eq("t3.type", CouponTypeEnum.TICKET_ORDER);
+      Integer onlineAllDisCount = channelCouponVerifyLogService.sumDisCountByQueryWrapper(onlineAllDisCountQueryWrapper);
+
+      // 线下核销统计
+      QueryWrapper<ChannelCouponVerifyLog> offlineDisCountQueryWrapper = new QueryWrapper<>();
+      offlineDisCountQueryWrapper.ge("t1.created_time", bizDay);
+      offlineDisCountQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+      offlineDisCountQueryWrapper.eq("t1.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      offlineDisCountQueryWrapper.eq("t3.type", CouponTypeEnum.SITE_CONSUME);
+      Integer offlineDisCount = channelCouponVerifyLogService.sumDisCountByQueryWrapper(offlineDisCountQueryWrapper);
+      QueryWrapper<ChannelCouponVerifyLog> offlineAllDisCountQueryWrapper = new QueryWrapper<>();
+      offlineAllDisCountQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+      offlineAllDisCountQueryWrapper.eq("t1.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      offlineAllDisCountQueryWrapper.eq("t3.type", CouponTypeEnum.SITE_CONSUME);
+      Integer offlineAllDisCount = channelCouponVerifyLogService.sumDisCountByQueryWrapper(offlineAllDisCountQueryWrapper);
+
+
+      sb.append("线上券累计核销金额:").append(
+                      new BigDecimal(Integer.valueOf(String.valueOf(onlineAllDisCount))).divide(
+                              new BigDecimal(100), 2, RoundingMode.DOWN))
+              .append("元,当日:").append(
+                      new BigDecimal(Integer.valueOf(String.valueOf(onlineDisCount))).divide(
+                              new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+
+      sb.append("线下券累计核销金额:").append(
+                      new BigDecimal(Integer.valueOf(String.valueOf(offlineAllDisCount))).divide(
+                              new BigDecimal(100), 2, RoundingMode.DOWN))
+              .append("元,当日:").append(
+                      new BigDecimal(Integer.valueOf(String.valueOf(offlineDisCount))).divide(
+                              new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+
     }
 
     Map<String, Object> withdrawMap = channelWithdrawService.getMap(
@@ -281,6 +334,52 @@ public class DayStatTask {
                   new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
     }
 
+
+    // 线上和线下派发券金额统计
+    QueryWrapper<UserCoupon> onlineUserCouponQueryWrapper = new QueryWrapper<>();
+    onlineUserCouponQueryWrapper.ge("t1.created_time", bizDay);
+    onlineUserCouponQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+    onlineUserCouponQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+    onlineUserCouponQueryWrapper.eq("t2.type", CouponTypeEnum.TICKET_ORDER);
+    Integer onlineUserCouponDisSum = userCouponService.sumDiscountByQueryWrapper(onlineUserCouponQueryWrapper);
+
+
+    QueryWrapper<UserCoupon> onlineAllUserCouponQueryWrapper = new QueryWrapper<>();
+    onlineAllUserCouponQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+    onlineAllUserCouponQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+    onlineAllUserCouponQueryWrapper.eq("t2.type", CouponTypeEnum.TICKET_ORDER);
+    Integer onlineAllUserCouponDisSum = userCouponService.sumDiscountByQueryWrapper(onlineAllUserCouponQueryWrapper);
+
+
+    QueryWrapper<UserCoupon> offlineUserCouponQueryWrapper = new QueryWrapper<>();
+    offlineUserCouponQueryWrapper.ge("t1.created_time", bizDay);
+    offlineUserCouponQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+    offlineUserCouponQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+    offlineUserCouponQueryWrapper.eq("t2.type", CouponTypeEnum.SITE_CONSUME);
+    Integer offlineUserCouponDisSum = userCouponService.sumDiscountByQueryWrapper(offlineUserCouponQueryWrapper);
+
+
+    QueryWrapper<UserCoupon> offlineAllUserCouponQueryWrapper = new QueryWrapper<>();
+    offlineAllUserCouponQueryWrapper.lt("t1.created_time", DateUtils.addDays(bizDay, 1));
+    offlineAllUserCouponQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+    offlineAllUserCouponQueryWrapper.eq("t2.type", CouponTypeEnum.SITE_CONSUME);
+    Integer offlineAllUserCouponDisSum = userCouponService.sumDiscountByQueryWrapper(offlineAllUserCouponQueryWrapper);
+
+    sb.append("线上累计派券金额:").append(
+                    new BigDecimal(Integer.valueOf(String.valueOf(onlineAllUserCouponDisSum))).divide(
+                            new BigDecimal(100), 2, RoundingMode.DOWN))
+            .append("元,当日:").append(
+                    new BigDecimal(Integer.valueOf(String.valueOf(onlineUserCouponDisSum))).divide(
+                            new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+
+    sb.append("线下累计派券金额:").append(
+                    new BigDecimal(Integer.valueOf(String.valueOf(offlineAllUserCouponDisSum))).divide(
+                            new BigDecimal(100), 2, RoundingMode.DOWN))
+            .append("元,当日:").append(
+                    new BigDecimal(Integer.valueOf(String.valueOf(offlineUserCouponDisSum))).divide(
+                            new BigDecimal(100), 2, RoundingMode.DOWN)).append("元\n");
+
+
     int exCnt = userExchangeOrderService.count(new LambdaQueryWrapper<UserExchangeOrder>()
         .ge(UserExchangeOrder::getCreatedTime, bizDay)
         .lt(UserExchangeOrder::getCreatedTime, DateUtils.addDays(bizDay, 1)));
@@ -319,7 +418,25 @@ public class DayStatTask {
     }
     sb.append("===================\n");
     sb.append(sbDetail);
-    LogUtil.info(logger, "通知发送结果:" + WebhookService.sendBizData(sb.toString()));
+
+    // 分割,超过15条则分批发送
+    String data = sb.toString();
+    String[] dataArray = data.split("------------------------");
+    if (dataArray.length >= 15) {
+      int count = 0;
+      StringBuilder body = new StringBuilder();
+      for (int i = 0; i < dataArray.length; i++) {
+        count++;
+        body.append(dataArray[i]).append("------------------------");
+        if (count >= 15 || i >= dataArray.length - 1) {
+          LogUtil.info(logger, "通知发送结果:" + WebhookService.sendBizData(body.toString()));
+          body.delete(0, body.length());
+          count = 0;
+        }
+      }
+    } else {
+      LogUtil.info(logger, "通知发送结果:" + WebhookService.sendBizData(data));
+    }
     LogUtil.info(logger, sb.toString());
     LogUtil.info(logger, "...日统计任务结束..." );
   }

+ 1 - 1
mp-service/src/main/java/com/qs/mp/admin/domain/excel/UserTicketOrderItemExcel.java

@@ -57,7 +57,7 @@ public class UserTicketOrderItemExcel {
     private Date createdTime;
 
     @Excel(name = "用户昵称")
-    private String userName;
+    private String nickName;
 
     @Excel(name = "用户手机号")
     private String userPhone;

+ 1 - 1
mp-service/src/main/java/com/qs/mp/admin/domain/vo/UserTicketOrderItemVO.java

@@ -63,7 +63,7 @@ public class UserTicketOrderItemVO {
     private Date createdTime;
 
     @ApiModelProperty("用户昵称")
-    private String userName;
+    private String nickName;
 
     @ApiModelProperty("用户手机号")
     private String userPhone;

+ 9 - 0
mp-service/src/main/java/com/qs/mp/channel/mapper/ChannelCouponVerifyLogMapper.java

@@ -1,7 +1,10 @@
 package com.qs.mp.channel.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.channel.domain.ChannelCouponVerifyLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @auther quanshu
@@ -10,4 +13,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ChannelCouponVerifyLogMapper extends BaseMapper<ChannelCouponVerifyLog> {
 
+    /**
+     * 根据条件统计优惠券核销金额
+     * @param queryWrapper
+     * @return
+     */
+    Integer sumDisCountByQueryWrapper(@Param(Constants.WRAPPER) QueryWrapper<ChannelCouponVerifyLog> queryWrapper);
 }

+ 9 - 0
mp-service/src/main/java/com/qs/mp/channel/service/IChannelCouponVerifyLogService.java

@@ -1,5 +1,6 @@
 package com.qs.mp.channel.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.channel.domain.ChannelCouponVerifyLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qs.mp.user.domain.UserCoupon;
@@ -20,4 +21,12 @@ public interface IChannelCouponVerifyLogService extends IService<ChannelCouponVe
    * @param userCoupon
    */
   void verify(Long channelId, UserCoupon userCoupon);
+
+  /**
+   * 根据条件统计优惠券核销金额
+   * @param queryWrapper
+   * @return
+   */
+  Integer sumDisCountByQueryWrapper(QueryWrapper<ChannelCouponVerifyLog> queryWrapper);
+
 }

+ 6 - 1
mp-service/src/main/java/com/qs/mp/channel/service/impl/ChannelCouponVerifyLogServiceImpl.java

@@ -1,5 +1,6 @@
 package com.qs.mp.channel.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.admin.domain.Coupon;
 import com.qs.mp.admin.service.ICouponService;
@@ -48,7 +49,7 @@ public class ChannelCouponVerifyLogServiceImpl extends ServiceImpl<ChannelCoupon
   private IChannelMoneyLogService channelMoneyLogService;
 
   @Override
-  @Transactional
+  @Transactional(rollbackFor = Exception.class)
   public void verify(Long channelId, UserCoupon userCoupon) {
     Date verifyDate = new Date();
     // 核销券
@@ -95,4 +96,8 @@ public class ChannelCouponVerifyLogServiceImpl extends ServiceImpl<ChannelCoupon
     }
   }
 
+  @Override
+  public Integer sumDisCountByQueryWrapper(QueryWrapper<ChannelCouponVerifyLog> queryWrapper) {
+    return getBaseMapper().sumDisCountByQueryWrapper(queryWrapper);
+  }
 }

+ 8 - 0
mp-service/src/main/java/com/qs/mp/user/mapper/UserCouponMapper.java

@@ -1,6 +1,7 @@
 package com.qs.mp.user.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.TicketAwardsPrize;
 import com.qs.mp.admin.domain.vo.TicketAwardsPrizeVO;
@@ -18,4 +19,11 @@ import org.apache.ibatis.annotations.Param;
 public interface UserCouponMapper extends BaseMapper<UserCoupon> {
 
   List<UserCouponVO> listUserCouponVO(@Param(Constants.WRAPPER) Wrapper<UserCoupon> queryWrapper);
+
+  /**
+   * 根据条件统计派发优惠券金额
+   * @param queryWrapper
+   * @return
+   */
+  Integer sumDiscountByQueryWrapper(@Param(Constants.WRAPPER) QueryWrapper<UserCoupon> queryWrapper);
 }

+ 8 - 0
mp-service/src/main/java/com/qs/mp/user/service/IUserCouponService.java

@@ -1,6 +1,7 @@
 package com.qs.mp.user.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.common.enums.UserCouponStatusEnum;
@@ -49,4 +50,11 @@ public interface IUserCouponService extends IService<UserCoupon> {
    * @return
    */
   List<UserCouponVO> queryUserCouponList(Long userId, Integer orderAmt, TicketBox ticketBox);
+
+  /**
+   * 根据条件统计派发优惠券金额
+   * @param queryWrapper
+   * @return
+   */
+  Integer sumDiscountByQueryWrapper(QueryWrapper<UserCoupon> queryWrapper);
 }

+ 6 - 0
mp-service/src/main/java/com/qs/mp/user/service/impl/UserCouponServiceImpl.java

@@ -115,4 +115,10 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
             .orderByDesc("t2.discount","t1.id"));
     return userCouponVOList;
   }
+
+
+  @Override
+  public Integer sumDiscountByQueryWrapper(QueryWrapper<UserCoupon> queryWrapper) {
+    return getBaseMapper().sumDiscountByQueryWrapper(queryWrapper);
+  }
 }

+ 7 - 0
mp-service/src/main/resources/mapper/channel/ChannelCouponVerifyLogMapper.xml

@@ -25,4 +25,11 @@
         id, channel_id, user_coupon_id, verify_code, title, discount_type, discount, distribute_time, valid_start, valid_end, verify_time, settle_status, created_time, updated_time
     </sql>
 
+    <select id="sumDisCountByQueryWrapper" resultType="java.lang.Integer">
+        select IFNULL(sum(t1.discount) ,0)
+        from mp_channel_coupon_verify_log t1
+        left join mp_user_coupon t2 on t1.user_coupon_id = t2.id
+        left join mp_coupon t3 on t2.coupon_id = t3.coupon_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

+ 6 - 0
mp-service/src/main/resources/mapper/user/UserCouponMapper.xml

@@ -30,4 +30,10 @@
             ${ew.customSqlSegment}
     </select>
 
+    <select id="sumDiscountByQueryWrapper" resultType="java.lang.Integer">
+        select  IFNULL(sum(t2.discount) ,0)
+        from mp_user_coupon t1
+        left join mp_coupon t2 on t1.coupon_id = t2.coupon_id
+        ${ew.customSqlSegment}
+    </select>
 </mapper>

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

@@ -84,7 +84,7 @@
                t1.order_id,
                t2.status orderStatus,
                t2.created_time,
-               t8.user_name,
+               t8.nick_name,
                t8.phonenumber userPhone,
                t7.name channelName
         from mp_user_ticket_order_item t1