From dea2325896c7f8bd7df5107569b71d15fede79c7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 九月 2022 20:11:55 +0800
Subject: [PATCH] 1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题
---
service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
index 8ab143a..deb3715 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/PayFeeCmd.java
@@ -188,7 +188,6 @@
@Override
@Java110Transactional
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject paramObj) throws CmdException {
-
logger.debug("paramObj : {}", paramObj);
PayFeePo payFeePo = null;
String requestId = DistributedLock.getLockUUID();
@@ -196,9 +195,11 @@
try {
DistributedLock.waitGetDistributedLock(key, requestId);
JSONObject feeDetail = addFeeDetail(paramObj);
+ feeDetail.put("payableAmount", feeDetail.getString("receivableAmount"));
JSONObject fee = modifyFee(paramObj);
payFeePo = BeanConvertUtil.covertBean(fee, PayFeePo.class);
PayFeeDetailPo payFeeDetailPo = BeanConvertUtil.covertBean(feeDetail, PayFeeDetailPo.class);
+ payFeeDetailPo.setReceivableAmount(feeDetail.getString("totalFeePrice"));
//鍒ゆ柇鏄惁鏈夎禒閫佽鍒�
hasDiscount(paramObj, payFeePo, payFeeDetailPo);
//鍒ゆ柇閫夋嫨鐨勮处鍙�
@@ -356,6 +357,7 @@
/**
* 鏀归�犺禒閫侀�昏緫 if 宓屽鏈夌偣澶� 浼樺寲
+ *
* @param paramObj
* @param payFeePo
* @param payFeeDetailPo
@@ -627,7 +629,6 @@
cycles = new BigDecimal(Double.parseDouble(paramInJson.getString("cycles")));
double tmpReceivableAmount = cycles.multiply(feePrice).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
businessFeeDetail.put("receivableAmount", tmpReceivableAmount);
-
//鍑虹閫掑闂澶勭悊
if (FeeConfigDto.COMPUTING_FORMULA_RANT_RATE.equals(feeDto.getComputingFormula())) {
computeFeeSMOImpl.dealRentRateCycle(feeDto, cycles.doubleValue());
--
Gitblit v1.8.0