From 35fc2330421c1ea217f00e0cb973c1b30e2363c0 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 10 九月 2025 09:43:54 +0800
Subject: [PATCH] 合同校验0910
---
service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java b/service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java
index a769e7d..00c2a8c 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/business/oweFee/OweFeePaymentBusiness.java
@@ -35,6 +35,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -221,6 +222,9 @@
String order = CommonCache.getAndRemoveValue(FeeDto.REDIS_PAY_OWE_FEE + paymentOrderDto.getOrderId());
JSONObject paramIn = JSONObject.parseObject(order);
+ if (reqJson.containsKey("remark")) {
+ paramIn.put("remark",reqJson.getString("remark"));
+ }
paramIn.put("oId", paymentOrderDto.getOrderId());
freshFees(paramIn);
JSONObject paramOut = CallApiServiceFactory.postForApi(paymentOrderDto.getAppId(), paramIn, "fee.payOweFee", JSONObject.class, paramIn.getString("userId"));
@@ -239,7 +243,7 @@
fee = fees.getJSONObject(feeIndex);
if (fee.containsKey("deadlineTime")) {
fee.put("startTime", DateUtil.getFormatTimeString(fee.getDate("endTime"), DateUtil.DATE_FORMATE_STRING_A));
- fee.put("endTime", DateUtil.getFormatTimeString(fee.getDate("deadlineTime"), DateUtil.DATE_FORMATE_STRING_A));
+ fee.put("endTime", DateUtil.getAddHoursStringA(fee.getDate("deadlineTime"), -1).split(" ")[0] + " 23:59:59");
fee.put("receivedAmount", fee.getString("feeTotalPrice"));
fee.put("state", "");
}
--
Gitblit v1.8.0