From 5c24b36b6f590e665e023c1ce6aa9d0cf78ad68d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 08 十一月 2022 01:16:08 +0800
Subject: [PATCH] 优化保养计划添加功能

---
 service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java |   25 ++++++++-----------------
 1 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java b/service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java
index 59dadea..d3009b4 100644
--- a/service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java
+++ b/service-community/src/main/java/com/java110/community/bmo/community/impl/CommunityBMOImpl.java
@@ -7,6 +7,7 @@
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.CommunityMemberDto;
 import com.java110.dto.community.CommunityDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.dto.workflow.WorkflowDto;
 import com.java110.intf.common.IWorkflowInnerServiceSMO;
 import com.java110.intf.community.ICommunityAttrV1InnerServiceSMO;
@@ -307,6 +308,7 @@
         businessFeeConfig.putAll(paramInJson);
         businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_REPAIR);
         businessFeeConfig.put("feeName", "鎶ヤ慨璐筟绯荤粺榛樿]");
+        businessFeeConfig.put("deductFrom", "Y");
         businessFeeConfig.put("feeFlag", "2006012"); //涓�娆℃�ц垂鐢�
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
@@ -472,6 +474,7 @@
         businessFeeConfig.putAll(paramInJson);
         businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_TEMP_DOWN_PARKING_SPACE);
         businessFeeConfig.put("feeName", "涓存椂杞﹁垂鐢╗绯荤粺榛樿]");
+        businessFeeConfig.put("deductFrom", "Y");
         businessFeeConfig.put("feeFlag", "2006012");
         businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
@@ -500,33 +503,21 @@
      */
     public void addCommunityMembers(JSONObject paramInJson, ICmdDataFlowContext dataFlowContext) {
 
-        JSONObject businessCommunityMember = new JSONObject();
-        businessCommunityMember.put("communityMemberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_communityMemberId));
-        businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId", paramInJson.getString("storeId"));
-        businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.AGENT);
-        businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
-        CommunityMemberPo communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
-        communityMemberPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-        communityMemberPo.setEndTime(DateUtil.getLastTime());
-        int flag = communityMemberV1InnerServiceSMOImpl.saveCommunityMember(communityMemberPo);
-
-        if (flag < 1) {
-            throw new IllegalArgumentException("娣诲姞灏忓尯鎴愬憳澶辫触");
-        }
+        JSONObject businessCommunityMember = null;
+        CommunityMemberPo communityMemberPo = null;
 
         //娣诲姞杩愮淮鍟嗘埛
         //娣诲姞寮�鍙戝晢鎴�
         businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_communityMemberId));
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId", "400000000000000001");
+        businessCommunityMember.put("memberId", StoreDto.STORE_ADMIN);
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.OPT);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);
         communityMemberPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
         communityMemberPo.setEndTime(DateUtil.getLastTime());
-        flag = communityMemberV1InnerServiceSMOImpl.saveCommunityMember(communityMemberPo);
+        int flag = communityMemberV1InnerServiceSMOImpl.saveCommunityMember(communityMemberPo);
         if (flag < 1) {
             throw new IllegalArgumentException("娣诲姞灏忓尯鎴愬憳澶辫触");
         }
@@ -534,7 +525,7 @@
         businessCommunityMember = new JSONObject();
         businessCommunityMember.put("communityMemberId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_communityMemberId));
         businessCommunityMember.put("communityId", paramInJson.getString("communityId"));
-        businessCommunityMember.put("memberId", "400000000000000002");
+        businessCommunityMember.put("memberId", StoreDto.STORE_DEV);
         businessCommunityMember.put("memberTypeCd", CommunityMemberTypeConstant.DEV);
         businessCommunityMember.put("auditStatusCd", StateConstant.AGREE_AUDIT);
         communityMemberPo = BeanConvertUtil.covertBean(businessCommunityMember, CommunityMemberPo.class);

--
Gitblit v1.8.0