From d44d34d20bf71d8b9736608a691189aa844ec11d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 九月 2024 14:17:03 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
index cad99dd..e3ba3e6 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java
@@ -44,6 +44,7 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -360,6 +361,7 @@
         if(1 == paymentType){
             WxPaymentRefundModel model = new WxPaymentRefundModel();
             model.setOut_trade_no(shoppingOrder.getCode());
+            model.setTransaction_id(shoppingOrder.getSerialNumber());
             model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
             model.setReason("取消订单");
             model.setNotify_url("http://127.0.0.1:9000/order/t-shopping-order/cancelShoppingOrderWxRefund");
@@ -405,6 +407,7 @@
     public AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time) {
         if("SUCCESS".equals(refund_status)){
             TShoppingOrderRefund one = shoppingOrderRefundService.getOne(new LambdaQueryWrapper<TShoppingOrderRefund>().eq(TShoppingOrderRefund::getRefundCode, out_refund_no));
+            one.setRefundStatus(2);
             one.setRefundSerialNumber(refund_id);
             one.setRefundTime(LocalDateTime.parse(success_time, DateTimeFormatter.ofPattern("yyyy-MM-DDTHH:mm:ss+TIMEZONE")));
             shoppingOrderRefundService.updateById(one);
@@ -533,4 +536,16 @@
         pageInfo.setRecords(list);
         return pageInfo;
     }
+
+    @Override
+    public List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status) {
+        return this.baseMapper.sixBefore(sixBefore,status);
+    }
+
+    @Override
+    public BigDecimal getSumAmount(LocalDate sixBefore) {
+        return this.baseMapper.getSumAmount(sixBefore);
+    }
+
+
 }

--
Gitblit v1.7.1