同步 master 分支代码

yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/job/CouponExpireJob.java

@@ -14,13 +14,13 @@ import javax.annotation.Resource;
  * @author owen
  */
 @Component
-@TenantJob
 public class CouponExpireJob implements JobHandler {
 
     @Resource
     private CouponService couponService;
 
     @Override
+    @TenantJob
     public String execute(String param) {
         int count = couponService.expireCoupon();
         return StrUtil.format("过期优惠券 {} 个", count);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/brokerage/BrokerageRecordUnfreezeJob.java

@@ -14,13 +14,13 @@ import javax.annotation.Resource;
  * @author owen
  */
 @Component
-@TenantJob
 public class BrokerageRecordUnfreezeJob implements JobHandler {
 
     @Resource
     private BrokerageRecordService brokerageRecordService;
 
     @Override
+    @TenantJob
     public String execute(String param) {
         int count = brokerageRecordService.unfreezeRecord();
         return StrUtil.format("解冻佣金 {} 个", count);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/order/TradeOrderAutoCancelJob.java

@@ -13,13 +13,13 @@ import javax.annotation.Resource;
  * @author 芋道源码
  */
 @Component
-@TenantJob
 public class TradeOrderAutoCancelJob implements JobHandler {
 
     @Resource
     private TradeOrderUpdateService tradeOrderUpdateService;
 
     @Override
+    @TenantJob
     public String execute(String param) {
         int count = tradeOrderUpdateService.cancelOrderBySystem();
         return String.format("过期订单 %s 个", count);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/order/TradeOrderAutoCommentJob.java

@@ -13,13 +13,13 @@ import javax.annotation.Resource;
  * @author 芋道源码
  */
 @Component
-@TenantJob
 public class TradeOrderAutoCommentJob implements JobHandler {
 
     @Resource
     private TradeOrderUpdateService tradeOrderUpdateService;
 
     @Override
+    @TenantJob
     public String execute(String param) {
         int count = tradeOrderUpdateService.createOrderItemCommentBySystem();
         return String.format("评论订单 %s 个", count);

yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/job/order/TradeOrderAutoReceiveJob.java

@@ -13,13 +13,13 @@ import javax.annotation.Resource;
  * @author 芋道源码
  */
 @Component
-@TenantJob
 public class TradeOrderAutoReceiveJob implements JobHandler {
 
     @Resource
     private TradeOrderUpdateService tradeOrderUpdateService;
 
     @Override
+    @TenantJob
     public String execute(String param) {
         int count = tradeOrderUpdateService.receiveOrderBySystem();
         return String.format("自动收货 %s 个", count);