From 8a2a463d46b3dce73015462c9f6a2a258dd25f5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 二月 2022 11:40:11 +0800
Subject: [PATCH] 优化diamante

---
 service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
index 0864b6f..dac9a6c 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java
@@ -287,16 +287,6 @@
             return;
         }
 
-        //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
-        FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
-        feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
-        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
-        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
-
-        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
-            dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
-            return;
-        }
         //淇敼鎶樻墸鐢宠鐘舵�侊紝绌虹疆鎴挎姌鎵e彧鑳界敤涓�娆�
         String selectDiscount = paramObj.getString("selectDiscount");
         JSONArray params = JSONArray.parseArray(selectDiscount);
@@ -310,6 +300,18 @@
                 applyRoomDiscountInnerServiceSMOImpl.updateApplyRoomDiscount(applyRoomDiscountPo);
             }
         }
+
+        //鏍规嵁鏄庣粏ID 鏌ヨ鏀舵嵁淇℃伅
+        FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
+        feeReceiptDetailDto.setDetailId(paramObj.getString("detailId"));
+        feeReceiptDetailDto.setCommunityId(paramObj.getString("communityId"));
+        List<FeeReceiptDetailDto> feeReceiptDetailDtos = feeReceiptDetailInnerServiceSMOImpl.queryFeeReceiptDetails(feeReceiptDetailDto);
+
+        if (feeReceiptDetailDtos != null && feeReceiptDetailDtos.size() > 0) {
+            dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDtos.get(0)));
+            return;
+        }
+
         dataFlowContext.setResponseEntity(ResultVo.createResponseEntity(feeReceiptDetailDto));
 
     }

--
Gitblit v1.8.0