autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-13 22:40:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev-g' into dev

Browse Source
This commit is contained in:
Guoqs
2025-04-02 09:26:58 +08:00
parent f12cca4b9d e053cc32b9
commit 22c7653476
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -102,16 +102,7 @@ public class PaymentTestController {
// 待分账订单信息, 需要重新分账的订单信息（针对未分账的订单） // 待分账订单信息, 需要重新分账的订单信息（针对未分账的订单）
String jsonArrayString = "[" + String jsonArrayString = "[" +
"{\"orderCode\":\"C27433493597\", \"settleAmount\":\"0.02\", \"paymentId\":\"002212025022302280610739441577884725248\"}" + "{\"orderCode\":\"C27490025494\", \"settleAmount\":\"12.95\", \"paymentId\":\"002212025040121085510753131992504455168\"}" +
"{\"orderCode\":\"C63383493863\", \"settleAmount\":\"0.09\", \"paymentId\":\"002212025022415502310740005867241734144\"}" +
"{\"orderCode\":\"C40938871350\", \"settleAmount\":\"0.06\", \"paymentId\":\"002212025022612330810740681003442454528\"}" +
"{\"orderCode\":\"C46616734445\", \"settleAmount\":\"0.12\", \"paymentId\":\"002212025030511263110743200952492281856\"}" +
"{\"orderCode\":\"C42221075821\", \"settleAmount\":\"0.09\", \"paymentId\":\"002212025030511541010743207911235268608\"}" +
"{\"orderCode\":\"C63577793300\", \"settleAmount\":\"0.11\", \"paymentId\":\"002212025030514073810743241501523603456\"}" +
"{\"orderCode\":\"C69635202024\", \"settleAmount\":\"0.14\", \"paymentId\":\"002212025030823144210744466339942608896\"}" +
"{\"orderCode\":\"C80686802200\", \"settleAmount\":\"0.05\", \"paymentId\":\"002212025031707180710747487098475462656\"}" +
"{\"orderCode\":\"C88833182669\", \"settleAmount\":\"0.03\", \"paymentId\":\"002212025032407012210750019595747975168\"}" +
"{\"orderCode\":\"C80644264149\", \"settleAmount\":\"0.16\", \"paymentId\":\"002212025032520081110750579991937593344\"}" +
"]"; "]";
JSONArray jsonArray = JSONArray.parseArray(jsonArrayString); JSONArray jsonArray = JSONArray.parseArray(jsonArrayString);
@@ -299,10 +290,10 @@ public class PaymentTestController {
*/ */
@Test @Test
public void createPaymentReverseRequestTest() { public void createPaymentReverseRequestTest() {
String paymentId = "002212024102215301510694702317666226176"; String paymentId = "002212025040121085510753131992504455168";
BigDecimal refundAmount = new BigDecimal("15.42"); BigDecimal refundAmount = new BigDecimal("13.33");
String memberId = "42833137"; String memberId = "63111233";
String orderCode = "C21960272918"; String orderCode = "C27490025494";
// 延迟分账未确认调撤销调撤销接口退款 // 延迟分账未确认调撤销调撤销接口退款
PaymentReverseOperation operation = new PaymentReverseOperation(); PaymentReverseOperation operation = new PaymentReverseOperation();

6
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1921,7 +1921,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// 订单折扣金额 = 电费折扣金额 + 服务费折扣金额 // 订单折扣金额 = 电费折扣金额 + 服务费折扣金额
BigDecimal orderDiscountAmount = afterSettleOrderDTO.getOrderElectricityDiscountAmount().add(afterSettleOrderDTO.getOrderServiceDiscountAmount()); BigDecimal orderDiscountAmount = afterSettleOrderDTO.getOrderElectricityDiscountAmount().add(afterSettleOrderDTO.getOrderServiceDiscountAmount());
if (orderConsumeAmount.subtract(orderDiscountAmount).add(orderRefundAmount).compareTo(orderPayAmount) != 0) { if (orderConsumeAmount.subtract(orderDiscountAmount).add(orderRefundAmount).compareTo(orderPayAmount) != 0) {
logger.info("realTimeOrderSplit-订单:{}, payMode:{}, 支付金额与消费金额-折扣金额+退款金额不相等", afterSettleOrderDTO.getOrderCode(), orderBasicInfo.getPayMode()); logger.info("realTimeOrderSplit-订单:{}, payMode:{}, 支付金额({})与消费金额({})-折扣金额({})+退款金额({})不相等",
afterSettleOrderDTO.getOrderCode(), orderBasicInfo.getPayMode(), orderPayAmount, orderConsumeAmount, orderDiscountAmount, orderRefundAmount);
return null; return null;
} }
} }
@@ -1929,7 +1930,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
// 如果是在线支付, 校验消费金额+ 退款金额 = 支付金额 // 如果是在线支付, 校验消费金额+ 退款金额 = 支付金额
if (StringUtils.equals(orderBasicInfo.getPayMode(), "4") || StringUtils.equals(orderBasicInfo.getPayMode(), "5")) { if (StringUtils.equals(orderBasicInfo.getPayMode(), "4") || StringUtils.equals(orderBasicInfo.getPayMode(), "5")) {
if (orderSettleAmount.add(orderRefundAmount).compareTo(orderPayAmount) != 0) { if (orderSettleAmount.add(orderRefundAmount).compareTo(orderPayAmount) != 0) {
logger.info("realTimeOrderSplit-订单:{}, payMode:{}, 支付金额与结算金额+退款金额不相等", afterSettleOrderDTO.getOrderCode(), orderBasicInfo.getPayMode()); logger.info("realTimeOrderSplit-订单:{}, payMode:{}, 支付金额({})与结算金额({})+退款金额({})不相等",
afterSettleOrderDTO.getOrderCode(), orderBasicInfo.getPayMode(), orderPayAmount, orderSettleAmount, orderRefundAmount);
return null; return null;
} }
} }