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/SaveOwnerMemberCmd.java |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
index 9879b70..38a509d 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerMemberCmd.java
@@ -4,6 +4,7 @@
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
@@ -32,6 +33,7 @@
 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;
 
@@ -125,13 +127,18 @@
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
         Assert.jsonObjectHaveKey(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
-        Assert.jsonObjectHaveKey(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈userId");
-        Assert.jsonObjectHaveKey(reqJson, "age", "璇锋眰鎶ユ枃涓湭鍖呭惈age");
         Assert.jsonObjectHaveKey(reqJson, "link", "璇锋眰鎶ユ枃涓湭鍖呭惈link");
         Assert.jsonObjectHaveKey(reqJson, "sex", "璇锋眰鎶ユ枃涓湭鍖呭惈sex");
         Assert.jsonObjectHaveKey(reqJson, "ownerId", "璇锋眰鎶ユ枃涓湭鍖呭惈涓氫富");
 
         Assert.jsonObjectHaveKey(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
+
+        if (reqJson.containsKey("ownerPhotoUrl")) {
+            String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+            if (!StringUtil.isEmpty(ownerPhotoUrl) && ownerPhotoUrl.length() > 500) {
+                throw new CmdException("鍥剧墖鍦板潃澶暱");
+            }
+        }
 
         //todo 楠岃瘉鍚楁牎楠�
         if (reqJson.containsKey("msgCode")) {
@@ -162,27 +169,25 @@
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        String userId = CmdContextUtils.getUserId(context);
 
         //todo 鐢熸垚memberId
-        generateMemberId(reqJson);
+        String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
+        reqJson.put("memberId", memberId);
 
-        JSONObject businessOwner = new JSONObject();
-        businessOwner.putAll(reqJson);
-        businessOwner.put("state", "2000");
-        OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
-        if (reqJson.containsKey("age") && StringUtil.isEmpty(reqJson.getString("age"))) {
-            ownerPo.setAge(null);
-        }
+        OwnerPo ownerPo = BeanConvertUtil.covertBean(reqJson, OwnerPo.class);
+
+        String ownerPhotoUrl = reqJson.getString("ownerPhotoUrl");
+        ownerPo.setFaceUrl(ownerPhotoUrl);
+        ownerPo.setAge("0");
+        ownerPo.setUserId(userId);
+        ownerPo.setState(OwnerDto.STATE_FINISH);
+        ownerPo.setPersonType(OwnerDto.PERSON_TYPE_PERSON);
+        ownerPo.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_MEMBER);
         int flag = ownerV1InnerServiceSMOImpl.saveOwner(ownerPo);
         if (flag < 1) {
             throw new CmdException("淇濆瓨涓氫富澶辫触");
         }
-
-        //todo 淇濆瓨鐓х墖
-        photoSMOImpl.savePhoto(reqJson.getString("ownerPhoto"),
-                reqJson.getString("memberId"),
-                reqJson.getString("communityId"),
-                "10000");
 
         //todo 淇濆瓨灞炴��
         dealOwnerAttr(reqJson, context);
@@ -192,17 +197,6 @@
 
     }
 
-
-    /**
-     * 鐢熸垚灏忓尯妤糏D
-     *
-     * @param paramObj 璇锋眰鍏ュ弬鏁版嵁
-     */
-    private void generateMemberId(JSONObject paramObj) {
-        String memberId = GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_ownerId);
-        paramObj.put("memberId", memberId);
-
-    }
 
     private void dealOwnerAttr(JSONObject paramObj, ICmdDataFlowContext cmdDataFlowContext) {
 

--
Gitblit v1.8.0