From 9ec0a61f90ac2464eebc643bfe2d93ac9ba6e569 Mon Sep 17 00:00:00 2001
From: cgf <2156125618@qq.com>
Date: 星期六, 23 八月 2025 10:59:18 +0800
Subject: [PATCH] 折扣已完成现有需求2025/08/09
---
service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
index 08c0a09..ddbeba1 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/OwnerUserLoginCmd.java
@@ -23,6 +23,8 @@
import com.java110.intf.common.ISystemInfoV1InnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.job.IIotInnerServiceSMO;
+import com.java110.intf.job.IMallInnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserAttrPo;
@@ -36,6 +38,7 @@
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
import java.text.ParseException;
import java.util.HashMap;
@@ -78,6 +81,12 @@
@Autowired
private IOwnerRoomRelV1InnerServiceSMO ownerRoomRelV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IMallInnerServiceSMO mallInnerServiceSMOImpl;
+
+ @Autowired
+ private IIotInnerServiceSMO iotInnerServiceSMOImpl;
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
@@ -127,17 +136,23 @@
throw new CmdException("瀵嗙爜閿欒鎴栬�呯敤鎴蜂笉瀛樺湪");
}
+ //todo 1.2 鍚屾鐗╀笟鐢ㄦ埛璧勬枡缁欏晢鍩�
+ mallInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
+
+ //todo 1.3 鍚屾鐗╀笟鐢ㄦ埛璧勬枡缁欑墿鑱旂綉
+ iotInnerServiceSMOImpl.sendUserInfo(userDtos.get(0));
+
// todo 2.0 鏍￠獙 涓氫富鐢ㄦ埛缁戝畾琛ㄦ槸鍚﹀瓨鍦ㄨ褰�
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setUserId(userDtos.get(0).getUserId());
ownerAppUserDto.setLink(userDtos.get(0).getTel());
- ownerAppUserDto.setState(OwnerAppUserDto.STATE_AUDIT_SUCCESS);
List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
String communityId = "";
+ LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
if (!ListUtil.isNull(ownerAppUserDtos)) {
// todo 4.0 鏌ヨ灏忓尯鏄惁瀛樺湪
communityId = ownerAppUserDtos.get(0).getCommunityId();
+ loginOwnerResDto.setAuditState(ownerAppUserDtos.get(0).getState());
} else {
SystemInfoDto systemInfoDto = new SystemInfoDto();
List<SystemInfoDto> systemInfoDtos = systemInfoV1InnerServiceSMOImpl.querySystemInfos(systemInfoDto);
@@ -154,11 +169,11 @@
//todo 鐢熸垚鐧诲綍token
String token = generatorLoginToken(tmpUserDto);
- LoginOwnerResDto loginOwnerResDto = new LoginOwnerResDto();
loginOwnerResDto.setCommunityId(communityDtos.get(0).getCommunityId());
loginOwnerResDto.setCommunityName(communityDtos.get(0).getName());
loginOwnerResDto.setCommunityTel(communityDtos.get(0).getTel());
+ loginOwnerResDto.setCommunityQrCode(communityDtos.get(0).getQrCode());
loginOwnerResDto.setUserId(tmpUserDto.getUserId());
loginOwnerResDto.setUserName(tmpUserDto.getName());
loginOwnerResDto.setOwnerTel(tmpUserDto.getTel());
@@ -263,34 +278,36 @@
if (flag < 1) {
throw new CmdException("娉ㄥ唽澶辫触");
}
-
- OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState("12000");
- ownerAppUserPo.setAppTypeCd("10010");
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
- ownerAppUserPo.setMemberId(ownerDtos.get(0).getMemberId());
- ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
- ownerAppUserPo.setCommunityId(ownerDtos.get(0).getCommunityId());
- ownerAppUserPo.setAppUserName(ownerDtos.get(0).getName());
- ownerAppUserPo.setIdCard(ownerDtos.get(0).getIdCard());
- ownerAppUserPo.setAppType("WECHAT");
- ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
- ownerAppUserPo.setUserId(userPo.getUserId());
- ownerAppUserPo.setOpenId("-1");
- ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
-
- queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
-
-
- flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- if (flag < 1) {
- throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
- }
-
UserDto userDto = new UserDto();
userDto.setUserId(userPo.getUserId());
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
+ //鐢╱serId鍜屾墜鏈哄彿鏌ヨ缁戝畾鍏崇郴锛屾病鏈夊垯鏂板
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setLink(userPo.getTel());
+ ownerAppUserDto.setUserId(userPo.getUserId());
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ if(CollectionUtils.isEmpty(ownerAppUserDtos)){
+ OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
+ //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝 11000 寰呰璇� ,12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
+ ownerAppUserPo.setState(OwnerAppUserDto.STATE_NOT_AUDIT);
+ ownerAppUserPo.setAppTypeCd("10010");
+ ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_appUserId));
+ ownerAppUserPo.setMemberId(ownerDtos.get(0).getMemberId());
+ ownerAppUserPo.setCommunityName(tmpCommunityDto.getName());
+ ownerAppUserPo.setCommunityId(ownerDtos.get(0).getCommunityId());
+ ownerAppUserPo.setAppUserName(ownerDtos.get(0).getName());
+ ownerAppUserPo.setIdCard(ownerDtos.get(0).getIdCard());
+ ownerAppUserPo.setAppType("WECHAT");
+ ownerAppUserPo.setLink(ownerDtos.get(0).getLink());
+ ownerAppUserPo.setUserId(userPo.getUserId());
+ ownerAppUserPo.setOpenId("-1");
+ ownerAppUserPo.setOwnerTypeCd(ownerDtos.get(0).getOwnerTypeCd());
+ queryOwnerRoom(ownerDtos.get(0), ownerAppUserPo);
+ flag = ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
+ if (flag < 1) {
+ throw new CmdException("娣诲姞鐢ㄦ埛涓氫富鍏崇郴澶辫触");
+ }
+ }
return userDtos;
}
--
Gitblit v1.8.0