From aab84ddd913e36628edab6407e9e5f54a6dd43ea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 14 十二月 2022 20:33:35 +0800
Subject: [PATCH] 优化线上缴费退费功能

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
index 885ab20..c900878 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayOweFeeCmd.java
@@ -123,6 +123,9 @@
         for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
             feeObj = fees.getJSONObject(feeIndex);
             feeObj.put("communityId", paramObj.getString("communityId"));
+            if(paramObj.containsKey("oId")) {
+                feeObj.put("oId", paramObj.getString("oId"));
+            }
             String remark = paramObj.getString("remark");
             feeObj.put("remark", remark);
             if (!feeObj.containsKey("primeRate") && AppDto.OWNER_WECHAT_PAY.equals(appId)) {  //寰俊鍏紬鍙锋敮浠�
@@ -159,7 +162,9 @@
         dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos));
     }
 
-    private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj, List<FeeReceiptDetailPo> feeReceiptDetailPos, List<FeeReceiptPo> feeReceiptPos) {
+    private void getFeeReceiptDetailPo(ICmdDataFlowContext dataFlowContext, JSONObject paramObj,
+                                       List<FeeReceiptDetailPo> feeReceiptDetailPos,
+                                       List<FeeReceiptPo> feeReceiptPos) {
         int flag = 0;
         if (!paramObj.containsKey("primeRate")) {
             paramObj.put("primeRate", "6");
@@ -333,6 +338,12 @@
         paramInJson.put("feeInfo", feeDto);
         paramInJson.put("cycles", cycles.doubleValue());
         PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(businessFeeDetail, PayFeeDetailPo.class);
+        if(paramInJson.containsKey("oId")) {
+            payFeeDetailPo.setPayOrderId(paramInJson.getString("oId"));
+        }else{
+            payFeeDetailPo.setPayOrderId(payFeeDetailPo.getDetailId());
+
+        }
 
         int flag = payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(payFeeDetailPo);
 

--
Gitblit v1.8.0