czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

生日有礼发放修改

This commit is contained in:
张松 2025-10-20 09:34:47 +08:00
parent 3a1c30398c
commit a685819158
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkBirthdayGiftRecord.java
View File

@ -65,6 +65,7 @@ public class MkBirthdayGiftRecord implements Serializable {
private String templateContent; private String templateContent;
private String phone; private String phone;
private Long templateId; private Long templateId;
private Integer year;
} }

11
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkBirthdayGiftServiceImpl.java
View File

@ -151,6 +151,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
@Override @Override
public void deliver() { public void deliver() {
DateTime now = DateUtil.date();
list(new QueryWrapper().eq(MkBirthdayGift::getIsEnable, 1)).forEach(birthdayGift -> { list(new QueryWrapper().eq(MkBirthdayGift::getIsEnable, 1)).forEach(birthdayGift -> {
if (StrUtil.isNotBlank(birthdayGift.getConfigList())) { if (StrUtil.isNotBlank(birthdayGift.getConfigList())) {
SmsShopTemplate shopTemplate; SmsShopTemplate shopTemplate;
@ -168,19 +169,20 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
current = current.plusDays(config.getDeliverTime()); current = current.plusDays(config.getDeliverTime());
} }
} else { } else {
DateTime now = DateUtil.date();
// 获取当月第一天 // 获取当月第一天
current = DateUtil.beginOfMonth(now).toLocalDateTime().toLocalDate(); current = DateUtil.beginOfMonth(now).toLocalDateTime().toLocalDate();
} }
QueryWrapper queryWrapper = new QueryWrapper().isNotNull(ShopUser::getBirthDay) QueryWrapper queryWrapper = new QueryWrapper().isNotNull(ShopUser::getBirthDay)
.eq(ShopUser::getMainShopId, birthdayGift.getMainShopId()).eq(ShopUser::getBirthDay, current); .eq(ShopUser::getMainShopId, birthdayGift.getMainShopId())
.eq("DATE_FORMAT(birth_day, '%m-%d')", DateUtil.format(DateUtil.date(current), "MM-dd"));
if ("vip".equals(config.getUserType())) { if ("vip".equals(config.getUserType())) {
queryWrapper.eq(ShopUser::getIsVip, 1); queryWrapper.eq(ShopUser::getIsVip, 1);
} }
for (ShopUser shopUser : shopUserService.list(queryWrapper)) { for (ShopUser shopUser : shopUserService.list(queryWrapper)) {
long count = birthdayGiftRecordService.count(new QueryWrapper().eq(MkBirthdayGiftRecord::getUserId, shopUser.getUserId()).eq(MkBirthdayGiftRecord::getBirthday, current)); long count = birthdayGiftRecordService.count(new QueryWrapper().eq(MkBirthdayGiftRecord::getUserId, shopUser.getUserId())
.eq(MkBirthdayGiftRecord::getYear, DateUtil.year(now)));
if (count > 1) { if (count > 1) {
log.info("用户{}已领取过生日礼包", shopUser.getUserId()); log.info("用户{}已领取过生日礼包", shopUser.getUserId());
continue; continue;
@ -191,6 +193,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
TableValueConstant.BirthdayGiftRecord.PushStatus.WAIT_PUSH.getCode() : TableValueConstant.BirthdayGiftRecord.PushStatus.NO_PUSH.getCode()) TableValueConstant.BirthdayGiftRecord.PushStatus.WAIT_PUSH.getCode() : TableValueConstant.BirthdayGiftRecord.PushStatus.NO_PUSH.getCode())
.setMainShopId(birthdayGift.getMainShopId()).setBirthday(DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate()) .setMainShopId(birthdayGift.getMainShopId()).setBirthday(DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate())
.setPhone(shopUser.getPhone()).setTemplateId(shopTemplate == null ? null : shopTemplate.getId()) .setPhone(shopUser.getPhone()).setTemplateId(shopTemplate == null ? null : shopTemplate.getId())
.setYear(DateUtil.year(now))
.setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate == null ? null : shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of( .setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate == null ? null : shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
"用户昵称", shopUser.getNickName(), "用户昵称", shopUser.getNickName(),
"店铺名称", shopInfo.getShopName(), "店铺名称", shopInfo.getShopName(),
@ -221,9 +224,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
}, "优惠券发放失败"); }, "优惠券发放失败");
}); });
} }
} }
}); });
}); });