From c71507499acb076b7b134c6df95c44655a4d7fca Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 07 九月 2021 11:49:18 +0800
Subject: [PATCH] 1、调整小区仓库调拨记录流程2、调整物品发放流程3、新增优惠申请核验记录4、新增组合支付（未完成，待续）5、优化费用显示问题
---
service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java b/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
index 84dcc45..4157fd0 100755
--- a/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/fee/QueryFeeDetailListener.java
@@ -20,6 +20,7 @@
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -76,7 +77,30 @@
apiFeeDetailVo.setTotal(total);
if (total > 0) {
List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
- List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailDtos, ApiFeeDetailDataVo.class);
+ List<FeeDetailDto> feeDetailList = new ArrayList<>();
+ for (FeeDetailDto feeDetail : feeDetailDtos) {
+ //鑾峰彇鐘舵��
+ String state = feeDetail.getState();
+ if (!StringUtil.isEmpty(state) && (state.equals("1300") || state.equals("1100") || state.equals("1200"))) { //閫�璐瑰崟銆佸凡閫�璐广�侀��璐瑰け璐ョ姸鎬�
+ //鑾峰彇鍛ㄦ湡
+ String cycles = feeDetail.getCycles();
+ if (!StringUtil.isEmpty(cycles) && cycles.contains("-")) {
+ feeDetail.setCycles(cycles.substring(1));
+ }
+ //鑾峰彇搴旀敹閲戦
+ String receivableAmount = feeDetail.getReceivableAmount();
+ if (!StringUtil.isEmpty(receivableAmount) && receivableAmount.contains("-")) {
+ feeDetail.setReceivableAmount(receivableAmount.substring(1));
+ }
+ //鑾峰彇瀹炴敹閲戦
+ String receivedAmount = feeDetail.getReceivedAmount();
+ if (!StringUtil.isEmpty(receivedAmount) && receivedAmount.contains("-")) {
+ feeDetail.setReceivedAmount(receivedAmount.substring(1));
+ }
+ }
+ feeDetailList.add(feeDetail);
+ }
+ List<ApiFeeDetailDataVo> feeDetails = BeanConvertUtil.covertBeanList(feeDetailList, ApiFeeDetailDataVo.class);
//reFreshCreateTime(feeDetails, feeDetailDtos);
--
Gitblit v1.8.0