From 6e46b85a2f83e619b6237fe9330c159a3e1a0162 Mon Sep 17 00:00:00 2001
From: huangqizhen <15552608129@163.com>
Date: Thu, 20 Nov 2025 15:48:04 +0800
Subject: [PATCH] 11.20bug
---
src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java | 1 +
src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java | 1 +
.../com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java | 6 +++++-
src/main/resources/cashMapper/CashRefundMapper.xml | 4 +---
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
index badd124..170f203 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java
@@ -118,6 +118,7 @@ public class CashRecordDone {
private Date sTime; // 开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date eTime; // 结束时间
+ private Integer relatedId;
}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java
index 0cdd8c3..b8286f3 100644
--- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java
+++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordRefund.java
@@ -201,5 +201,6 @@ public class CashRecordRefund {
private Date eTime; // 结束时间
private Integer partRefundGold;
private Integer partRefundFree;
+ private BigDecimal handlingCharge;
}
\ No newline at end of file
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
index 660229e..d088f45 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java
@@ -155,7 +155,7 @@ public class CashRefundServiceImpl implements RefundService {
item.setReceivedTime(cashCollection.getReceivedTime());
item.setPayVoucher(cashCollection.getVoucher());
item.setPayRemark(cashCollection.getRemark());
- item.setHandlingCharge(cashCollection.getHandlingCharge());
+ item.setHandlingCharge(cashCollection.getHandlingCharge().divide(new BigDecimal(100), 2, RoundingMode.HALF_UP));
// 处理金币金额
if (item.getPermanentGold() != null) {
@@ -177,6 +177,9 @@ public class CashRefundServiceImpl implements RefundService {
if(cashRecordRefund.getRefundReason()== null){
throw new Exception("请填写退款理由") ;
}
+ if (cashRecordRefund.getHandlingCharge()== null){
+ throw new Exception("请先填写手续费") ;
+ }
CashRecordDone cashRecordDonetwo = new CashRecordDone();
cashRecordDonetwo.setAreaServise(cashRecordRefund.getAreaServise());
cashRefundMapper.addAudit(cashRecordDonetwo);
@@ -245,6 +248,7 @@ public class CashRefundServiceImpl implements RefundService {
throw new RuntimeException("未输入订单号");
}
CashRecordDone cashRecordDone1 = new CashRecordDone();
+ cashRecordDone1.setId(cashRecordDone.getRelatedId());
cashRecordDone1.setOrderCode(cashRecordDone.getOrderCode().substring(2));
cashRecordDone1.setStatus(4);
if (cashRecordDone1.getId()!=null||cashRecordDone1.getOrderCode()!= null){
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 2aaac2b..86ae2a5 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -14,7 +14,6 @@
free_gold,
submitter_id,
submitter_market,
- voucher,
remark,
reject_reason,
refund_reason,
@@ -39,7 +38,6 @@
#{partRefundFree},
#{submitterId},
#{submitterMarket},
- #{voucher},
#{remark},
#{rejectReason},
#{refundReason},
@@ -373,7 +371,7 @@
and crc.`refund_time` BETWEEN #{startTime} AND #{endTime}
- and crr.submitter_id = #{submitterId}
+ and crr.executor = #{executor}