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.');