commit

app/api/controller/store/CategoryController.php

@@ -9,7 +9,7 @@ class CategoryController
 {
     public function category(Request $request)
     {
-        $cateogry = StoreCategory::with('children')->where('is_show', 1)->order('sort desc,id desc')->where('pid', 0)->select();
+        $cateogry = StoreCategory::with('children')->where('is_show', 1)->where('id', '>', 4)->order('sort desc,id desc')->where('pid', 0)->select();
         return app('json')->success($cateogry->hidden(['add_time', 'is_show', 'sort', 'children.sort', 'children.add_time', 'children.pid', 'children.is_show'])->toArray());
     }
 }

app/api/controller/user/UserController.php

@@ -62,6 +62,9 @@ class UserController
         $info['commissionCount'] = bcsub($info['brokerage_price'], $info['broken_commission'], 2);
         if ($info['commissionCount'] < 0)
             $info['commissionCount'] = 0;
+        $info['profit'] = UserSingleAward::where('uid', $info['uid'])->sum('money');
+        $info['grant'] = UserSingleAward::where('uid', $info['uid'])->sum('grant');
+        UserLevel::setLevelComplete($request->uid());
         return app('json')->success($info);
     }
 
@@ -753,4 +756,124 @@ class UserController
             return app('json')->fail('转账失败');
         }
     }
+
+
+    /**
+     * 添加收款方式
+     * @param Request $request
+     * @return void
+     */
+    public function pay(Request $request)
+    {
+        $data = UtilService::postMore([
+            ['payment'],
+            ['image'],
+            ['bank'],
+            ['name'],
+            ['type'],
+            ['phone'],
+            ['bank_name']
+        ], $request);
+        if (!$data['type'])  return app('json')->fail('数据传入错误');
+        $data['uid'] =$request->uid();
+        $model = new UserPay();
+        $pay = $model->where([['uid', '=', $request->uid()], ['type', '=', $data['type']]])->find();
+        $res = Validate::rule([
+            'phone' => 'mobile'
+        ]);
+        $res->message([
+            'phone.mobile' => '请填写正确手机格式'
+        ]);
+        if (!$res->check($data)){
+            return app('json')->fail($res->getError());
+        }
+        if (!empty($pay)){
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['image'] = $data['image'];
+                $pay['name'] = $data['name'];
+                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['name'] = $data['name'];
+//                $pay['phone'] = $data['phone'];
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+//                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+                $pay['payment'] = $data['payment'];
+                $pay['bank'] = $data['bank'];
+//                $pay['bank_name'] = $data['bank_name'];
+                $pay['phone'] = $data['phone'];
+                $pay['name'] = $data['name'];
+
+            }
+            $res = $pay->save();
+            if ($res) return app('json')->successful('修改成功');
+            return app('json')->fail('修改失败');
+        }else{
+            if ($data['type'] == 1 ){
+                // 微信收款方式
+                if (!$data['payment'])  return app('json')->fail('微信账号不能为空');
+                if (!$data['image'])  return app('json')->fail('二维码不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+
+            }elseif ($data['type'] == 2){
+                // 支付宝收款方式
+                if (!$data['payment'])  return app('json')->fail('支付宝账号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+
+            }elseif ($data['type'] == 3){
+                // 银行卡收款方式
+                if (!$data['payment'])  return app('json')->fail('银行卡号不能为空');
+                if (!$data['name'])  return app('json')->fail('姓名不能为空');
+                if (!$data['bank'])  return app('json')->fail('开户行不能为空');
+//                if (!$data['bank_name'])  return app('json')->fail('开户支行不能为空');
+                if (!$data['phone'])  return app('json')->fail('请填写手机号');
+            }
+            $res = $model->save($data);
+            if ($res) return app('json')->successful('添加成功');
+            return app('json')->fail('添加失败');
+        }
+    }
+
+    /**
+     * 收款方式详情
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function pay_list(Request $request)
+    {
+        $model = new UserPay();
+        $list = $model->where('uid', $request->uid())->select();
+
+        $list = empty($list)? []: $list->toArray();
+        $data['wx'] = [];
+        $data['zfb'] = [];
+        $data['bank'] = [];
+        foreach ($list as $k => $v){
+            if ($v['type'] == 1){
+                $data['wx'] = $v;
+            }elseif ($v['type'] == 2){
+                $data['zfb'] = $v;
+            }elseif ($v['type'] == 3){
+                $data['bank'] = $v;
+            }
+        }
+        return app('json')->successful($data);
+    }
 }

app/models/store/StoreOrder.php

@@ -824,7 +824,7 @@ class StoreOrder extends BaseModel
                     UserBill::income('佣金', $spread['uid'], 'now_money', 'brokerage', $bdjl, '', $spread['brokerage_price']+$bdjl, '分享佣金奖励');
                     User::where('uid', $spread['uid'])->inc('brokerage_price', $bdjl)->update();
                 }
-                User::where('uid', $spread['uid'])->inc('stock_right', 1)->update();
+                User::where('uid', $spread['uid'])->inc('stock_right', 2)->update();
             }
         }
     }
@@ -840,6 +840,8 @@ class StoreOrder extends BaseModel
 
         $count = StoreOrder::where('uid', $order['uid'])->count();
         if ($count > 1){
+            User::where('uid', $order['uid'])->inc('stock_right', 2)->update();
+        }else{
             User::where('uid', $order['uid'])->inc('stock_right', 1)->update();
         }
 

app/models/user/UserPay.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\models\user;
+
+use app\models\store\StoreProduct;
+use crmeb\services\SystemConfigService;
+use think\facade\Db;
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+
+/**
+ * TODO 场馆model
+ * Class Article
+ * @package app\models\article
+ */
+class UserPay extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_pay';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+}

route/api/route.php

@@ -166,6 +166,9 @@ Route::group(function () {
     Route::get('order/nopay', 'order.StoreOrderController/get_noPay')->name('getNoPay');//获取未支付订单
 
     Route::post('user/transfer_account', 'user.UserController/transfer_account')->name('transfer_account');//转账佣金
+
+    Route::post('auction/pay', 'user.UserController/pay')->name('pay');// 添加收款方式
+    Route::get('auction/pay_list', 'user.UserController/pay_list')->name('pay_list');// 用户收款方式
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {