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

新人发券优化

See merge request quanshu/mp-server!1032

mp-service/src/main/java/com/qs/mp/framework/service/impl/AsyncTaskServiceImpl.java

@@ -302,7 +302,7 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
         // 捞取已上架的新人发放优惠券
         List<Coupon> couponList = couponService.list(new LambdaQueryWrapper<Coupon>()
             .eq(Coupon::getType, CouponTypeEnum.TICKET_ORDER)
-            .eq(Coupon::getStatus, CouponStatusEnum.PUT_OFF)
+            .eq(Coupon::getStatus, CouponStatusEnum.PUT_ON)
             .eq(Coupon::getIsNewUserCoupon, 1));
         if (CollectionUtils.isEmpty(couponList)) {
             logger.info("未查到设置的新人优惠券，bizId={}", asyncTask.getBizId());
@@ -311,6 +311,8 @@ public class AsyncTaskServiceImpl extends ServiceImpl<AsyncTaskMapper, AsyncTask
         for (Coupon coupon : couponList) {
             couponService.distributeByNewUser(sysUser.getUserId(), coupon.getCouponId());
         }
+        logger.info("发放新人优惠券任务结束，bizId={}", asyncTask.getBizId());
+
     }