From 58a8acceb63d52377da4b837e859f2e03d2bce1b Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期一, 14 十月 2024 08:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v3' into master-v2
---
src/main/java/com/mzl/flower/service/payment/OrderSalesService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderSalesService.java b/src/main/java/com/mzl/flower/service/payment/OrderSalesService.java
index 684d00b..00b8b8f 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderSalesService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderSalesService.java
@@ -55,7 +55,7 @@
private UserWechatMapper wechatMapper;
@Autowired
- private UserPaymentV3Service paymentV3Service;
+ private UserPaymentSybService paymentSybService;
@Autowired
private OrderRefundMapper orderRefundMapper;
@@ -192,7 +192,7 @@
salesItemMapper.updateById(item);
}
- public void doAudit(OrderSalesAuditDTO dto){
+ public void doAudit(OrderSalesAuditDTO dto) throws Exception {
OrderSales s = salesMapper.selectById(dto.getId());
s.setAuditRemarks(dto.getAuditRemarks());
s.setAuditStatus(dto.getAuditStatus());
@@ -214,7 +214,7 @@
if(Constants.SALES_AUDIT_STATUS.AGREE.name().equals(s.getAuditStatus())){
if(totalAmount.doubleValue() > 0) {
Order o = orderMapper.selectById(s.getOrderId());
- String transferId = paymentV3Service.refundOrderSub(o, totalAmount);
+ String transferId = paymentSybService.refundOrderSub(o, totalAmount);
s.setTransferId(transferId);
/*if(totalAmount.doubleValue() > o.getTotalAmount().doubleValue()){
--
Gitblit v1.9.3