From ab9cd2c82bd64de8e33510db1d1e78a5b3b4de70 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 四月 2026 19:37:20 +0800
Subject: [PATCH] 代码生成
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 5c4f12d..b73f56c 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
@@ -286,8 +286,6 @@
String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
accountResponse.setToken(token);
accountResponse.setMember(member);
- // 闂ㄥ簵鐢ㄦ埛韬唤鏃讹紝杩斿洖鐢宠鐨勯棬搴楃姸鎬�
- fillShopInfo(accountResponse, member);
return accountResponse;
} catch (WxErrorException e) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
@@ -341,8 +339,6 @@
AccountResponse accountResponse = new AccountResponse();
accountResponse.setToken(token);
accountResponse.setMember(member);
- // 闂ㄥ簵鐢ㄦ埛韬唤鏃讹紝杩斿洖鐢宠鐨勯棬搴楃姸鎬�
- fillShopInfo(accountResponse, member);
return accountResponse;
} catch (Exception e) {
e.printStackTrace();
@@ -353,15 +349,23 @@
/**
* 闂ㄥ簵鐢ㄦ埛韬唤鏃讹紝濉厖闂ㄥ簵瀹℃牳鐘舵��
*/
- private void fillShopInfo(AccountResponse response, Member member) {
- if (Constants.TWO.equals(member.getUserType())) {
- ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
- .eq(ShopInfo::getRegionMemberId, member.getId())
+ private void fillShopInfo(UserCenterVO userCenterVO, Member member) {
+ ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
+ .eq(ShopInfo::getRegionMemberId, member.getId())
+ .eq(ShopInfo::getDeleted, Constants.ZERO)
+ .last("limit 1"));
+ if (shopInfo != null) {
+ userCenterVO.setShopId(shopInfo.getId());
+ userCenterVO.setShopAuditStatus(shopInfo.getAuditStatus());
+ }
+ // 鏍规嵁openid鏌ヨ褰撳墠缁戝畾鐨勯棬搴�
+ if (StringUtils.isNotBlank(member.getOpenid())) {
+ ShopInfo bindShop = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
+ .eq(ShopInfo::getOpenid, member.getOpenid())
.eq(ShopInfo::getDeleted, Constants.ZERO)
.last("limit 1"));
- if (shopInfo != null) {
- response.setShopId(shopInfo.getId());
- response.setShopAuditStatus(shopInfo.getAuditStatus());
+ if (bindShop != null) {
+ userCenterVO.setBindShopId(String.valueOf(bindShop.getId()));
}
}
}
@@ -398,6 +402,7 @@
userCenterVO.setName(member.getName());
userCenterVO.setTelephone(member.getTelephone());
userCenterVO.setCoverImage(member.getCoverImage());
+ userCenterVO.setOpenid(member.getOpenid());
if(StringUtils.isNotBlank(member.getCoverImage())){
String path = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()
+systemDictDataBiz.queryByCode(Constants.OSS,Constants.MEMBER_FILES).getCode();
@@ -417,6 +422,14 @@
.eq(Orders::getDeleted, Constants.ZERO)
.in(Orders::getStatus, Arrays.stream(waitReceiveStatuses).boxed().collect(Collectors.toList())));
userCenterVO.setWaitReceiveCount(waitReceiveCount.intValue());
+ // 閫�娆句腑璁㈠崟鏁伴噺
+ Long refundingCount = ordersMapper.selectCount(new QueryWrapper<Orders>().lambda()
+ .eq(Orders::getMemberId, memberId)
+ .eq(Orders::getDeleted, Constants.ZERO)
+ .eq(Orders::getStatus, 98));
+ userCenterVO.setRefundingCount(refundingCount.intValue());
+ // 闂ㄥ簵鐢ㄦ埛韬唤鏃讹紝杩斿洖鐢宠鐨勯棬搴楃姸鎬�
+ fillShopInfo(userCenterVO, member);
return userCenterVO;
}
--
Gitblit v1.9.3