From 2b919980a8c70554a64cb3d03cc95679af4d817f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 03 七月 2023 00:22:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java b/service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java
old mode 100644
new mode 100755
index d09eaf2..13a7c22
--- a/service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/bmo/payFeeDetailDiscount/impl/PayFeeDetailDiscountBMOImpl.java
@@ -4,9 +4,10 @@
import com.java110.api.bmo.ApiBaseBMO;
import com.java110.api.bmo.payFeeDetailDiscount.IPayFeeDetailDiscountBMO;
import com.java110.core.context.DataFlowContext;
-import com.java110.core.smo.fee.IPayFeeDetailDiscountInnerServiceSMO;
-import com.java110.po.payFeeDetailDiscount.PayFeeDetailDiscountPo;
+import com.java110.intf.fee.IPayFeeDetailDiscountInnerServiceSMO;
+import com.java110.po.payFee.PayFeeDetailDiscountPo;
import com.java110.utils.constant.BusinessTypeConstant;
+import com.java110.utils.constant.CommonConstant;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,10 +25,40 @@
* @param dataFlowContext 鏁版嵁涓婁笅鏂�
* @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
*/
- public void addPayFeeDetailDiscount(JSONObject paramInJson, DataFlowContext dataFlowContext) {
+ public JSONObject addPayFeeDetailDiscount(JSONObject paramInJson, JSONObject discountJson, DataFlowContext dataFlowContext) {
+ JSONObject business = JSONObject.parseObject("{\"datas\":{}}");
+ business.put(CommonConstant.HTTP_BUSINESS_TYPE_CD, BusinessTypeConstant.BUSINESS_TYPE_SAVE_DETAIL_DISCOUNT_INFO);
+ business.put(CommonConstant.HTTP_SEQ, DEFAULT_SEQ + 1);
+ business.put(CommonConstant.HTTP_INVOKE_MODEL, CommonConstant.HTTP_INVOKE_MODEL_S);
+ JSONObject businessFee = new JSONObject();
+ businessFee.put("detailDiscountId", "-1");
+ businessFee.put("discountPrice", discountJson.getString("discountPrice"));
+ businessFee.put("discountId", discountJson.getString("discountId"));
+ businessFee.put("detailId", paramInJson.getString("detailId"));
+ businessFee.put("communityId", paramInJson.getString("communityId"));
+ businessFee.put("feeId", paramInJson.getString("feeId"));
+ //businessFee.putAll(feeMap);
+ business.getJSONObject(CommonConstant.HTTP_BUSINESS_DATAS).put(PayFeeDetailDiscountPo.class.getSimpleName(), businessFee);
+ return business;
- paramInJson.put("detailDiscountId", "-1");
- PayFeeDetailDiscountPo payFeeDetailDiscountPo = BeanConvertUtil.covertBean(paramInJson, PayFeeDetailDiscountPo.class);
+ }
+
+ /**
+ * 娣诲姞灏忓尯淇℃伅
+ *
+ * @param paramInJson 鎺ュ彛璋冪敤鏀句紶鍏ュ叆鍙�
+ * @param dataFlowContext 鏁版嵁涓婁笅鏂�
+ * @return 璁㈠崟鏈嶅姟鑳藉鎺ュ彈鐨勬姤鏂�
+ */
+ public void addPayFeeDetailDiscountTwo(JSONObject paramInJson, JSONObject discountJson, DataFlowContext dataFlowContext) {
+ JSONObject businessFee = new JSONObject();
+ businessFee.put("detailDiscountId", "-1");
+ businessFee.put("discountPrice", discountJson.getString("discountPrice"));
+ businessFee.put("discountId", discountJson.getString("discountId"));
+ businessFee.put("detailId", paramInJson.containsKey("newDetailId") ? paramInJson.getString("newDetailId") : paramInJson.getString("detailId"));
+ businessFee.put("communityId", paramInJson.getString("communityId"));
+ businessFee.put("feeId", paramInJson.getString("feeId"));
+ PayFeeDetailDiscountPo payFeeDetailDiscountPo = BeanConvertUtil.covertBean(businessFee, PayFeeDetailDiscountPo.class);
super.insert(dataFlowContext, payFeeDetailDiscountPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_DETAIL_DISCOUNT_INFO);
}
--
Gitblit v1.8.0