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

Mp server test

See merge request quanshu/mp-server!739

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

@@ -265,31 +265,36 @@ public class DayStatTask {
     }
 
     if (null != commMap) {
+
       // 线上核销统计
-      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<UserCoupon> onlineDisCountQueryWrapper = new QueryWrapper<>();
+      onlineDisCountQueryWrapper.ge("t1.verify_time", bizDay);
+      onlineDisCountQueryWrapper.lt("t1.verify_time", DateUtils.addDays(bizDay, 1));
+      onlineDisCountQueryWrapper.eq("t1.status", UserCouponStatusEnum.USED);
+      onlineDisCountQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      onlineDisCountQueryWrapper.eq("t2.type", CouponTypeEnum.TICKET_ORDER);
+      Integer onlineDisCount = userCouponService.sumDiscountByQueryWrapper(onlineDisCountQueryWrapper);
+      QueryWrapper<UserCoupon> onlineAllDisCountQueryWrapper = new QueryWrapper<>();
+      onlineAllDisCountQueryWrapper.lt("t1.verify_time", DateUtils.addDays(bizDay, 1));
+      onlineAllDisCountQueryWrapper.eq("t1.status", UserCouponStatusEnum.USED);
+      onlineAllDisCountQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      onlineAllDisCountQueryWrapper.eq("t2.type", CouponTypeEnum.TICKET_ORDER);
+      Integer onlineAllDisCount = userCouponService.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);
+      QueryWrapper<UserCoupon> offlineDisCountQueryWrapper = new QueryWrapper<>();
+      offlineDisCountQueryWrapper.ge("t1.verify_time", bizDay);
+      offlineDisCountQueryWrapper.lt("t1.verify_time", DateUtils.addDays(bizDay, 1));
+      offlineDisCountQueryWrapper.eq("t1.status", UserCouponStatusEnum.USED);
+      offlineDisCountQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      offlineDisCountQueryWrapper.eq("t2.type", CouponTypeEnum.SITE_CONSUME);
+      Integer offlineDisCount = userCouponService.sumDiscountByQueryWrapper(offlineDisCountQueryWrapper);
+      QueryWrapper<UserCoupon> offlineAllDisCountQueryWrapper = new QueryWrapper<>();
+      offlineAllDisCountQueryWrapper.lt("t1.verify_time", DateUtils.addDays(bizDay, 1));
+      offlineAllDisCountQueryWrapper.eq("t1.status", UserCouponStatusEnum.USED);
+      offlineAllDisCountQueryWrapper.eq("t2.discount_type", CouponDiscountTypeEnum.MONEY_OFF);
+      offlineAllDisCountQueryWrapper.eq("t2.type", CouponTypeEnum.SITE_CONSUME);
+      Integer offlineAllDisCount = userCouponService.sumDiscountByQueryWrapper(offlineAllDisCountQueryWrapper);
 
 
       sb.append("线上券累计核销金额：").append(