Commit 9cd36abf10aaf79006f4307a5abb8901c7c71668

Authored by YunaiV
1 parent 5913ee07

同步 master 分支代码

... ... @@ -19,8 +19,8 @@
19 19 <!-- <module>yudao-module-bpm</module>-->
20 20 <!-- <module>yudao-module-report</module>-->
21 21 <!-- <module>yudao-module-mp</module>-->
22   -<!-- <module>yudao-module-pay</module>-->
23   -<!-- <module>yudao-module-mall</module>-->
  22 + <module>yudao-module-pay</module>
  23 + <module>yudao-module-mall</module>
24 24 <!-- 示例项目 -->
25 25 <module>yudao-example</module>
26 26 </modules>
... ...
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;
14 14 * @author owen
15 15 */
16 16 @Component
17   -@TenantJob
18 17 public class CouponExpireJob implements JobHandler {
19 18  
20 19 @Resource
21 20 private CouponService couponService;
22 21  
23 22 @Override
  23 + @TenantJob
24 24 public String execute(String param) {
25 25 int count = couponService.expireCoupon();
26 26 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;
14 14 * @author owen
15 15 */
16 16 @Component
17   -@TenantJob
18 17 public class BrokerageRecordUnfreezeJob implements JobHandler {
19 18  
20 19 @Resource
21 20 private BrokerageRecordService brokerageRecordService;
22 21  
23 22 @Override
  23 + @TenantJob
24 24 public String execute(String param) {
25 25 int count = brokerageRecordService.unfreezeRecord();
26 26 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;
13 13 * @author 芋道源码
14 14 */
15 15 @Component
16   -@TenantJob
17 16 public class TradeOrderAutoCancelJob implements JobHandler {
18 17  
19 18 @Resource
20 19 private TradeOrderUpdateService tradeOrderUpdateService;
21 20  
22 21 @Override
  22 + @TenantJob
23 23 public String execute(String param) {
24 24 int count = tradeOrderUpdateService.cancelOrderBySystem();
25 25 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;
13 13 * @author 芋道源码
14 14 */
15 15 @Component
16   -@TenantJob
17 16 public class TradeOrderAutoCommentJob implements JobHandler {
18 17  
19 18 @Resource
20 19 private TradeOrderUpdateService tradeOrderUpdateService;
21 20  
22 21 @Override
  22 + @TenantJob
23 23 public String execute(String param) {
24 24 int count = tradeOrderUpdateService.createOrderItemCommentBySystem();
25 25 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;
13 13 * @author 芋道源码
14 14 */
15 15 @Component
16   -@TenantJob
17 16 public class TradeOrderAutoReceiveJob implements JobHandler {
18 17  
19 18 @Resource
20 19 private TradeOrderUpdateService tradeOrderUpdateService;
21 20  
22 21 @Override
  22 + @TenantJob
23 23 public String execute(String param) {
24 24 int count = tradeOrderUpdateService.receiveOrderBySystem();
25 25 return String.format("自动收货 %s 个", count);
... ...
yudao-server/pom.xml
... ... @@ -37,11 +37,11 @@
37 37 </dependency>
38 38  
39 39 <!-- 会员中心。默认注释,保证编译速度 -->
40   -<!-- <dependency>-->
41   -<!-- <groupId>cn.iocoder.boot</groupId>-->
42   -<!-- <artifactId>yudao-module-member-biz</artifactId>-->
43   -<!-- <version>${revision}</version>-->
44   -<!-- </dependency>-->
  40 + <dependency>
  41 + <groupId>cn.iocoder.boot</groupId>
  42 + <artifactId>yudao-module-member-biz</artifactId>
  43 + <version>${revision}</version>
  44 + </dependency>
45 45  
46 46 <!-- 数据报表。默认注释,保证编译速度 -->
47 47 <!-- <dependency>-->
... ... @@ -56,11 +56,11 @@
56 56 <!-- <version>${revision}</version>-->
57 57 <!-- </dependency>-->
58 58 <!-- 支付服务。默认注释,保证编译速度 -->
59   -<!-- <dependency>-->
60   -<!-- <groupId>cn.iocoder.boot</groupId>-->
61   -<!-- <artifactId>yudao-module-pay-biz</artifactId>-->
62   -<!-- <version>${revision}</version>-->
63   -<!-- </dependency>-->
  59 + <dependency>
  60 + <groupId>cn.iocoder.boot</groupId>
  61 + <artifactId>yudao-module-pay-biz</artifactId>
  62 + <version>${revision}</version>
  63 + </dependency>
64 64  
65 65 <!-- 微信公众号模块。默认注释,保证编译速度 -->
66 66 <!-- <dependency>-->
... ... @@ -70,21 +70,21 @@
70 70 <!-- </dependency>-->
71 71  
72 72 <!-- 商城相关模块。默认注释,保证编译速度 -->
73   -<!-- <dependency>-->
74   -<!-- <groupId>cn.iocoder.boot</groupId>-->
75   -<!-- <artifactId>yudao-module-promotion-biz</artifactId>-->
76   -<!-- <version>${revision}</version>-->
77   -<!-- </dependency>-->
78   -<!-- <dependency>-->
79   -<!-- <groupId>cn.iocoder.boot</groupId>-->
80   -<!-- <artifactId>yudao-module-product-biz</artifactId>-->
81   -<!-- <version>${revision}</version>-->
82   -<!-- </dependency>-->
83   -<!-- <dependency>-->
84   -<!-- <groupId>cn.iocoder.boot</groupId>-->
85   -<!-- <artifactId>yudao-module-trade-biz</artifactId>-->
86   -<!-- <version>${revision}</version>-->
87   -<!-- </dependency>-->
  73 + <dependency>
  74 + <groupId>cn.iocoder.boot</groupId>
  75 + <artifactId>yudao-module-promotion-biz</artifactId>
  76 + <version>${revision}</version>
  77 + </dependency>
  78 + <dependency>
  79 + <groupId>cn.iocoder.boot</groupId>
  80 + <artifactId>yudao-module-product-biz</artifactId>
  81 + <version>${revision}</version>
  82 + </dependency>
  83 + <dependency>
  84 + <groupId>cn.iocoder.boot</groupId>
  85 + <artifactId>yudao-module-trade-biz</artifactId>
  86 + <version>${revision}</version>
  87 + </dependency>
88 88  
89 89 <!-- spring boot 配置所需依赖 -->
90 90 <dependency>
... ...