From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化
---
service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
index 521ed20..aa219b5 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/RefreshAppUserBindingOwnerOpenIdCmd.java
@@ -2,8 +2,9 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.CmdContextUtils;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.owner.OwnerAppUserDto;
@@ -11,16 +12,18 @@
import com.java110.intf.user.IOwnerAppUserV1InnerServiceSMO;
import com.java110.intf.user.IUserAttrV1InnerServiceSMO;
import com.java110.po.owner.OwnerAppUserPo;
-import com.java110.po.userAttr.UserAttrPo;
+import com.java110.po.user.UserAttrPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import java.util.List;
@Java110Cmd(serviceCode = "owner.refreshAppUserBindingOwnerOpenId")
-public class RefreshAppUserBindingOwnerOpenIdCmd extends AbstractServiceCmdListener {
+public class RefreshAppUserBindingOwnerOpenIdCmd extends Cmd {
@Autowired
private IOwnerAppUserV1InnerServiceSMO ownerAppUserV1InnerServiceSMOImpl;
@@ -30,54 +33,37 @@
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
- Assert.hasKeyAndValue(reqJson, "appUserId", "缁戝畾ID涓嶈兘涓虹┖");
Assert.hasKeyAndValue(reqJson, "openId", "蹇呭～锛岃濉啓鐘舵��");
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯ID");
- if (reqJson.getString("appUserId").startsWith("-")) {
- Assert.hasKeyAndValue(reqJson, "oldAppUserId", "蹇呭～锛岃濉啓鑰佺粦瀹欼D");
- Assert.hasKeyAndValue(reqJson, "appType", "蹇呭～锛岃濉啓appType");
- }
}
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
- String appUserId = reqJson.getString("appUserId");
- if (appUserId.startsWith("-")) {
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserDto.setAppUserId(reqJson.getString("oldAppUserId"));
- ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+ String userId = CmdContextUtils.getUserId(cmdDataFlowContext);
- Assert.listOnlyOne(ownerAppUserDtos, "浼犲叆oldAppUserId閿欒");
- OwnerAppUserPo ownerAppUserPo = BeanConvertUtil.covertBean(ownerAppUserDtos.get(0), OwnerAppUserPo.class);
- ownerAppUserPo.setAppUserId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_userId));
- ownerAppUserPo.setAppType(reqJson.getString("appType"));
- ownerAppUserPo.setOpenId(reqJson.getString("openId"));
- ownerAppUserPo.setNickName(reqJson.getString("nickName"));
- ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
- ownerAppUserV1InnerServiceSMOImpl.saveOwnerAppUser(ownerAppUserPo);
- freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
- return;
+ if (StringUtil.isEmpty(userId)) {
+ throw new CmdException("鐢ㄦ埛鏈櫥褰�");
}
+ //todo 鍒穟ser_attr 涓殑openId
+ freshUserToken(reqJson, userId);
+
+ OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
+ ownerAppUserDto.setUserId(userId);
+ ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
+
+ if (ListUtil.isNull(ownerAppUserDtos)) {
+ return;
+ }
OwnerAppUserPo ownerAppUserPo = new OwnerAppUserPo();
- ownerAppUserPo.setAppUserId(appUserId);
+ ownerAppUserPo.setAppUserId(ownerAppUserDtos.get(0).getAppUserId());
ownerAppUserPo.setCommunityId(reqJson.getString("communityId"));
ownerAppUserPo.setOpenId(reqJson.getString("openId"));
ownerAppUserPo.setNickName(reqJson.getString("nickName"));
ownerAppUserPo.setHeadImgUrl(reqJson.getString("headImgUrl"));
ownerAppUserV1InnerServiceSMOImpl.updateOwnerAppUser(ownerAppUserPo);
-
- OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
- ownerAppUserPo.setAppUserId(appUserId);
- ownerAppUserDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerAppUserDto> ownerAppUserDtos = ownerAppUserV1InnerServiceSMOImpl.queryOwnerAppUsers(ownerAppUserDto);
-
- Assert.listOnlyOne(ownerAppUserDtos, "浼犲叆appUserId閿欒");
-
-
- freshUserToken(reqJson, ownerAppUserDtos.get(0).getUserId());
}
private void freshUserToken(JSONObject reqJson, String userId) {
@@ -91,14 +77,14 @@
userAttrDto.setUserId(userId);
userAttrDto.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
List<UserAttrDto> userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
- if (userAttrDtos == null || userAttrDtos.size() < 1) {
+ if (ListUtil.isNull(userAttrDtos)) {
UserAttrPo userAttrPo = new UserAttrPo();
userAttrPo.setUserId(userId);
userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
userAttrPo.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
userAttrPo.setValue(reqJson.getString("openId"));
userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
- return ;
+ return;
}
UserAttrPo userAttrPo = new UserAttrPo();
userAttrPo.setUserId(userId);
@@ -106,5 +92,29 @@
userAttrPo.setSpecCd(UserAttrDto.SPEC_OPEN_ID);
userAttrPo.setValue(reqJson.getString("openId"));
userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
+
+ if (!reqJson.containsKey("unionId")) {
+ return;
+ }
+
+ userAttrDto = new UserAttrDto();
+ userAttrDto.setUserId(userId);
+ userAttrDto.setSpecCd(UserAttrDto.SPEC_UNION_ID);
+ userAttrDtos = userAttrV1InnerServiceSMOImpl.queryUserAttrs(userAttrDto);
+ if (ListUtil.isNull(userAttrDtos)) {
+ userAttrPo = new UserAttrPo();
+ userAttrPo.setUserId(userId);
+ userAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_UNION_ID);
+ userAttrPo.setValue(reqJson.getString("unionId"));
+ userAttrV1InnerServiceSMOImpl.saveUserAttr(userAttrPo);
+ return;
+ }
+ userAttrPo = new UserAttrPo();
+ userAttrPo.setUserId(userId);
+ userAttrPo.setAttrId(userAttrDtos.get(0).getAttrId());
+ userAttrPo.setSpecCd(UserAttrDto.SPEC_UNION_ID);
+ userAttrPo.setValue(reqJson.getString("unionId"));
+ userAttrV1InnerServiceSMOImpl.updateUserAttr(userAttrPo);
}
}
--
Gitblit v1.8.0