Merge branch 'milestone-20251104-现金管理二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20251104110749-现金管理二期

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;
 
 
 }

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;
 
 }

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){

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}
             </if>
             <if test=" submitterId!= null">
-                and crr.submitter_id = #{submitterId}
+                and crr.executor = #{executor}
             </if>
         </where>
         <choose>