From b5c218b2ed749a3e710c92c4770759773de4fc0c Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 八月 2024 18:25:19 +0800
Subject: [PATCH] 代码提交
---
server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java | 10 +-
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 7 ++
server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java | 1
server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java | 2
server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java | 1
server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 145 ++++++++++++++++++++++++++++++++++++++---------
6 files changed, 131 insertions(+), 35 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
index 7cc5155..33811d7 100644
--- a/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
+++ b/server/service/src/main/java/com/doumee/config/Jwt/WebMvcConfig.java
@@ -102,13 +102,13 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(Objects.isNull(member.getOpenid())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸叉敞閿�,璇烽噸鏂扮櫥褰�");
+ throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"鐢ㄦ埛宸叉敞閿�,璇烽噸鏂扮櫥褰�");
}
if(Constants.equalsInteger(member.getIsdeleted(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
if(!Constants.equalsInteger(member.getStatus(),Constants.ZERO)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
}
request.setAttribute(JwtTokenUtil.UserId_Name, memberId);
request.setAttribute(JwtTokenUtil.UserType, ZTConstants.CUSTOMER);
@@ -132,10 +132,10 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(Constants.equalsInteger(users.getIsdeleted(),Constants.ONE)){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"鐢ㄦ埛宸插垹闄�,璇疯仈绯荤鐞嗗憳");
}
if(!StringUtils.equals(users.getStatus(),Constants.ONE+"")){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鐢ㄦ埛宸茬鐢�,璇疯仈绯荤鐞嗗憳");
+ throw new BusinessException(ResponseStatus.USER_DISABLE_TIME.getCode(),"鐢ㄦ埛鐘舵�佸紓甯�,璇烽噸鏂扮櫥褰�");
}
request.setAttribute(JwtTokenUtil.UserId_Name, userId);
request.setAttribute(JwtTokenUtil.UserType, ZTConstants.BUSINESS);
diff --git a/server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java b/server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java
index b686a17..db87e09 100644
--- a/server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java
+++ b/server/service/src/main/java/com/doumee/core/constants/ResponseStatus.java
@@ -26,6 +26,7 @@
MASSIVE_REQUEST(5101, "璇锋眰杩囦簬棰戠箒"),
NOT_ALLOWED(5110, "涓嶅厑璁哥殑鎿嶄綔"),
TOKEN_EXCEED_TIME(5111, "TOKEN杩囨湡"),
+ USER_DISABLE_TIME(5112, "鐢ㄦ埛宸茬鐢�"),
NO_LOGIN(5112, "鏈櫥褰�"),
;
diff --git a/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java b/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java
index 382e6a3..2c17be1 100644
--- a/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java
+++ b/server/service/src/main/java/com/doumee/dao/web/reqeust/WxPhoneRequest.java
@@ -29,4 +29,6 @@
@ApiModelProperty(value = "sessionKey")
private String sessionKey;
+ @ApiModelProperty(value = "openid")
+ private String openid;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
index 0144d88..1293bac 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GetZhongTaiDataServiceImpl.java
@@ -504,7 +504,6 @@
public void batchAddLike(ZTBatchAddListRequest ztBatchAddListRequest){
if(Objects.isNull(ztBatchAddListRequest)
|| StringUtils.isBlank(ztBatchAddListRequest.getArticleIds())
- || StringUtils.isBlank(ztBatchAddListRequest.getCustomerId())
|| StringUtils.isBlank(ztBatchAddListRequest.getPlatSourceId())
|| StringUtils.isBlank(ztBatchAddListRequest.getPlatSource())
){
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index 4884ee5..e512566 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -357,13 +357,75 @@
return accountResponse;
}
- public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Member member){
- if(Objects.nonNull(users)&&Objects.nonNull(member.getId())) {
- CustomerUser customerUser = null;
- if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
+// public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService,CustomerUserMapper customerUserMapper,Users users,Member member){
+// if(Objects.nonNull(users)&&Objects.nonNull(member.getId())) {
+// CustomerUser customerUser = null;
+// if (customerUserMapper.selectCount(new QueryWrapper<CustomerUser>().lambda()
+// .eq(CustomerUser::getIsdeleted, Constants.ZERO)
+// .eq(CustomerUser::getUserId, users.getId())
+// .eq(CustomerUser::getMemberId, member.getId())
+// ) <= Constants.ZERO) {
+// customerUser = new CustomerUser();
+// customerUser.setIsdeleted(Constants.ZERO);
+// customerUser.setUserId(users.getId());
+// customerUser.setCreateDate(new Date());
+// customerUser.setMemberId(member.getId());
+// customerUser.setPhone(users.getPhone());
+// customerUser.setIamUserId(users.getIamId());
+// customerUser.setName(users.getName());
+// customerUser.setUsername(users.getIamUsername());
+// customerUser.setAddr(users.getShopAddress());
+// }
+// //绛夊緟璋冭捣涓彴鎺ュ彛
+// ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
+// ztCustomerBindingUsersRequest.setName(member.getName());
+// ztCustomerBindingUsersRequest.setNickName(member.getNickname());
+// ztCustomerBindingUsersRequest.setPhone(member.getPhone());
+// ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
+// ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
+// ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
+// if(Objects.nonNull(member.getHousearea())){
+// ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
+// }
+// ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
+// ztCustomerBindingUsersRequest.setToken(member.getToken());
+// ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
+// ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
+// ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
+// ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
+// ztCustomerBindingUsersRequest.setPlatSource("2");
+// ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
+// if(Objects.nonNull(customerUser)){
+// if(Objects.nonNull(ztBaseResponse)){
+// if(ztBaseResponse.getSuccess()){
+// customerUser.setZtStatus(1);
+// customerUser.setZtDate(new Date());
+// }else{
+// customerUser.setZtStatus(2);
+// customerUser.setZtDate(new Date());
+// customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
+// }
+// } else{
+// customerUser.setZtStatus(2);
+// customerUser.setZtDate(new Date());
+// customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
+// }
+// customerUserMapper.insert(customerUser);
+// }
+// }
+// }
+
+
+ public static void saveCustomerUser(ZbomZhongTaiService zbomZhongTaiService, CustomerUserMapper customerUserMapper, Users users, Member member) {
+ if (Objects.nonNull(users) && Objects.nonNull(member.getId())) {
+ CustomerUser customerUser = customerUserMapper.selectOne(new QueryWrapper<CustomerUser>().lambda()
.eq(CustomerUser::getIsdeleted, Constants.ZERO)
.eq(CustomerUser::getUserId, users.getId())
- .eq(CustomerUser::getMemberId, member.getId())) <= Constants.ZERO) {
+ .eq(CustomerUser::getMemberId, member.getId())
+ .orderByDesc(CustomerUser::getCreateDate)
+ .last(" limit 1")
+ );
+ if (Objects.isNull(customerUser)) {
customerUser = new CustomerUser();
customerUser.setIsdeleted(Constants.ZERO);
customerUser.setUserId(users.getId());
@@ -375,46 +437,71 @@
customerUser.setUsername(users.getIamUsername());
customerUser.setAddr(users.getShopAddress());
}
- //绛夊緟璋冭捣涓彴鎺ュ彛
- ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
- ztCustomerBindingUsersRequest.setName(member.getName());
- ztCustomerBindingUsersRequest.setNickName(member.getNickname());
- ztCustomerBindingUsersRequest.setPhone(member.getPhone());
- ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
- ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
- ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
- if(Objects.nonNull(member.getHousearea())){
- ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
- }
- ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
- ztCustomerBindingUsersRequest.setToken(member.getToken());
- ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
- ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
- ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
- ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
- ztCustomerBindingUsersRequest.setPlatSource("2");
- ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
- if(Objects.nonNull(customerUser)){
- if(Objects.nonNull(ztBaseResponse)){
- if(ztBaseResponse.getSuccess()){
+ //鏈粦瀹氳繃
+ if (Objects.isNull(customerUser.getId())) {
+ ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
+ if (Objects.nonNull(ztBaseResponse)) {
+ if (ztBaseResponse.getSuccess()) {
customerUser.setZtStatus(1);
customerUser.setZtDate(new Date());
- }else{
+ } else {
customerUser.setZtStatus(2);
customerUser.setZtDate(new Date());
customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
}
- } else{
+ } else {
customerUser.setZtStatus(2);
customerUser.setZtDate(new Date());
customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
}
customerUserMapper.insert(customerUser);
+ } else {
+ if (!Constants.equalsInteger(customerUser.getZtStatus(),Constants.ONE)) {
+ ZTBaseResponse ztBaseResponse = MemberServiceImpl.syncZtCustomerUser(zbomZhongTaiService,member, users);
+ if (Objects.nonNull(ztBaseResponse)) {
+ if (ztBaseResponse.getSuccess()) {
+ customerUser.setZtStatus(1);
+ customerUser.setZtDate(new Date());
+ } else {
+ customerUser.setZtStatus(2);
+ customerUser.setZtDate(new Date());
+ customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
+ }
+ } else {
+ customerUser.setZtStatus(2);
+ customerUser.setZtDate(new Date());
+ customerUser.setZtInfo(JSONObject.toJSONString(ztBaseResponse));
+ }
+ customerUserMapper.updateById(customerUser);
+ }
}
}
}
+ public static ZTBaseResponse syncZtCustomerUser(ZbomZhongTaiService zbomZhongTaiService,Member member,Users users){
+ //绛夊緟璋冭捣涓彴鎺ュ彛
+ ZTCustomerBindingUsersRequest ztCustomerBindingUsersRequest = new ZTCustomerBindingUsersRequest();
+ ztCustomerBindingUsersRequest.setName(member.getName());
+ ztCustomerBindingUsersRequest.setNickName(member.getNickname());
+ ztCustomerBindingUsersRequest.setPhone(member.getPhone());
+ ztCustomerBindingUsersRequest.setAvatarUrl(member.getImgurl());
+ ztCustomerBindingUsersRequest.setUptown(member.getDistrict());
+ ztCustomerBindingUsersRequest.setFullAddress(member.getAddress());
+ if(Objects.nonNull(member.getHousearea())){
+ ztCustomerBindingUsersRequest.setHouseArea(member.getHousearea().toString());
+ }
+ ztCustomerBindingUsersRequest.setOpenId(member.getOpenid());
+ ztCustomerBindingUsersRequest.setToken(member.getToken());
+ ztCustomerBindingUsersRequest.setUserType(ZTConstants.CUSTOMER);
+ ztCustomerBindingUsersRequest.setSourceCustomerId(member.getId().toString());
+ ztCustomerBindingUsersRequest.setDaoGouUserId(users.getIamId());
+ ztCustomerBindingUsersRequest.setDaoGouAccount(users.getIamUsername());
+ ztCustomerBindingUsersRequest.setPlatSource("2");
+ ZTBaseResponse ztBaseResponse = zbomZhongTaiService.customerBinDingUsers(ztCustomerBindingUsersRequest);
+ return ztBaseResponse;
+ }
+
@Override
public String getWxMiniPhone(WxPhoneRequest wxPhoneRequest){
try {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index d4b54a2..a4e4879 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -445,6 +445,13 @@
accountResponse.setPhone( Constants.desensitizationPhone(phone));
if(Objects.isNull(users)){
return accountResponse;
+ }else{
+ if(StringUtils.isNotBlank(wxPhoneRequest.getOpenid())){
+ usersMapper.update(null,new UpdateWrapper<Users>().lambda().set(Users::getOpenid,null)
+ .eq(Users::getOpenid,wxPhoneRequest.getOpenid()));
+ users.setOpenid(wxPhoneRequest.getOpenid());
+ usersMapper.updateById(users);
+ }
}
accountResponse.setUsers(users);
String token = JwtTokenUtil.generateTokenForZb(users.getId(),ZTConstants.BUSINESS,JSONObject.toJSON(users).toString(),redisTemplate);
--
Gitblit v1.9.3