From caab5cca6facfde0249b6279cf069f04bf2be388 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Wed, 8 Jan 2025 17:56:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E7=9A=84=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=95=B0=E9=87=8F=E5=92=8C=E9=80=80=E6=AC=BE=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 StoreOrderCartInfoTwoLists 类中添加了 refund_num 和 refund_amount 字段
- 更新了查询条件，使其包含这两个新字段
- 在输出数据中增加了退款数量和退款金额的相关信息
---
 .../store_order_cart_info/StoreOrderCartInfoTwoLists.php  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
index e17ba9e03..c6e8de399 100644
--- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
+++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoTwoLists.php
@@ -70,9 +70,9 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
         $this->searchWhere[] = ['status', '>=', 0];
         $query = StoreOrderCartInfo::where($this->searchWhere);
         if ($is_group == 1) {
-            $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num')->group(['store_id', 'product_id']);
+            $query->field('store_id,product_id,price,SUM(total_price) as total_price,SUM(cart_num) as cart_num,SUM(refund_num) as refund_num,SUM(refund_amount) as refund_amount')->group(['store_id', 'product_id']);
         } else {
-            $query->field('store_id,product_id,price,total_price,cart_num,create_time,uid,oid');
+            $query->field('store_id,product_id,price,total_price,cart_num,create_time,uid,oid,refund_num,refund_amount');
         }
         return $query->limit($this->limitOffset, $this->limitLength)
             ->select()->each(function ($item) use($is_group,$export){
@@ -167,6 +167,8 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
                 'cart_num' => '数量',
                 'price' => '单价',
                 'total_price' => '总价',
+                'refund_num' => '退款数量',
+                'refund_amount' => '退款金额',
             ];
         } else {
             $data = [
@@ -180,6 +182,8 @@ class StoreOrderCartInfoTwoLists extends BaseAdminDataLists implements ListsSear
                 'cart_num' => '数量',
                 'price' => '单价',
                 'total_price' => '总价',
+                'refund_num' => '退款数量',
+                'refund_amount' => '退款金额',
                 'nickname' => '用户',
                 'mobile' => '手机',
                 'create_time' => '时间',