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 | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 88412db..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
@@ -410,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) {
@@ -725,6 +725,12 @@
);
}
+ /**
+ * 娉ㄥ唽婊骞磋禒閫佷紭鎯犲埜锛堝畾鏃朵换鍔¤皟鐢級
+ * 瑙勫垯锛氭牴鎹繍钀ラ厤缃� registerCouponYears锛堟弧鍑犲勾璧犻�侊級銆乺egisterCouponGiftCount锛堣嚦澶氳禒閫佹鏁帮級銆乺egisterCouponId锛堣禒閫佷紭鎯犲埜ID鍒楄〃锛夛紝
+ * 閬嶅巻鎵�鏈夋櫘閫氫細鍛橈紝璁＄畻娉ㄥ唽骞撮檺锛屾瘡婊￠厤缃勾鏁拌禒閫佷竴娆★紝绱璧犻�佹鏁颁笉瓒呰繃閰嶇疆涓婇檺銆�
+ * 渚嬪锛氶厤缃弧2骞磋禒閫併�佽嚦澶�3娆★紝鍒欐敞鍐岀2/4/6骞村悇璧犻�佷竴娆★紝鍏�3娆°��
+ */
@Override
public void giftRegisterCoupon() {
// 1. 璇诲彇閰嶇疆
@@ -753,11 +759,17 @@
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();
--
Gitblit v1.9.3