From 8077d0bd1289deaa2fc2fb6f9b5cda12f0b0c075 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Mon, 10 Mar 2025 16:25:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pay/service/impl/OrderTradeServiceImpl.java | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
index 27779d4..aa09b90 100644
--- a/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
+++ b/mcwl-pay/src/main/java/com/mcwl/pay/service/impl/OrderTradeServiceImpl.java
@@ -189,7 +189,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
         todayIncome = orderTradeMapper.getTodayIncome();
         // 保留小数点后两位
         double doubleValue = new BigDecimal(todayIncome).setScale(2, RoundingMode.HALF_UP).doubleValue();
-        redisCache.setCacheObject("income:todayIncome", doubleValue, 1, TimeUnit.MINUTES);
+        redisCache.setCacheObject("income:todayIncome", doubleValue, 10, TimeUnit.MINUTES);
         return doubleValue;
     }
 
@@ -206,7 +206,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
         }
         monthIncome = orderTradeMapper.getMonthIncome();
         double doubleValue = new BigDecimal(monthIncome).setScale(2, RoundingMode.HALF_UP).doubleValue();
-        redisCache.setCacheObject("income:monthIncome", doubleValue, 1, TimeUnit.MINUTES);
+        redisCache.setCacheObject("income:monthIncome", doubleValue, 10, TimeUnit.MINUTES);
         return doubleValue;
     }
 
@@ -223,7 +223,7 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
         }
         yearIncome = orderTradeMapper.getYearIncome();
         double doubleValue = new BigDecimal(yearIncome).setScale(2, RoundingMode.HALF_UP).doubleValue();
-        redisCache.setCacheObject("income:yearIncome", doubleValue, 1, TimeUnit.MINUTES);
+        redisCache.setCacheObject("income:yearIncome", doubleValue, 10, TimeUnit.MINUTES);
         return doubleValue;
     }
 
@@ -396,6 +396,12 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
     @Transactional(rollbackFor = Exception.class)
     public void orderHandler(OrderTrade orderTrade, String suffix, Map<String, String> params) {
 
+        String buyerPayAmountStr = params.get("buyer_pay_amount");
+        if (buyerPayAmountStr != null && !buyerPayAmountStr.isEmpty()) {
+            BigDecimal buyerPayAmount = new BigDecimal(buyerPayAmountStr);
+            orderTrade.setPaymentAmount(buyerPayAmount.intValue());
+        }
+
         // 根据订单类型进行处理
         if (OrderTypeEnum.POINTS.getName().equals(suffix)) {
             pointsHandler(orderTrade, params);
@@ -507,11 +513,6 @@ public class OrderTradeServiceImpl extends ServiceImpl<OrderTradeMapper, OrderTr
             BigDecimal totalAmount = new BigDecimal(totalAmountStr);
             orderTrade.setTotalAmount(totalAmount.doubleValue());
         }
-        String buyerPayAmountStr = params.get("buyer_pay_amount");
-        if (buyerPayAmountStr != null && !buyerPayAmountStr.isEmpty()) {
-            BigDecimal buyerPayAmount = new BigDecimal(buyerPayAmountStr);
-            orderTrade.setPaymentAmount(buyerPayAmount.intValue());
-        }
         orderTrade.setUpdateTime(new Date());
         orderTradeService.updateById(orderTrade);
     }