From bdcb64f0293f27e2dfb3de12a60f6e8412cb962b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 26 五月 2022 01:45:22 +0800
Subject: [PATCH] 退费修改为 从证书地址中获取
---
service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
index 66f4403..9ced7dd 100755
--- a/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/smo/impl/FeeInnerServiceSMOImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Transactional;
import com.java110.core.base.smo.BaseServiceSMO;
import com.java110.dto.PageDto;
import com.java110.dto.fee.BillDto;
@@ -89,14 +90,19 @@
List<FeeAttrDto> feeAttrDtos = BeanConvertUtil.covertBeanList(attrMaps, FeeAttrDto.class);
List<FeeAttrDto> tmpFeeAttrDtos = null;
+ String payerObjName = "";
for (FeeDto tmpFeeDto : fees) {
tmpFeeAttrDtos = new ArrayList<>();
for (FeeAttrDto feeAttrDto : feeAttrDtos) {
-
- if (tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
- tmpFeeAttrDtos.add(feeAttrDto);
+ if (!tmpFeeDto.getFeeId().equals(feeAttrDto.getFeeId())) {
+ continue;
+ }
+ tmpFeeAttrDtos.add(feeAttrDto);
+ if(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME.equals(feeAttrDto.getSpecCd())){
+ payerObjName = feeAttrDto.getValue();
}
}
+ tmpFeeDto.setPayerObjName(payerObjName);
tmpFeeDto.setFeeAttrDtos(tmpFeeAttrDtos);
}
return fees;
@@ -115,7 +121,7 @@
List<FeeDto> fees = BeanConvertUtil.covertBeanList(feeServiceDaoImpl.getFeeInfo(BeanConvertUtil.beanCovertMap(feeDto)), FeeDto.class);
- for(FeeDto tmpFeeDto : fees) {
+ for (FeeDto tmpFeeDto : fees) {
if (!StringUtil.isEmpty(tmpFeeDto.getImportFeeName())) {
//fee.setFeeName(fee.getImportFeeName() + "(" + fee.getFeeName() + ")");
tmpFeeDto.setFeeName(tmpFeeDto.getImportFeeName());
@@ -318,6 +324,7 @@
}
@Override
+ @Java110Transactional
public int updateFee(@RequestBody PayFeePo payFeePo) {
feeServiceDaoImpl.updateFeeInfoInstance(BeanConvertUtil.beanCovertMap(payFeePo));
return 1;
@@ -330,6 +337,16 @@
fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
}
+ Map info = new HashMap();
+ info.put("payFeePos", fees);
+ return feeServiceDaoImpl.insertFees(info);
+ }
+
+ @Override
+ @Java110Transactional
+ public int saveOneFee(@RequestBody PayFeePo payFeePo) {
+ List<Map> fees = new ArrayList<>();
+ fees.add(BeanConvertUtil.beanCovertMap(payFeePo));
Map info = new HashMap();
info.put("payFeePos", fees);
return feeServiceDaoImpl.insertFees(info);
@@ -361,7 +378,6 @@
return data;
}
-
private void dealFeeConfig(JSONArray data, FeeConfigDto tmpFeeConfigDto) {
--
Gitblit v1.8.0