From 417e33605dda0f28366a1d6e13c41198a156e3a7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 27 二月 2026 16:33:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index fce1c9a..cad8f60 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -253,13 +253,13 @@
.or().like(Member::getName,pageWrap.getModel().getNickname())
.or().like(Member::getPhone,pageWrap.getModel().getNickname())
);
- queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getStatus,pageWrap.getModel().getShopName());
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getShopName()),Shop::getName,pageWrap.getModel().getShopName());
queryWrapper.eq(pageWrap.getModel().getStatus()!=null,Member::getStatus,pageWrap.getModel().getStatus());
queryWrapper.eq(Member::getIsdeleted,Constants.ZERO);
queryWrapper.ge(pageWrap.getModel().getStarttime()!=null, Member::getCreateDate,pageWrap.getModel().getStarttime());
queryWrapper.le(pageWrap.getModel().getEndtime()!=null,Member::getCreateDate, pageWrap.getModel().getEndtime());
- queryWrapper.orderByDesc(Member::getCreateDate);
+ queryWrapper.orderByDesc(Member::getId);
IPage<Member> result = memberJoinMapper.selectJoinPage(page, Member.class, queryWrapper);
@@ -269,6 +269,10 @@
for(Member model:result.getRecords()){
if(StringUtils.isNotBlank(model.getImgurl())){
model.setImgFullUrl(path);
+ }
+ model.setTotalReduceIntegral(Constants.formatBigdecimal(model.getTotalIntegral()).subtract(Constants.formatBigdecimal(model.getIntegral())));
+ if(model.getTotalReduceIntegral().compareTo(new BigDecimal(0)) <=0){
+ model.setTotalReduceIntegral(new BigDecimal(0));
}
}
}
@@ -312,7 +316,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
}
Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, openId)
- .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
.last(" limit 1"));
AccountResponse accountResponse = new AccountResponse();
if(Objects.nonNull(member)){
@@ -356,44 +360,43 @@
if(Objects.isNull(phone)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈幏鍙栧埌鎵嬫満鍙�");
}
- Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getOpenId, wxPhoneRequest.getOpenid())
- .eq(Member::getIsdeleted,Constants.ZERO)
+ Member member = memberMapper.selectOne(new QueryWrapper<Member>().lambda().eq(Member::getPhone, phone)
+ .eq(Member::getIsdeleted,Constants.ZERO).eq(Member::getStatus,Constants.ZERO)
.last(" limit 1"));
if (member == null) {
member = new Member();
- member.setImgurl("20230410/4010b821-2137-4e6d-86e4-5ab9c06184a4.png");
member.setNickname("寰俊鐢ㄦ埛"+ CodeVerifyUtils.createVerificationCode(4));
member.setCreateDate(new Date());
member.setIsdeleted(Constants.ZERO);
member.setType(Constants.ZERO);
member.setOrigin(Constants.ZERO);
if(!this.checkIsCreateInvite(phone)){
- member.setRecId(Constants.getInviteCode(wxPhoneRequest.getRecId()));
+ member.setRecId(wxPhoneRequest.getRecId());
}
- member.setOpenId(wxPhoneRequest.getOpenid());
member.setIntegral(BigDecimal.ZERO);
+ member.setPhone(phone);
}
- member.setPhone(phone);
+ member.setOpenId(wxPhoneRequest.getOpenid());
member.setEditDate(new Date());
member.setImgFullUrl(systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+
systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILE).getCode()+member.getImgurl());
if(Objects.isNull(member.getId())){
memberMapper.insert(member);
-
PlatformConfigDTO platformConfigDTO = systemDictDataService.getPlatformConfigDTO();
this.createRegionReward(member,platformConfigDTO);
//鍒涘缓閭�璇疯褰�
this.createInviteRecord(member,platformConfigDTO);
- member.setSharingCode(this.createShareCode(member.getId()));
+// member.setSharingCode(this.createShareCode(member.getId()));
memberMapper.updateById(member);
}else{
- if(StringUtils.isBlank(member.getSharingCode())){
- member.setSharingCode(this.createShareCode(member.getId()));
- }
+// if(StringUtils.isBlank(member.getSharingCode())){
+// member.setSharingCode(this.createShareCode(member.getId()));
+// }
memberMapper.updateById(member);
}
-// JwtPayLoad payLoad = new JwtPayLoad(Constants.MEMBER_PREFIX+member.getId());
-// String token = JwtTokenUtil.generateToken(payLoad);
+ if(Objects.nonNull(wxPhoneRequest.getShopId())){
+ this.bindShopInfo(member.getId(),wxPhoneRequest.getShopId());
+ }
String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
@@ -426,7 +429,7 @@
dealIntegralRequest.setDealType(Constants.ZERO);
dealIntegralRequest.setMemberId(member.getId());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.REGISTER);
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
//寮�鍚敞鍐岄�佷紭鎯犲埜
if(Constants.equalsInteger(platformConfigDTO.getRegCouponRewardStatus(),Constants.ZERO)){
@@ -481,7 +484,7 @@
dealIntegralRequest.setMemberId(member.getRecId());
dealIntegralRequest.setIntegralObjType(Constants.IntegralObjType.INVITENEWUSER);
dealIntegralRequest.setParam1(member.getNickname());
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
}
}
@@ -736,7 +739,7 @@
dealIntegralRequest.setObjId(s.getId());
dealIntegralRequest.setOrderCode(null);
dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
- integralService.dealIntegral(dealIntegralRequest);
+ integralService.dealIntegral(dealIntegralRequest,null);
});
// integralService.dealIntegral()
} catch (Exception e) {
@@ -770,7 +773,7 @@
dealIntegralRequest.setObjId(memberRechargeDTO.getMemberId());
dealIntegralRequest.setOrderCode(null);
dealIntegralRequest.setDealType(memberRechargeDTO.getIntegralType());
- Integer integer = integralService.dealIntegral(dealIntegralRequest);
+ Integer integer = integralService.dealIntegral(dealIntegralRequest,null);
return integer;
}
@@ -793,8 +796,8 @@
Member member = memberMapper.selectById(memberId);
if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getOpenId())){
memberMapper.update(new UpdateWrapper<Member>().lambda()
- .set(Member::getOpenId,null)
- .set(Member::getPhone,null)
+// .set(Member::getOpenId,null)
+ .set(Member::getStatus,Constants.TWO)
.eq(Member::getId,member.getId())
);
}
@@ -802,6 +805,26 @@
}
+ @Override
+ public void bindShopInfo(Integer memberId,Integer recId){
+ Member member = memberMapper.selectById(memberId);
+ if(Objects.isNull(member)){
+ return;
+ }
+ if (Objects.nonNull(member.getBindShopId())) {
+ return;
+ }
+ Shop shop = shopMapper.selectById(recId);
+ if(Objects.nonNull(shop)){
+ memberMapper.update(new UpdateWrapper<Member>().lambda()
+ .set(Member::getBindShopId,recId)
+ .set(Member::getBindShopDate,new Date())
+ .eq(Member::getId,member.getId())
+ );
+ }
+ }
+
+
}
--
Gitblit v1.9.3