From 702a4f06bc5afec1df665bb8f4c708560b8792d1 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 24 Jun 2024 16:30:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=BA=86IndexControl?= =?UTF-8?q?ler=E5=92=8CUserController=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=92=8C=E7=AD=BE=E5=88=B0=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E4=BA=86OrderLogic=E5=92=8CUserLogi?= =?UTF-8?q?c=EF=BC=8C=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=9B=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BA=86PayNotifyLogic=EF=BC=8C=E8=B0=83=E6=95=B4=E4=BA=86?= =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=A2=9E=E5=8A=A0=E6=96=B9=E5=BC=8F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/IndexController.php | 13 +------------ app/api/controller/user/UserController.php | 8 ++++++++ app/api/logic/order/OrderLogic.php | 7 +++++++ app/api/logic/user/UserLogic.php | 2 ++ app/common/logic/PayNotifyLogic.php | 3 ++- 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index 5c87916b4..415e8f76c 100644 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -28,18 +28,7 @@ class IndexController extends BaseApiController public function index() { - $order = [ - 'out_trade_no' => 'CZ1719197818549414', - ]; - $app = new PayService(0); - - try { - $res = $app->wechat->query($order); - } catch (\Exception $e) { - return $this->fail($e->extra['message']); - } - d($res); - +d(2); diff --git a/app/api/controller/user/UserController.php b/app/api/controller/user/UserController.php index cf2696601..457598205 100644 --- a/app/api/controller/user/UserController.php +++ b/app/api/controller/user/UserController.php @@ -7,6 +7,8 @@ use app\api\logic\user\UserLogic; use app\api\validate\UserValidate; use app\common\enum\PayEnum; use app\common\logic\PaymentLogic; +use app\common\model\user\User; +use app\common\model\user_sign\UserSign; use support\Cache; use think\Exception; @@ -207,8 +209,14 @@ class UserController extends BaseApiController $params['page_no'] = $page_no > 0 ? $page_no : 1; $params['page_size'] = $page_size > 0 ? $page_size : 15; $res = UserLogic::dealDetails($params,$this->userId); + $integral = User::where('id',$this->userId)->value('integral'); + $number = UserSign::where('id',$this->userId)->where('status',0)->sum('number'); $res['page_no'] = $params['page_no']; $res['page_size'] = $params['page_size']; + $res['extend'] = [ + 'integral'=>$integral, + 'number'=>$number + ]; return $this->success('ok', $res); } diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php index 398f97321..2ee47e26c 100644 --- a/app/api/logic/order/OrderLogic.php +++ b/app/api/logic/order/OrderLogic.php @@ -24,6 +24,7 @@ use app\common\model\system_store\SystemStoreStaff; use app\common\model\user\User; use app\common\model\user\UserAddress; use app\common\model\user\UserShip; +use app\common\model\user_sign\UserSign; use app\common\model\user_spread_log\UserSpreadLog; use Picqer\Barcode\BarcodeGeneratorJPG; use Picqer\Barcode\BarcodeGeneratorPNG; @@ -442,6 +443,12 @@ class OrderLogic extends BaseLogic $order=StoreOrder::where('id',$data['id'])->find(); PayNotifyLogic::afterPay($order); PayNotifyLogic::descStock($order['id']); + if($order['uid']){ + $user_number = bcmul($order['pay_price'], '0.10', 2); + User::where('id', $order['uid'])->inc('integral', $user_number)->update(); + UserSign::where(['uid' => $order['uid'],'order_id' => $order['order_id']])->update(['status'=>1]); + } + Db::commit(); return true; } catch (\Exception $e) { diff --git a/app/api/logic/user/UserLogic.php b/app/api/logic/user/UserLogic.php index 90428f7e8..06475e6e8 100644 --- a/app/api/logic/user/UserLogic.php +++ b/app/api/logic/user/UserLogic.php @@ -105,6 +105,8 @@ class UserLogic extends BaseLogic 'is_writeoff'=>0,'uid'=>$uid ])->whereIn('shipping_type',[1,2])->count(); $data['openid'] = UserAuth::where(['user_id'=>$uid,'terminal'=>1])->value('openid'); + $number=UserSign::where('uid',$uid)->where('status',0)->sum('number'); + $data['integral']=bcadd($data['integral'],$number,2); }else{ $data = []; } diff --git a/app/common/logic/PayNotifyLogic.php b/app/common/logic/PayNotifyLogic.php index bde01d353..0f08b7da8 100644 --- a/app/common/logic/PayNotifyLogic.php +++ b/app/common/logic/PayNotifyLogic.php @@ -483,9 +483,10 @@ class PayNotifyLogic extends BaseLogic 'title' => '购买商品获得兑换券', 'store_id' => $order['store_id'], 'number' => $user_number, + 'status' => 0, ]; $user_sing->save($sing); - User::where('id', $order['uid'])->inc('integral', $user_number)->update(); + // User::where('id', $order['uid'])->inc('integral', $user_number)->update(); }