From 21c37a5345ac59d6ace5e98ddcb0d62a70cfba58 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 17:14:30 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/lists/user/UserLists.php | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/app/admin/lists/user/UserLists.php b/app/admin/lists/user/UserLists.php
index 2ce801a64..7976c871f 100644
--- a/app/admin/lists/user/UserLists.php
+++ b/app/admin/lists/user/UserLists.php
@@ -11,6 +11,7 @@ use app\common\lists\ListsExcelInterface;
 use app\common\model\user\User;
 use app\common\model\user\UserAddress;
 use app\common\model\vip_flow\VipFlow;
+use support\Db;
 
 class UserLists extends BaseAdminDataLists implements ListsExcelInterface
 {
@@ -76,6 +77,30 @@ class UserLists extends BaseAdminDataLists implements ListsExcelInterface
             $item['return_money'] = VipFlow::
             where(['user_id'=>$item['id'],'status'=>0])
                 ->sum('number')??0;
+            $address = UserAddress::where('uid',$item['id'])->find();
+            $item['city'] = '';
+            $item['area'] = '';
+            $item['street'] = '';
+            $item['village'] = '';
+            $item['brigade'] = '';
+            if($address){
+                if($address['city']){
+                    $item['city'] = \think\facade\Db::name('geo_city')->where('city_code',$address['city'])->value('city_name')??'';
+                }
+                if($address['area']){
+                    $item['area'] = \think\facade\Db::name('geo_area')->where('area_code',$address['area'])->value('area_name')??'';
+                }
+                if($address['street']){
+                    $item['street'] = \think\facade\Db::name('geo_street')->where('street_code',$address['street'])->value('street_name')??'';
+                }
+                if($address['village']){
+                    $item['village'] = \think\facade\Db::name('geo_village')->where('village_code',$address['village'])->value('village_name')??'';
+                }
+                if($address['brigade']){
+                    $item['brigade'] = $address['brigade'] ? $address['brigade'].'队':'';
+                }
+            }
+            $item['format_address'] = $item['city'].'/'.$item['area'].'/'.$item['street'].'/'.$item['village'].'/'. $item['brigade'];
         }
 
         return $lists;

From d752188d79e9b0a385e1baee4ae4c40840805fa6 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 17:39:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=89=93=E5=BC=80=E5=86=BB=E7=BB=93?=
 =?UTF-8?q?=E6=AC=BE=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/order/OrderLogic.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index a50baf6c9..f67932394 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -99,14 +99,15 @@ class OrderLogic extends BaseLogic
                 $cart_select[$k]['purchase'] = bcmul($v['cart_num'], $find['purchase'], 2) ?? 0; //成本
                 $cart_select[$k]['pay_price'] = bcmul($v['cart_num'], $price, 2); //订单支付金额
                 $cart_select[$k]['store_price'] = bcmul($v['cart_num'], $find['cost'], 2)??0; //门店零售价
-                // $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
+                 $cart_select[$k]['vip_price'] = bcmul($v['cart_num'], $find['vip_price'], 2)??0; //vip售价
 
                 $cart_select[$k]['product_id'] = $find['product_id'];
                 $cart_select[$k]['old_cart_id'] = $v['id'];
                 $cart_select[$k]['cart_num'] = $v['cart_num'];
                 $cart_select[$k]['verify_code'] = $params['verify_code'] ?? '';
                 //vip1待返回金额
-                // $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
+                 $cart_select[$k]['vip_frozen_price'] = bcsub($cart_select[$k]['pay_price'],$cart_select[$k]['vip_price'],2);
+
 //                d($cart_select[$k]['pay_price'],$cart_select[$k]['store_price'],$cart_select[$k]['vip_price'] );
                 $cartInfo = $cart_select[$k];
                 $cartInfo['name'] = $find['store_name'];

From 5fdf3496f8634d517fee935637acc52893f31076 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 28 Jun 2024 18:02:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=A4=BC=E5=93=81?=
 =?UTF-8?q?=E5=88=B8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/user/UserLogic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php
index d841c9c09..c4db81bc5 100644
--- a/app/api/logic/user/UserLogic.php
+++ b/app/api/logic/user/UserLogic.php
@@ -305,10 +305,10 @@ class UserLogic extends BaseLogic
                 //礼品券明细
                 $query = UserSign::where(['uid'=>$uid]);
                 if($params['mark'] == 1){
-                    $query->where('financial_pm',0);
+                    $query->where('financial_pm',1);
                 }
                 if($params['mark'] == 2){
-                    $query->where('financial_pm',1);
+                    $query->where('financial_pm',0);
                 }
                 $count = $query->count();
                 $data =$query