commit

app/admin/controller/user/User.php

@@ -118,8 +118,8 @@ class User extends AuthController
         $f = array();
         $f[] = Form::radio('money_status', '修改余额', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
         $f[] = Form::number('money', '余额')->min(0);
-        $f[] = Form::radio('integration_status', '修改积分', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
-        $f[] = Form::number('integration', '积分')->min(0);
+        $f[] = Form::radio('integration_status', '修改阳光', 1)->options([['value' => 1, 'label' => '增加'], ['value' => 2, 'label' => '减少']]);
+        $f[] = Form::number('integration', '阳光')->min(0);
         $form = Form::make_post_form('修改其他', $f, Url::buildUrl('update_other', array('uid' => $uid)));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -166,7 +166,7 @@ class User extends AuthController
         if ($data['integration_status'] && $data['integration']) {//积分增加或者减少
             if ($data['integration_status'] == 1) {//增加
                 $edit['integral'] = bcadd($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '积分');
+                $res2 = UserBillAdmin::income('系统增加阳光', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '阳光');
                 try {
                     UserRepository::adminAddIntegral($user, $data['integration']);
                 } catch (\Exception $e) {
@@ -175,7 +175,7 @@ class User extends AuthController
                 }
             } else if ($data['integration_status'] == 2) {//减少
                 $edit['integral'] = bcsub($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::expend('系统减少积分', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '积分');
+                $res2 = UserBillAdmin::expend('系统减少阳光', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '阳光');
                 try {
                     UserRepository::adminSubIntegral($user, $data['integration']);
                 } catch (\Exception $e) {
@@ -397,7 +397,7 @@ class User extends AuthController
         if ($data['integration_status'] && $data['integration']) {//积分增加或者减少
             if ($data['integration_status'] == 1) {//增加
                 $edit['integral'] = bcadd($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::income('系统增加积分', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '积分');
+                $res2 = UserBillAdmin::income('系统增加阳光', $user['uid'], 'integral', 'system_add', $data['integration'], $this->adminId, $edit['integral'], '系统增加了' . floatval($data['integration']) . '阳光');
                 try {
                     UserRepository::adminAddIntegral($user, $data['integration']);
                 } catch (\Exception $e) {
@@ -406,7 +406,7 @@ class User extends AuthController
                 }
             } else if ($data['integration_status'] == 2) {//减少
                 $edit['integral'] = bcsub($user['integral'], $data['integration'], 2);
-                $res2 = UserBillAdmin::expend('系统减少积分', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '积分');
+                $res2 = UserBillAdmin::expend('系统减少阳光', $user['uid'], 'integral', 'system_sub', $data['integration'], $this->adminId, $edit['integral'], '系统扣除了' . floatval($data['integration']) . '阳光');
                 try {
                     UserRepository::adminSubIntegral($user, $data['integration']);
                 } catch (\Exception $e) {
@@ -419,8 +419,8 @@ class User extends AuthController
         }
         $res_sp = true;
         if ($data['spread_uid'] != $user['spread_uid']) {
-            $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid);
-//            $edit['spread_uid'] = $data['spread_uid'];
+//            $res_sp = \app\models\user\User::setSpread($data['spread_uid'], $uid);
+            $edit['spread_uid'] = $data['spread_uid'];
         }
         $edit['status'] = $data['status'];
         $edit['real_name'] = $data['real_name'];

app/admin/view/user/user/index.php

@@ -329,12 +329,12 @@
             {field: 'now_money', title: '余额',sort:true,event:'now_money',align:'center'},
             {field: 'pay_count', title: '购买次数',align:'center'},
             {field: 'extract_count_price', title: '累计提现',align:'center'},
-            {field: 'integral', title: '商城积分',sort:true,event:'integral',align:'center'},
+            {field: 'integral', title: '阳光',sort:true,event:'integral',align:'center'},
             {field: 'white_integral', title: '肥料',sort:true,event:'white_integral',align:'center'},
-            {field: 'purple_integral', title: '阳光积分',sort:true,event:'purple_integral',align:'center'},
-            {field: 'green_integral', title: '水滴',sort:true,event:'green_integral',align:'center'},
-            {field: 'business_integral', title: '商家积分',sort:true,event:'business_integral',align:'center'},
-            {field: 'paper_ticket', title: '文票',sort:true,event:'paper_ticket',align:'center'},
+            // {field: 'purple_integral', title: '阳光积分',sort:true,event:'purple_integral',align:'center'},
+            // {field: 'green_integral', title: '水滴',sort:true,event:'green_integral',align:'center'},
+            // {field: 'business_integral', title: '商家积分',sort:true,event:'business_integral',align:'center'},
+            // {field: 'paper_ticket', title: '文票',sort:true,event:'paper_ticket',align:'center'},
             {field: 'spread_uid_nickname', title: '推荐人',align:'center'},
             {field: 'sex', title: '性别',width:'4%',align:'center'},
             {field: 'data_time', title: '访问日期',align:'center',width:'12%',templet:'#data_time'},

app/api/controller/many/ManyController.php

@@ -3,6 +3,7 @@
 namespace app\api\controller\many;
 
 
+use app\models\many\AuctionPay;
 use app\models\many\Many;
 use app\models\many\ManyDiscipline;
 use app\models\many\ManyGreen;
@@ -17,6 +18,7 @@ use crmeb\services\SystemConfigService;
 use crmeb\services\UtilService;
 use crmeb\services\upload\Upload;
 use think\facade\Db;
+use think\facade\Validate;
 
 /**
  * 账单类
@@ -152,6 +154,120 @@ class ManyController
         }
     }
 
+    /**
+     * 添加收款方式
+     * @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 AuctionPay();
+        $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('开户行不能为空');
+                $pay['payment'] = $data['payment'];
+                $pay['bank'] = $data['bank'];
+                $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('姓名不能为空');
+                if (!$data['phone'])  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('开户行不能为空');
+            }
+            $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 AuctionPay();
+        $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/many/AuctionPay.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace app\models\many;
+
+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 AuctionPay extends BaseModel
+{
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'auction_pay';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+}

app/register/view/index/index.html

@@ -11,7 +11,7 @@
 </head>
 <body>
 <div class="container">
-    <div class="loginTitle">欢迎注册微乐购</div>
+    <div class="loginTitle">欢迎注册微乐种</div>
     <div class="loginText">请认真填写个人信息</div>
     <div class="login-box">
         <div class="username">账号</div>

route/api/route.php

@@ -191,6 +191,8 @@ Route::group(function () {
     Route::post('enter/apply', 'user.UserEnterController/apply')->name('apply');//商户申请
 
     Route::post('dow_user', 'user.UserController/dow_user')->name('dow_user');// 转账
+    Route::post('auction/pay', 'many.ManyController/pay')->name('pay');// 添加收款方式
+    Route::get('auction/pay_list', 'many.ManyController/pay_list')->name('pay_list');// 用户收款方式
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {