From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/listener/fee/PayFeeListener.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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 b718904..603e12c 100644
--- 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
@@ -11,6 +11,7 @@
import com.java110.dto.fee.FeeAttrDto;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
+import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.owner.OwnerCarDto;
import com.java110.dto.repair.RepairDto;
import com.java110.dto.repair.RepairUserDto;
@@ -22,7 +23,6 @@
import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
import com.java110.intf.fee.IFeeReceiptDetailInnerServiceSMO;
-import com.java110.intf.fee.IFeeReceiptInnerServiceSMO;
import com.java110.intf.user.IOwnerCarInnerServiceSMO;
import com.java110.po.car.OwnerCarPo;
import com.java110.po.feeReceipt.FeeReceiptPo;
@@ -78,14 +78,12 @@
@Autowired
private IOwnerCarInnerServiceSMO ownerCarInnerServiceSMOImpl;
- @Autowired
- private IFeeReceiptInnerServiceSMO feeReceiptInnerServiceSMOImpl;
-
- @Autowired
- private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
@Autowired
private IPayFeeDetailDiscountBMO payFeeDetailDiscountBMOImpl;
+
+ @Autowired
+ private IFeeReceiptDetailInnerServiceSMO feeReceiptDetailInnerServiceSMOImpl;
@Autowired
private IRepairUserInnerServiceSMO repairUserInnerServiceSMO;
@@ -239,10 +237,16 @@
return;
}
- //杩欓噷鍙槸鍐欏叆 鏀舵嵁琛紝鏆備笉鑰冭檻 浜嬪姟涓�鑷存�ч棶棰橈紝灏辩畻鍐欏叆澶辫触 涔熷彧鏄奖鍝� 鏀舵嵁鎵撳嵃锛屽鏋� 璐靛叕鍙稿 鏀舵嵁瑕佹眰 姣旇緝楂橈紝涓嶈兘鏈夊け璐ョ殑鎯呭喌 璇峰姞鍏ヤ簨鍔＄鐞�
- feeReceiptDetailInnerServiceSMOImpl.saveFeeReceiptDetail(feeReceiptDetailPo);
- feeReceiptInnerServiceSMOImpl.saveFeeReceipt(feeReceiptPo);
+ //鏍规嵁鏄庣粏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(feeReceiptDetailPo));
}
--
Gitblit v1.8.0