From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java b/service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
old mode 100644
new mode 100755
index fba1f6e..5120d00
--- a/service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
+++ b/service-user/src/main/java/com/java110/user/smo/impl/UserInnerServiceSMOImpl.java
@@ -1,12 +1,13 @@
package com.java110.user.smo.impl;
+import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.user.UserAttrDto;
+import com.java110.dto.user.UserDto;
+import com.java110.po.user.UserPo;
+import com.java110.user.dao.IUserServiceDao;
import com.java110.utils.constant.StatusConstant;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.smo.user.IUserInnerServiceSMO;
-import com.java110.dto.user.UserDto;
-import com.java110.user.dao.IUserServiceDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
@@ -24,6 +25,7 @@
@Autowired
private IUserServiceDao userServiceDaoImpl;
+
@Override
public String getUserServiceVersion(@RequestParam("code") String code) {
@@ -99,22 +101,41 @@
}
+ @Override
+ public List<UserAttrDto> getUserAttrs(@RequestBody UserAttrDto userAttrDto) {
+ List<UserAttrDto> userAttrDtos = BeanConvertUtil.covertBeanList(
+ userServiceDaoImpl.queryUserInfoAttrs(BeanConvertUtil.beanCovertMap(userAttrDto)), UserAttrDto.class);
+ return userAttrDtos;
+ }
+
+ @Override
+ public int updateUser(@RequestBody UserPo userPo) {
+ userPo.setStatusCd("0");
+ userServiceDaoImpl.updateUserInfoInstance(BeanConvertUtil.beanCovertMap(userPo));
+ return 1;
+ }
+
private void freshUserAttrs(List<UserDto> userDtos) {
Map param = null;
for (UserDto userDto : userDtos) {
param = new HashMap();
- param.put("userId",userDto.getUserId());
+ param.put("userId", userDto.getUserId());
List<UserAttrDto> userAttrDtos = BeanConvertUtil.covertBeanList(userServiceDaoImpl.queryUserInfoAttrs(param), UserAttrDto.class);
- if(userAttrDtos == null || userAttrDtos.size() == 0){
+ if (userAttrDtos == null || userAttrDtos.size() == 0) {
continue;
}
userDto.setUserAttrs(userAttrDtos);
- for(UserAttrDto userAttrDto : userAttrDtos){
+ for (UserAttrDto userAttrDto : userAttrDtos) {
//openId 鍗曠嫭鍑烘潵澶勭悊
- if("100201911001".equals(userAttrDto.getSpecCd())){
+ if (UserAttrDto.SPEC_OPEN_ID.equals(userAttrDto.getSpecCd())) {
userDto.setOpenId(userAttrDto.getValue());
}
+
+ // 鍟嗗煄 openId
+ if (UserAttrDto.SPEC_MALL_OPEN_ID.equals(userAttrDto.getSpecCd())){
+ userDto.setMallOpenId(userAttrDto.getValue());
+ }
}
--
Gitblit v1.8.0