From 01aab3714b1fa7433ac1df19d0ff340a182fea1c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 三月 2022 19:48:22 +0800
Subject: [PATCH] 优化 缴费数据

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

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
index 0cbe56d..07d49e1 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeConfirmCmd.java
@@ -3,6 +3,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
@@ -111,6 +112,7 @@
     }
 
     @Override
+    @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
         String paramIn = CommonCache.getAndRemoveValue("payFeePre" + reqJson.getString("oId"));
         JSONObject paramObj = JSONObject.parseObject(paramIn);
@@ -130,6 +132,8 @@
 
         //澶勭悊鐜伴噾璐︽埛
         dealAccount(paramObj);
+
+        paramObj.put("detailId", GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
 
         //澶勭悊 浼樻儬鎶樻墸
         addDiscount(paramObj);
@@ -211,9 +215,12 @@
             //鑾峰彇bId
             String bId = feeDetailDtoList.get(0).getbId();
             //鑾峰彇浼樻儬
-            List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
-            if (computeDiscountDtos != null) {
-                for (ComputeDiscountDto computeDiscountDto : computeDiscountDtos) {
+            //List<ComputeDiscountDto> computeDiscountDtos = (List<ComputeDiscountDto>) paramObj.get("computeDiscountDtos");
+            JSONArray computeDiscountDtos = paramObj.getJSONArray("computeDiscountDtos");
+            ComputeDiscountDto computeDiscountDto = null;
+            if (computeDiscountDtos != null && computeDiscountDtos.size()> 0) {
+                for (int accountIndex = 0; accountIndex < computeDiscountDtos.size(); accountIndex++) {
+                    computeDiscountDto = BeanConvertUtil.covertBean(computeDiscountDtos.getJSONObject(accountIndex), ComputeDiscountDto.class);
                     if (!StringUtil.isEmpty(computeDiscountDto.getArdId())) {
                         ApplyRoomDiscountPo applyRoomDiscountPo = new ApplyRoomDiscountPo();
                         //灏嗕笟鍔d鏇存柊鍒扮┖缃埧浼樻儬閲岄潰

--
Gitblit v1.8.0