sms_push_event_user 复用

This commit is contained in:
2025-10-20 10:51:18 +08:00
parent 78af79294d
commit 05a3be5ecb
3 changed files with 15 additions and 3 deletions

View File

@@ -52,6 +52,7 @@ public class AAMarketTasks {
}
//月累计 发送条数 累计金额
@Resource
private SmsShopMoneyTask smsShopMoneyTask;
//每月1号 0点 0分 1秒 执行

View File

@@ -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;

View File

@@ -69,7 +69,9 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
continue;
}
SmsPushEventUser eventUser = eventUserMapper.selectOneByQuery(
new QueryWrapper().eq(SmsPushEventUser::getEventId, record.getId())
new QueryWrapper()
.eq(SmsPushEventUser::getType, "sms")
.eq(SmsPushEventUser::getEventId, record.getId())
);
record.setSmsPushEventUser(eventUser);
}
@@ -96,6 +98,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
save(pushEvent);
if (param.getUserType() == 2) {
SmsPushEventUser eventUser = param.getSmsPushEventUser();
eventUser.setType("sms");
eventUser.setShopId(param.getShopId());
eventUser.setEventId(pushEvent.getId());
eventUserMapper.insert(eventUser);
@@ -129,6 +132,7 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
eventUserMapper.deleteByQuery(new QueryWrapper().eq(SmsPushEventUser::getEventId, pushEvent.getId()));
if (param.getUserType() == 2) {
SmsPushEventUser eventUser = param.getSmsPushEventUser();
eventUser.setType("sms");
eventUser.setShopId(param.getShopId());
eventUser.setEventId(pushEvent.getId());
eventUserMapper.insert(eventUser);
@@ -146,7 +150,9 @@ public class SmsPushEventServiceImpl extends ServiceImpl<SmsPushEventMapper, Sms
AssertUtil.isNull(smsPushEvent, "券发放失败,推送事件不存在");
SmsPushEventDTO pushEvent = BeanUtil.toBean(smsPushEvent, SmsPushEventDTO.class);
SmsPushEventUser eventUser = eventUserMapper.selectOneByQuery(
new QueryWrapper().eq(SmsPushEventUser::getEventId, eventId)
new QueryWrapper()
.eq(SmsPushEventUser::getType, "sms")
.eq(SmsPushEventUser::getEventId, eventId)
);
pushEvent.setSmsPushEventUser(eventUser);
if (StrUtil.isNotBlank(pushEvent.getCoupon())) {