From 698e4c14e67437e004ff83f89b72cb270a7a6139 Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Tue, 22 Apr 2025 15:14:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E6=94=AF=E4=BB=98=E5=9B=9E?=
 =?UTF-8?q?=E8=B0=83=E5=87=BD=E6=95=B0=E7=8E=B0=E4=BC=9A=E5=B0=86=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=AA=E8=B5=84=E6=BA=90=E4=BD=8D=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=86=99=E5=85=A5order=5Finfo=E4=B8=AD,=20sy?=
 =?UTF-8?q?s=5Forder=E4=B8=AD=E4=BF=9D=E5=AD=98=E6=80=BB=E7=9A=84=E4=BB=B7?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/web/controller/app/AppSystemController.java |  4 ++--
 .../web/controller/app/pay/PayBackController.java     | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
index 68e1c77c..b553da22 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/AppSystemController.java
@@ -1138,8 +1138,8 @@ public class AppSystemController extends BaseController {
                 if(days==day.doubleValue()){
                     System.out.println("就是这个天: "+ day);
                     flag = false;
-                    // 加上价格
-                    tPrice += map.get("price");
+                    // 每个订单单价
+                    tPrice = map.get("price");
                     // 结束时间
                     endTime = startTime.plusDays(days.intValue());
                     // 新的结束时间
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java
index 4018a681..4342ec66 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/app/pay/PayBackController.java
@@ -86,7 +86,13 @@ public class PayBackController {
         sysOrder.setStatus("0");
         sysOrder.setCreateTime(DateUtils.getNowDate());
         sysOrder.setUserId(list.get(0).getUserId());
-        sysOrder.setMoney(list.get(list.size()-1).getMoney());
+
+        // 总价=各单价相加.
+        Long tMoney = 0L;
+        for(OrderCacheVo orderCacheVo : list){
+            tMoney += orderCacheVo.getMoney();
+        }
+        sysOrder.setMoney(tMoney);
         sysOrder.setStartTime(list.get(0).getStartTime());
         sysOrder.setEndTime(list.get(0).getEndTime());
         sysOrder.setSourceId(list.get(0).getSourceId());
@@ -124,8 +130,9 @@ public class PayBackController {
             orderInfo.setOrderInfoId(mchOrderNo);
             orderInfo.setSourceId(orderCacheVo.getSourceId());
             orderInfo.setWorkId(orderCacheVo.getWorkId());
+            orderInfo.setMoney(orderCacheVo.getMoney());
 
-            System.out.println("订单价格: "+orderCacheVo.getMoney());
+            System.out.println("单个订单价格: "+orderCacheVo.getMoney());
 
             // 订单初始状态 0, 下订单还未展示
             orderInfo.setStatus("0");