diff --git a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java index 693de631f..a12c30cd4 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java +++ b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java @@ -52,6 +52,7 @@ public class AAMarketTasks { } + //月累计 发送条数 累计金额 @Resource private SmsShopMoneyTask smsShopMoneyTask; //每月1号 0点 0分 1秒 执行 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java index b25237c77..7176b5686 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/SmsPushEventUser.java @@ -35,7 +35,12 @@ public class SmsPushEventUser implements Serializable { private Long id; /** - * sms_user_push_event的id + * sms-短信 ac-公众号 + */ + private String type; + + /** + * sms_push_event的id 或者ac_push_event 的 id */ private Long eventId; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java index c15b8e8db..606390289 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/SmsPushEventServiceImpl.java @@ -69,7 +69,9 @@ public class SmsPushEventServiceImpl extends ServiceImpl