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/cmd/owner/SyncThirdEnterpriseCmd.java |   56 +++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/cmd/owner/SyncThirdEnterpriseCmd.java b/service-user/src/main/java/com/java110/user/cmd/owner/SyncThirdEnterpriseCmd.java
index dfdc2e1..727194e 100644
--- a/service-user/src/main/java/com/java110/user/cmd/owner/SyncThirdEnterpriseCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/owner/SyncThirdEnterpriseCmd.java
@@ -16,6 +16,7 @@
 import com.java110.po.owner.OwnerPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
@@ -33,7 +34,8 @@
         url = "http://{ip}:{port}/app/owner.syncThirdEnterprise",
         resource = "userDoc",
         author = "鍚村鏂�",
-        serviceCode = "owner.syncThirdEnterprise"
+        serviceCode = "owner.syncThirdEnterprise",
+        seq = 16
 )
 
 @Java110ParamsDoc(params = {
@@ -154,12 +156,12 @@
         ownerPo.setAge("1");
         ownerPo.setOwnerFlag(OwnerDto.OWNER_FLAG_TRUE);
         ownerPo.setOwnerTypeCd(OwnerDto.OWNER_TYPE_CD_OWNER);
-        ownerPo.setAddress("鏃�");
-        ownerPo.setCommunityId(DEFAULT_COMMUNITY_ID);
-        ownerPo.setIdCard(data.getString("idNo"));
-        ownerPo.setLink(data.getString("phoneNumber"));
-        ownerPo.setName(data.getString("realName"));
-        ownerPo.setRemark("閫氳繃鎺ュ彛鏂板");
+        ownerPo.setAddress(reqJson.getString("enterpriseAddress"));
+        ownerPo.setCommunityId(reqJson.getString("communityId"));
+        ownerPo.setIdCard(data.getString("creditCode"));
+        ownerPo.setLink(data.getString("contactInfo"));
+        ownerPo.setName(data.getString("enterpriseName"));
+        ownerPo.setRemark(data.getString("introduction"));
         ownerPo.setSex(data.getString("sex") == null ? "1" : "0");
         ownerPo.setState(OwnerDto.STATE_FINISH);
         ownerPo.setUserId("-1");
@@ -168,17 +170,45 @@
             throw new CmdException("淇濆瓨涓氫富澶辫触");
         }
 
+        saveAttr(reqJson, ownerPo, OwnerAttrDto.SPEC_CD_EXT_OWNER_ID, reqJson.getString("createBy"));
+
+        saveAttr(reqJson, ownerPo, "enterpriseArea", reqJson.getString("enterpriseArea")); // 鍔炲叕闈㈢Н
+        saveAttr(reqJson, ownerPo, "enterpriseAssets", reqJson.getString("enterpriseAssets")); // 浼佷笟璧勪骇
+        saveAttr(reqJson, ownerPo, "enterpriseIncome", reqJson.getString("enterpriseIncome")); // 浼佷笟鏀跺叆
+        saveAttr(reqJson, ownerPo, "enterpriseMember", reqJson.getString("enterpriseMember")); // 鍔炲叕浜烘暟
+        saveAttr(reqJson, ownerPo, "enterpriseOutput", reqJson.getString("enterpriseOutput")); // 浼佷笟浜у��
+        saveAttr(reqJson, ownerPo, "enterpriseSize", reqJson.getString("enterpriseSize")); // 浼佷笟瑙勬ā
+        saveAttr(reqJson, ownerPo, "enterpriseTax", reqJson.getString("enterpriseTax")); // 浼佷笟绋庢敹
+        saveAttr(reqJson, ownerPo, "enterpriseType", reqJson.getString("enterpriseType")); // 浼佷笟绫诲瀷
+        saveAttr(reqJson, ownerPo, "financingInfo", reqJson.getString("financingInfo")); // 铻嶈祫淇℃伅
+        saveAttr(reqJson, ownerPo, "inTime", reqJson.getString("inTime")); // 鍏ラ┗鏃堕棿
+        saveAttr(reqJson, ownerPo, "industry", reqJson.getString("industry")); // 鎵�灞炶涓�
+        saveAttr(reqJson, ownerPo, "label", reqJson.getString("label")); // 浼佷笟鏍囩
+        saveAttr(reqJson, ownerPo, "legalPerson", reqJson.getString("legalPerson")); // 娉曚汉
+        saveAttr(reqJson, ownerPo, "scienceEnterprise", reqJson.getString("scienceEnterprise")); // 绉戞妧鍨嬩紒涓�
+        saveAttr(reqJson, ownerPo, "shopName", reqJson.getString("shopName")); // 搴楅摵鍚嶇О
+        saveAttr(reqJson, ownerPo, "superAdmin", reqJson.getString("superAdmin")); // 瓒呯骇绠$悊鍛樺彿鐮�
+        saveAttr(reqJson, ownerPo, "website", reqJson.getString("website")); // 瀹樼綉鍦板潃
+        saveAttr(reqJson, ownerPo, "years", reqJson.getString("years")); // 鎴愮珛骞撮檺锛氬1-3骞�
+
+        return ownerPo.getOwnerId();
+    }
+
+    private void saveAttr(JSONObject reqJson, OwnerPo ownerPo, String specCd, String value) {
+
+        if (StringUtil.isEmpty(value)) {
+            return;
+        }
         OwnerAttrPo ownerAttrPo = new OwnerAttrPo();
         ownerAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId("11"));
-        ownerAttrPo.setCommunityId(DEFAULT_COMMUNITY_ID);
-        ownerAttrPo.setValue(reqJson.getString("userId"));
+        ownerAttrPo.setCommunityId(reqJson.getString("communityId"));
+        ownerAttrPo.setValue(value);
         ownerAttrPo.setMemberId(ownerPo.getMemberId());
-        ownerAttrPo.setSpecCd(OwnerAttrDto.SPEC_CD_EXT_OWNER_ID);
-
-        flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
+        ownerAttrPo.setSpecCd(specCd);
+        int flag = ownerAttrInnerServiceSMOImpl.saveOwnerAttr(ownerAttrPo);
         if (flag < 1) {
             throw new CmdException("淇濆瓨涓氫富澶辫触");
         }
-        return ownerPo.getOwnerId();
     }
+
 }

--
Gitblit v1.8.0