shopUser字段修改
This commit is contained in:
@@ -56,7 +56,7 @@ public class ShopUser implements Serializable {
|
|||||||
/**
|
/**
|
||||||
* 会员生日
|
* 会员生日
|
||||||
*/
|
*/
|
||||||
private LocalDate birthDay;
|
private String birthDay;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 0-女 1男
|
* 0-女 1男
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ public class MkBirthdayGiftServiceImpl extends ServiceImpl<MkBirthdayGiftMapper,
|
|||||||
MkBirthdayGiftRecord giftRecord = new MkBirthdayGiftRecord().setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId())
|
MkBirthdayGiftRecord giftRecord = new MkBirthdayGiftRecord().setUserId(shopUser.getUserId()).setShopUserId(shopUser.getId())
|
||||||
.setPushStatus(birthdayGift.getSendSms() == 1 ?
|
.setPushStatus(birthdayGift.getSendSms() == 1 ?
|
||||||
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(shopUser.getBirthDay())
|
.setMainShopId(birthdayGift.getMainShopId()).setBirthday(DateUtil.parseDate(shopUser.getBirthDay()).toLocalDateTime().toLocalDate())
|
||||||
.setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
|
.setSourceId(birthdayGift.getId()).setTemplateCode(shopTemplate.getTemplateCode()).setTemplateContent(JSONObject.toJSONString(Map.of(
|
||||||
"nickName", shopUser.getNickName(),
|
"nickName", shopUser.getNickName(),
|
||||||
"shopName", shopInfo.getShopName(),
|
"shopName", shopInfo.getShopName(),
|
||||||
|
|||||||
Reference in New Issue
Block a user