From e1c8bed1b24df8a6c80ffa582bb966acacc8a5d7 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期四, 06 二月 2020 11:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java b/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
index 4e004fd..e66e924 100644
--- a/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
+++ b/Api/src/main/java/com/java110/api/listener/owner/SaveOwnerListener.java
@@ -3,7 +3,9 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.api.listener.AbstractServiceApiDataFlowListener;
+import com.java110.core.smo.fee.IFeeConfigInnerServiceSMO;
 import com.java110.core.smo.file.IFileInnerServiceSMO;
+import com.java110.dto.fee.FeeConfigDto;
 import com.java110.dto.file.FileDto;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.*;
@@ -25,6 +27,7 @@
 
 import javax.activation.FileDataSource;
 import javax.xml.ws.soap.Addressing;
+import java.util.List;
 
 /**
  * @ClassName SaveOwnerListener
@@ -43,6 +46,9 @@
 
     @Autowired
     private IFileInnerServiceSMO fileInnerServiceSMOImpl;
+
+    @Autowired
+    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
 
     private static Logger logger = LoggerFactory.getLogger(SaveOwnerListener.class);
 
@@ -224,13 +230,23 @@
      */
     private JSONObject addPropertyFee(JSONObject paramInJson, DataFlowContext dataFlowContext) {
 
+        FeeConfigDto feeConfigDto = new FeeConfigDto();
+        feeConfigDto.setFeeTypeCd(FeeTypeConstant.FEE_TYPE_PROPERTY);
+        feeConfigDto.setIsDefault("T");
+        feeConfigDto.setCommunityId(paramInJson.getString("communityId"));
+        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+        if (feeConfigDtos == null || feeConfigDtos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_CODE_ERROR, "鏈煡鍒拌垂鐢ㄩ厤缃俊鎭紝鏌ヨ澶氭潯鏁版嵁");
+        }
 
+        feeConfigDto = feeConfigDtos.get(0);
         JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
         business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_INFO);
         business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
         business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
         JSONObject businessUnit = new JSONObject();
         businessUnit.put("feeId", "-1");
+        businessUnit.put("configId", feeConfigDto.getConfigId());
         businessUnit.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_PROPERTY);
         businessUnit.put("incomeObjId", paramInJson.getString("storeId"));
         businessUnit.put("amount", "-1.00");

--
Gitblit v1.8.0