From 59bfd0b8bbbf0ee94ec68e4a3a1a6e536d0ad8fd Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 20 五月 2026 23:10:43 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 125 +++++++++++++++++++++++++++++------------
1 files changed, 89 insertions(+), 36 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index e0efcdd..6b196d9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -356,6 +356,8 @@
member.setAutoReceiveStatus(Constants.ONE);
member.setUserType(Constants.ZERO);
memberMapper.insert(member);
+ // 娉ㄥ唽璧犻�佷紭鎯犲埜
+ giftRegisterCoupons(member);
}
String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
AccountResponse accountResponse = new AccountResponse();
@@ -408,9 +410,9 @@
}
}
// 鏍规嵁openid鏌ヨ褰撳墠缁戝畾鐨勯棬搴�
- if (StringUtils.isNotBlank(member.getOpenid())) {
+ if (Objects.nonNull(member.getLoginShopId())) {
ShopInfo bindShop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
- .eq(ShopInfo::getOpenid, member.getOpenid())
+ .eq(ShopInfo::getId, member.getLoginShopId())
.eq(ShopInfo::getDeleted, Constants.ZERO)
.last("limit 1"));
if (bindShop != null) {
@@ -426,6 +428,7 @@
|| ( StringUtils.isBlank(member.getCoverImage())
&& StringUtils.isBlank(member.getName())
&& StringUtils.isBlank(member.getNickName())
+ && StringUtils.isBlank(member.getEmail())
&& Objects.isNull(member.getAutoReceiveStatus()) )){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
@@ -433,6 +436,7 @@
.set(StringUtils.isNotBlank(member.getNickName()),Member::getNickName,member.getNickName())
.set(StringUtils.isNotBlank(member.getName()),Member::getName,member.getName())
.set(StringUtils.isNotBlank(member.getCoverImage()),Member::getCoverImage,member.getCoverImage())
+ .set(StringUtils.isNotBlank(member.getEmail()),Member::getEmail,member.getEmail())
.set(Objects.nonNull(member.getAutoReceiveStatus()),Member::getAutoReceiveStatus,member.getAutoReceiveStatus())
.set(Member::getUpdateTime,new Date())
.eq(Member::getId,member.getId()));
@@ -452,6 +456,7 @@
userCenterVO.setTelephone(member.getTelephone());
userCenterVO.setCoverImage(member.getCoverImage());
userCenterVO.setOpenid(member.getOpenid());
+ userCenterVO.setEmail(member.getEmail());
if(StringUtils.isNotBlank(member.getCoverImage())){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILES).getCode();
@@ -720,35 +725,51 @@
);
}
+ /**
+ * 娉ㄥ唽婊骞磋禒閫佷紭鎯犲埜锛堝畾鏃朵换鍔¤皟鐢級
+ * 瑙勫垯锛氭牴鎹繍钀ラ厤缃� registerCouponYears锛堟弧鍑犲勾璧犻�侊級銆乺egisterCouponGiftCount锛堣嚦澶氳禒閫佹鏁帮級銆乺egisterCouponId锛堣禒閫佷紭鎯犲埜ID鍒楄〃锛夛紝
+ * 閬嶅巻鎵�鏈夋櫘閫氫細鍛橈紝璁＄畻娉ㄥ唽骞撮檺锛屾瘡婊￠厤缃勾鏁拌禒閫佷竴娆★紝绱璧犻�佹鏁颁笉瓒呰繃閰嶇疆涓婇檺銆�
+ * 渚嬪锛氶厤缃弧2骞磋禒閫併�佽嚦澶�3娆★紝鍒欐敞鍐岀2/4/6骞村悇璧犻�佷竴娆★紝鍏�3娆°��
+ */
@Override
public void giftRegisterCoupon() {
// 1. 璇诲彇閰嶇疆
OperationConfigDTO config = operationConfigBiz.getConfig();
String yearsStr = config.getRegisterCouponYears();
String maxGiftStr = config.getRegisterCouponGiftCount();
- String couponIdStr = config.getRegisterCouponId();
- if (StringUtils.isBlank(yearsStr) || StringUtils.isBlank(maxGiftStr) || StringUtils.isBlank(couponIdStr)) {
+ String couponIdsStr = config.getRegisterCouponId();
+ if (StringUtils.isBlank(yearsStr) || StringUtils.isBlank(maxGiftStr) || StringUtils.isBlank(couponIdsStr)) {
return;
}
int configYears = Integer.parseInt(yearsStr);
int maxGiftCount = Integer.parseInt(maxGiftStr);
- int couponId = Integer.parseInt(couponIdStr);
if (configYears <= 0 || maxGiftCount <= 0) {
return;
}
- // 2. 鏍￠獙浼樻儬鍒稿瓨鍦ㄤ笖鍚敤
- Coupon coupon = couponMapper.selectById(couponId);
- if (coupon == null || !Constants.equalsInteger(coupon.getIsdeleted(), Constants.ZERO)
- || !Constants.equalsInteger(coupon.getStatus(), Constants.ZERO)) {
+ // 2. 瑙ｆ瀽浼樻儬鍒窱D鍒楄〃锛屾煡璇㈡湁鏁堜紭鎯犲埜
+ List<Integer> couponIdList = Arrays.stream(couponIdsStr.split(","))
+ .map(String::trim).filter(StringUtils::isNotBlank)
+ .map(Integer::parseInt).collect(Collectors.toList());
+ List<Coupon> validCoupons = couponMapper.selectList(new QueryWrapper<Coupon>().lambda()
+ .in(Coupon::getId, couponIdList)
+ .eq(Coupon::getIsdeleted, Constants.ZERO)
+ .eq(Coupon::getStatus, Constants.ZERO));
+ if (CollectionUtils.isEmpty(validCoupons)) {
return;
}
- // 3. 鏌ヨ鎵�鏈夋櫘閫氫細鍛�
+ // 3. 鏁版嵁搴撳眰闈㈣繃婊わ細娉ㄥ唽婊onfigYears涓旀湭璧犳弧鐨勬櫘閫氫細鍛�
+ Calendar cal = Calendar.getInstance();
+ cal.add(Calendar.YEAR, -configYears);
+ Date minRegisterDate = cal.getTime();
+
List<Member> members = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getDeleted, Constants.ZERO)
.eq(Member::getStatus, Constants.ZERO)
.eq(Member::getUserType, Constants.ZERO)
+ .le(Member::getCreateTime, minRegisterDate)
+ .lt(Member::getRegisterCouponGiftCount, maxGiftCount)
.isNotNull(Member::getCreateTime));
Date now = new Date();
@@ -757,40 +778,37 @@
for (Member member : members) {
int alreadyGifted = member.getRegisterCouponGiftCount() != null ? member.getRegisterCouponGiftCount() : 0;
- // 宸叉敞鍐屽勾鏁帮紙鍙栨暣锛�
int registeredYears = (int) ((now.getTime() - member.getCreateTime().getTime()) / msPerYear);
- // 搴旇禒閫佹�绘鏁�
int shouldGiftTotal = registeredYears / configYears;
- // 瀹為檯杩橀渶璧犻�佹鏁�
int remainGift = Math.min(shouldGiftTotal, maxGiftCount) - alreadyGifted;
if (remainGift <= 0) {
continue;
}
- // 4. 璧犻�佷紭鎯犲埜
+ // 4. 姣忔璧犻�佹墍鏈夋湁鏁堜紭鎯犲埜
for (int i = 0; i < remainGift; i++) {
- MemberCoupon mc = new MemberCoupon();
- mc.setCouponId(couponId);
- mc.setMemberId(member.getId());
- mc.setStatus(Constants.CouponStatus.waitClaim.getKey());
- // 鎺ㄩ�佸悗棰嗗彇鏈夋晥鏈�
- Calendar validCal = Calendar.getInstance();
- validCal.add(Calendar.DAY_OF_MONTH, coupon.getPushDays() != null ? coupon.getPushDays() : 7);
- mc.setValidDate(validCal.getTime());
- // 鎷疯礉浼樻儬鍒镐俊鎭�
- mc.setName(coupon.getName());
- mc.setInfo(coupon.getInfo());
- mc.setType(coupon.getType());
- mc.setLimitPrice(coupon.getLimitPrice());
- mc.setPrice(coupon.getPrice());
- mc.setGetMethod(coupon.getGetMethod());
- mc.setCouponType(coupon.getCouponType());
- mc.setPushDays(coupon.getPushDays());
- mc.setValidDays(coupon.getValidDays());
- mc.setIsdeleted(Constants.ZERO);
- mc.setCreateDate(now);
- mc.setEditDate(now);
- memberCouponMapper.insert(mc);
+ for (Coupon coupon : validCoupons) {
+ MemberCoupon mc = new MemberCoupon();
+ mc.setCouponId(coupon.getId());
+ mc.setMemberId(member.getId());
+ mc.setStatus(Constants.CouponStatus.waitClaim.getKey());
+ Calendar validCal = Calendar.getInstance();
+ validCal.add(Calendar.DAY_OF_MONTH, coupon.getPushDays() != null ? coupon.getPushDays() : 7);
+ mc.setValidDate(validCal.getTime());
+ mc.setName(coupon.getName());
+ mc.setInfo(coupon.getInfo());
+ mc.setType(coupon.getType());
+ mc.setLimitPrice(coupon.getLimitPrice());
+ mc.setPrice(coupon.getPrice());
+ mc.setGetMethod(coupon.getGetMethod());
+ mc.setCouponType(coupon.getCouponType());
+ mc.setPushDays(coupon.getPushDays());
+ mc.setValidDays(coupon.getValidDays());
+ mc.setIsdeleted(Constants.ZERO);
+ mc.setCreateDate(now);
+ mc.setEditDate(now);
+ memberCouponMapper.insert(mc);
+ }
}
// 5. 鏇存柊浼氬憳宸茶禒閫佹鏁�
@@ -802,4 +820,39 @@
log.info("娉ㄥ唽婊″勾璧犻�佷紭鎯犲埜瀹屾垚锛屽叡澶勭悊{}鍚嶄細鍛�", giftedMemberCount);
}
+ private void giftRegisterCoupons(Member member) {
+ String couponIdsStr = operationConfigBiz.getConfig().getRegisterGiftCouponIds();
+ if (StringUtils.isBlank(couponIdsStr)) {
+ return;
+ }
+ String[] idArr = couponIdsStr.split(",");
+ Date now = new Date();
+ for (String idStr : idArr) {
+ String trimmed = idStr.trim();
+ if (StringUtils.isBlank(trimmed)) continue;
+ Coupon coupon = couponMapper.selectById(Integer.valueOf(trimmed));
+ if (coupon == null || Constants.equalsInteger(coupon.getIsdeleted(), Constants.ONE)) continue;
+ MemberCoupon mc = new MemberCoupon();
+ mc.setCouponId(coupon.getId());
+ mc.setMemberId(member.getId());
+ mc.setStatus(Constants.CouponStatus.waitClaim.getKey());
+ Calendar validCal = Calendar.getInstance();
+ validCal.add(Calendar.DAY_OF_MONTH, coupon.getPushDays() != null ? coupon.getPushDays() : 7);
+ mc.setValidDate(validCal.getTime());
+ mc.setName(coupon.getName());
+ mc.setInfo(coupon.getInfo());
+ mc.setType(coupon.getType());
+ mc.setLimitPrice(coupon.getLimitPrice());
+ mc.setPrice(coupon.getPrice());
+ mc.setGetMethod(coupon.getGetMethod());
+ mc.setCouponType(coupon.getCouponType());
+ mc.setPushDays(coupon.getPushDays());
+ mc.setValidDays(coupon.getValidDays());
+ mc.setIsdeleted(Constants.ZERO);
+ mc.setCreateDate(now);
+ mc.setEditDate(now);
+ memberCouponMapper.insert(mc);
+ }
+ }
+
}
--
Gitblit v1.9.3