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/user/UserLoginCmd.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java b/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
index 5b34277..ef1df7a 100644
--- a/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/user/UserLoginCmd.java
@@ -17,20 +17,16 @@
import com.java110.dto.user.UserDto;
import com.java110.intf.common.ISmsInnerServiceSMO;
import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.ICommunityV1InnerServiceSMO;
import com.java110.intf.user.*;
import com.java110.po.owner.OwnerAppUserPo;
import com.java110.po.user.UserPo;
-import com.java110.po.userAttr.UserAttrPo;
+import com.java110.po.user.UserAttrPo;
import com.java110.utils.constant.CommonConstant;
import com.java110.utils.constant.ResponseConstant;
import com.java110.utils.constant.UserLevelConstant;
import com.java110.utils.exception.CmdException;
import com.java110.utils.exception.SMOException;
-import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.utils.util.ValidatorUtil;
+import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -118,10 +114,10 @@
List<UserDto> userDtos = userInnerServiceSMOImpl.getUsers(userDto);
//todo 楠岃瘉鐮佺櫥褰曪紝鍒ゆ柇鏄惁鏄惁涓氫富锛屽苟涓旀槸鍚︾粦瀹氬叧绯� 濡傛灉娌℃湁 鑷姩缁戝畾鍏崇郴
- if (userDtos == null || userDtos.size() < 1) {
+ if (ListUtil.isNull(userDtos)) {
userDtos = ifOwnerLoginByPhone(reqJson, context);
}
- if (userDtos == null || userDtos.size() < 1) {
+ if (ListUtil.isNull(userDtos)) {
throw new SMOException(errorInfo);
}
@@ -197,7 +193,7 @@
List<OwnerDto> ownerDtos = ownerV1InnerServiceSMOImpl.queryOwners(ownerDto);
// 璇存槑涓氫富涓嶅瓨鍦� 鐩存帴杩斿洖璺戝紓甯�
- if (ownerDtos == null || ownerDtos.size() < 1) {
+ if (ListUtil.isNull(ownerDtos)) {
return null;
}
@@ -220,10 +216,9 @@
if (flag < 1) {
throw new CmdException("娉ㄥ唽澶辫触");
}
-
OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- //鐘舵�佺被鍨嬶紝10000 瀹℃牳涓紝12000 瀹℃牳鎴愬姛锛�13000 瀹℃牳澶辫触
- ownerAppUserPo.setState("12000");
+ //鐘舵�佺被鍨嬶紝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());
--
Gitblit v1.8.0