From 1ac555ce49a45e2c7fc015dbb16b104840788c21 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期一, 18 八月 2025 11:51:42 +0800
Subject: [PATCH] 费用导入修复2025/08/15
---
service-user/src/main/java/com/java110/user/cmd/owner/AuthOwnerCmd.java | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/AuthOwnerCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/AuthOwnerCmd.java
index bb27db8..ff0a923 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/AuthOwnerCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/AuthOwnerCmd.java
@@ -21,7 +21,9 @@
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.util.List;
@@ -154,34 +156,45 @@
List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
Assert.listNotNull(communityDtos, "鏈寘鍚皬鍖轰俊鎭�");
CommunityDto tmpCommunityDto = communityDtos.get(0);
-
-
OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDITING);
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId("-1");
- ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
- ownerAppUserPo.setCommunityId(tmpCommunityDto.getCommunityId());
- ownerAppUserPo.setAppUserName(reqJson.getString("ownerName"));
- ownerAppUserPo.setAppType("WECHAT");
- ownerAppUserPo.setLink(reqJson.getString("link"));
- ownerAppUserPo.setUserId(userId);
- ownerAppUserPo.setOpenId("-1");
- ownerAppUserPo.setRoomId(reqJson.getString("roomId"));
- ownerAppUserPo.setRoomName(reqJson.getString("roomName"));
- ownerAppUserPo.setOwnerTypeCd(reqJson.getString("ownerTypeCd"));
-
- UserAttrDto userAttrDto = new UserAttrDto();
- userAttrDto.setUserId(userId);
- userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
- List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
- if (!ListUtil.isNull(userAttrDtos)) {
- ownerAppUserPo.setOpenId(userAttrDtos.get(0).getValue());
-
+ //鐢╱serId鏌ヨ鏄惁鏈夊緟璁よ瘉璁板綍锛屾病鏈夋柊澧烇紝鏈夌殑璇濈洿鎺ユ洿鏂扮姸鎬�
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userId);
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if(CollectionUtils.isEmpty(ownerAppUserDtos)){
+ //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝 11000 寰呰璇� ,12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
+ ownerAppUserPo.setAppTypeCd("10010");
+ ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+ ownerAppUserPo.setMemberId("-1");
+ ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
+ ownerAppUserPo.setCommunityId(tmpCommunityDto.getCommunityId());
+ ownerAppUserPo.setAppUserName(reqJson.getString("ownerName"));
+ ownerAppUserPo.setAppType("WECHAT");
+ ownerAppUserPo.setLink(reqJson.getString("link"));
+ ownerAppUserPo.setUserId(userId);
+ ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setRoomId(reqJson.getString("roomId"));
+ ownerAppUserPo.setRoomName(reqJson.getString("roomName"));
+ ownerAppUserPo.setOwnerTypeCd(reqJson.getString("ownerTypeCd"));
+ UserAttrDto userAttrDto = new UserAttrDto();
+ userAttrDto.setUserId(userId);
+ userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
+ List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
+ if (!ListUtil.isNull(userAttrDtos)) {
+ ownerAppUserPo.setOpenId(userAttrDtos.get(0).getValue());
+ }
+ ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+ }else{
+ for(OwnerAppUserDto ownerAppUser : ownerAppUserDtos){
+ ownerAppUserPo.setAppUserId(ownerAppUser.getAppUserId());
+ if(StringUtil.isEmpty(reqJson.getString("link"))){
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDITING);
+ }else{
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
+ }
+ ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
+ }
}
-
- ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
}
}
--
Gitblit v1.8.0