From d8a42905c867a3aeddf222ecd8c7f95ef80f8724 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 14 Jan 2024 19:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=91=E6=8D=A2=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/user/Exchange.php | 20 ++++++++++++++++++++
 route/api.php                        |  1 +
 2 files changed, 21 insertions(+)

diff --git a/app/controller/api/user/Exchange.php b/app/controller/api/user/Exchange.php
index 901f3e8..afc3b84 100644
--- a/app/controller/api/user/Exchange.php
+++ b/app/controller/api/user/Exchange.php
@@ -9,6 +9,7 @@ use app\common\model\user\ExchangeQuota;
 use app\common\model\user\ExchangeQuotaRecord;
 use app\common\model\user\User;
 use app\common\repositories\user\ExchangePickupPointRepository;
+use app\common\repositories\user\ExchangePickupRecordRepository;
 use app\common\repositories\user\ExchangeQuotaRepository;
 use crmeb\basic\BaseController;
 use think\App;
@@ -109,6 +110,7 @@ class Exchange extends BaseController{
                 $userInfo = User::where('uid',$uid)->findOrEmpty();
                 $integralChangeFront                 = (float)$userInfo->exchange_integral;
                 $userInfo->exchange_integral   -= (float)$changeNum;
+                $userInfo->exchange_integral = $userInfo->exchange_integral > 0 ? $userInfo->exchange_integral : 0;
                 $userInfo->save();
                 ExchangeIntegralRecord::insert([
                     'uid'              => $uid,
@@ -129,6 +131,24 @@ class Exchange extends BaseController{
             return app('json')->fail($e->getMessage());
         }
     }
+    /**
+     * Common: 取货记录
+     * Author: wu-hui
+     * Time: 2024/01/14 18:44
+     * @return mixed
+     */
+    public function exchangeRecord(){
+        $params = $this->request->params(['staff_uid','address']);
+        $params['uid'] = $this->request->uid();
+        [$page, $limit] = $this->getPage();
+
+        $data = app()->make(ExchangePickupRecordRepository::class)->getList((array)$params,(int)$page,(int)$limit);
+
+        return app('json')->success($data);
+    }
+
+
+
 
 
 
diff --git a/route/api.php b/route/api.php
index 192e0b8..c044117 100644
--- a/route/api.php
+++ b/route/api.php
@@ -350,6 +350,7 @@ Route::group('api/', function () {
             Route::get('pointList', 'Exchange/getPointList');
             Route::get('userHold', 'Exchange/getUserHold');
             Route::get('exchangeHandle', 'Exchange/exchangeHandle');
+            Route::get('exchangeRecord', 'Exchange/exchangeRecord');
         })->prefix('api.user.');