From c74a6f59490cfb9a0ee37f70427739b74e7fbd58 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 20 五月 2026 08:50:29 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/OrdersRefundServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/OrdersRefundServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/OrdersRefundServiceImpl.java
index 0c6b615..93ab7d4 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/OrdersRefundServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/OrdersRefundServiceImpl.java
@@ -149,9 +149,9 @@
                 .select("o.type as orderType")
                 .select("o.good_level as goodLevel")
                 .select("o.total_amount as totalAmount")
-                .select("o.pay_amount as payAmount")
+                .select("(o.pay_amount + ifnull(o.OVERDUE_AMOUNT,0)) as payAmount")
                 .select("c2.name as goodLevelName")
-                .leftJoin("orders o on o.id = t.ORDER_ID and o.DELETED = 0")
+                .innerJoin("orders o on o.id = t.ORDER_ID ")
                 .leftJoin("category c1 on c1.id = o.GOOD_TYPE and c1.DELETED = 0")
                 .leftJoin("category c2 on c2.id = c1.RELATION_ID and c2.DELETED = 0 and c2.TYPE = 3")
                 .eq(OrdersRefund::getDeleted, 0);
@@ -173,7 +173,7 @@
                 wrapper.ge(OrdersRefund::getCreateTime, model.getCreateStartTime());
             }
             if (model.getCreateEndTime() != null) {
-                wrapper.le(OrdersRefund::getCreateTime, model.getCreateEndTime());
+                wrapper.le(OrdersRefund::getCreateTime, Utils.Date.getEnd(model.getCreateEndTime()));
             }
         }
 

--
Gitblit v1.9.3