feat: 修改了IndexController和UserController，增加了积分和签到功能；修改了OrderLogic和UserLogic，增加了积分更新逻辑；更新了PayNotifyLogic，调整了积分增加方式。

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

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);
 
     }

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) {

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 = [];
         }

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();
         }