From ec3591afadc843eadd58ab883b9eb88d5283f5a0 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 08 七月 2020 23:13:07 +0800
Subject: [PATCH] 优化公众号支付
---
service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java | 61 ++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
index c6ece15..d2e2541 100644
--- a/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/community/impl/CommunityBMOImpl.java
@@ -106,7 +106,7 @@
String auditStatusCd = MappingCache.getValue(MappingConstant.DOMAIN_COMMUNITY_MEMBER_AUDIT, paramInJson.getString("memberTypeCd"));
auditStatusCd = StringUtils.isEmpty(auditStatusCd) ? StateConstant.AGREE_AUDIT : auditStatusCd;
businessCommunityMember.put("auditStatusCd", auditStatusCd);
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
return business;
}
@@ -125,7 +125,7 @@
business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
JSONObject businessCommunityMember = new JSONObject();
businessCommunityMember.put("communityMemberId", paramInJson.getString("communityMemberId"));
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
return business;
}
@@ -157,7 +157,7 @@
businessCommunityMember.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
businesses.add(business);
@@ -179,7 +179,7 @@
businessCommunityMember.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
businesses.add(business);
//杩愮淮鍥㈤槦
@@ -200,7 +200,7 @@
businessCommunityMember.put("communityMemberId", communityMemberDtoList.get(0).getCommunityMemberId());
- business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put("businessCommunityMember", businessCommunityMember);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(CommunityMemberPo.class.getSimpleName(), businessCommunityMember);
businesses.add(business);
@@ -241,12 +241,44 @@
businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
businessFeeConfig.put("computingFormula", "1001");
businessFeeConfig.put("squarePrice", "0.00");
+ businessFeeConfig.put("paymentCd", "1200");
businessFeeConfig.put("additionalAmount", "0.00");
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "002");//鎸夋湀鍑鸿处
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+ super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
+ }
+
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void addFeeConfigRepair(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
+ JSONObject businessFeeConfig = new JSONObject();
+ businessFeeConfig.putAll(paramInJson);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_REPAIR);
+ businessFeeConfig.put("feeName", "鎶ヤ慨璐筟绯荤粺榛樿]");
+ businessFeeConfig.put("feeFlag", "2006012"); //涓�娆℃�ц垂鐢�
+ businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ businessFeeConfig.put("endTime", DateUtil.LAST_TIME);
+ businessFeeConfig.put("computingFormula", "4004");
+ businessFeeConfig.put("squarePrice", "0.00");
+ businessFeeConfig.put("additionalAmount", "0.00");
+ businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
+ businessFeeConfig.put("configId", paramInJson.getString("configId"));
+ businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "2100");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
+ businessFeeConfig.put("isDefault", "T");
+ PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
+
super.insert(dataFlowContext, payFeeConfigPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_FEE_CONFIG);
}
@@ -261,7 +293,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笂鍑哄敭杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "2006012");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -272,6 +304,8 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -289,7 +323,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笅鍑哄敭杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "2006012");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -300,6 +334,8 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -317,7 +353,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_UP_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笂鍑虹杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "1003006");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -328,6 +364,8 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -345,7 +383,7 @@
paramInJson.put("configId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_configId));
JSONObject businessFeeConfig = new JSONObject();
businessFeeConfig.putAll(paramInJson);
- businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_HIRE_DOWN_PARKING_SPACE);
+ businessFeeConfig.put("feeTypeCd", FeeTypeConstant.FEE_TYPE_CAR);
businessFeeConfig.put("feeName", "鍦颁笅鍑虹杞︿綅璐筟绯荤粺榛樿]");
businessFeeConfig.put("feeFlag", "1003006");
businessFeeConfig.put("startTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
@@ -356,6 +394,9 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "003");//鎸夊ぉ鍑鸿处
+
+ businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
@@ -384,6 +425,8 @@
businessFeeConfig.put("communityId", paramInJson.getString("communityId"));
businessFeeConfig.put("configId", paramInJson.getString("configId"));
businessFeeConfig.put("billType", "004");//鎸夊ぉ鍑鸿处
+ businessFeeConfig.put("paymentCd", "1200");
+ businessFeeConfig.put("paymentCycle", "1");//鎸夋湀鍑鸿处
businessFeeConfig.put("isDefault", "T");
PayFeeConfigPo payFeeConfigPo = BeanConvertUtil.covertBean(businessFeeConfig, PayFeeConfigPo.class);
--
Gitblit v1.8.0