commit

app/admin/model/user/UserEnter.php

@@ -37,9 +37,17 @@ class UserEnter extends BaseModel
     {
         $model = self::alias('a')
             ->field('a.*,u.nickname')
+            ->order('a.id DESC')
             ->leftJoin('user u', 'u.uid = a.uid');
 
-        if ($where['status'])$model->where('a.status' , '=', $where['status']);
+
+        if ($where['status'] == -1){
+            $model->where('a.status' , '=', -1);
+        }elseif ($where['status'] == 2){
+            $model->where('a.status' , '=', 0);
+        }elseif ($where['status'] == 1){
+            $model->where('a.status' , '=', 1);
+        }
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);

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

@@ -214,7 +214,7 @@
                 ],
                 statusList:[
                     {name: '全部', value: ''},
-                    {name: '待审核', value: '0'},
+                    {name: '待审核', value: '2'},
                     {name: '审核通过', value: '1'},
                     {name: '审核未通过', value: '-1'}
                 ],

app/api/controller/user/UserEnterController.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace app\api\controller\user;
+
+
+use app\models\user\UserEnter;
+use app\Request;
+use crmeb\services\GroupDataService;
+use crmeb\services\QrcodeService;
+use crmeb\services\SystemConfigService;
+use crmeb\services\UtilService;
+use crmeb\services\upload\Upload;
+use think\facade\Db;
+use think\facade\Validate;
+
+/**
+ * 商户表
+ * Class UserBillController
+ * @package app\api\controller\user
+ */
+class UserEnterController
+{
+    /**
+     * 申请商户记录
+     * @param Request $request
+     * @return mixed
+     */
+    public function list(Request $request)
+    {
+        $where = UtilService::getMore([
+            ['page', 1],
+            ['limit', 10],
+        ]);
+        $where['uid'] = $request->uid();
+        $list = UserEnter::list($where);
+        return app('json')->success($list);
+    }
+
+
+    public function apply(Request $request)
+    {
+        if ($request->user()['is_merchant'] == 1)  return app('json')->fail('已是商户');
+        $data = UtilService::postMore([
+            ['province', ''],
+            ['city', ''],
+            ['district', ''],
+            ['address', ''],
+            ['merchant_name', ''],
+            ['link_user', ''],
+            ['link_tel', ''],
+            ['charter', ''],
+        ]);
+
+        $validate = Validate::rule(['province' => 'require', 'city' => 'require', 'district' => 'require', 'address' => 'require', 'merchant_name' => 'require', 'link_user' => 'require', 'link_tel' => 'require', 'charter' => 'require',]);
+        $validate->message([
+            'province.require' => '请填写所在省',
+            'city.require' => '请填写所在市',
+            'district.require' => '请填写所在区',
+            'address.require' => '请填写详细地址',
+            'merchant_name.require' => '请填写商户名称',
+            'link_user.require' => '请填写商户姓名',
+            'link_tel.require' => '请填写商户电话',
+            'charter.require' => '请填写商户证书',
+        ]);
+        $data['uid'] = $request->uid();
+        if (!$validate->check($data)) return app('json')->fail($validate->getError());
+        $res = UserEnter::create($data);
+        if ($res) return app('json')->success('提交成功');
+        return app('json')->fail('提交失败');
+
+    }
+}

app/models/many/ManyGreen.php

@@ -35,7 +35,7 @@ class ManyGreen extends BaseModel
 
     public static function list($where)
     {
-        $model = self::order('status ASC');
+        $model = self::order('status ASC')->where('uid', $where['uid']);
 
         $data['count'] = $model->count();
         if ($where['page'] && $where['limit']){

app/models/many/ManyOrder.php

@@ -72,7 +72,7 @@ class ManyOrder extends BaseModel
         if ($order){
             foreach ($order as $item)
             {
-                if (strtotime($item['create_time'])+(86400*7) < time()){
+                if (strtotime($item['create_time'])+600 < time()){
                     $user = User::where('uid', $item['uid'])->find();//用户
                     $user1 = [];
                     $user2 = [];
@@ -86,15 +86,15 @@ class ManyOrder extends BaseModel
                     $user['business_integral'] += $business_integral;
                     if ($user1){
                         // 直推收益的百分之十
-                        $sy1 = $item['price'] * 0.1;
-                        $user1['purple_integral'] += $sy1 * 0.7;
-                        $user1['business_integral'] += $sy1 * 0.3;
+                        $sy1 = $item['price'] * 0.01;
+                        $user1['purple_integral'] += round($sy1 * 0.7, 2);
+                        $user1['business_integral'] += round($sy1 * 0.3, 2);
                     }
                     if ($user2){
                         // 间推收益的百分之五
-                        $sy2 = $item['price'] * 0.05;
-                        $user2['purple_integral'] += $sy2 * 0.7;
-                        $user2['business_integral'] += $sy2 * 0.3;
+                        $sy2 = $item['price'] * 0.005;
+                        $user2['purple_integral'] += round($sy2 * 0.7, 2);
+                        $user2['business_integral'] += round($sy2 * 0.3, 2);
                     }
                     self::where('id', $item['id'])->update(['status' => 1]);
                     $user->save();

app/models/user/UserEnter.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * @author: xaboy<365615158@qq.com>
+ * @day: 2017/11/11
+ */
+
+namespace app\models\user;
+
+use app\models\user\User;
+use app\models\user\UserBill;
+use crmeb\traits\ModelTrait;
+use crmeb\basic\BaseModel;
+
+/**
+ * Class StoreCategory
+ * @package app\admin\model\store
+ */
+class UserEnter extends BaseModel
+{
+
+    /**
+     * 数据表主键
+     * @var string
+     */
+    protected $pk = 'id';
+
+    /**
+     * 模型名称
+     * @var string
+     */
+    protected $name = 'user_enter';
+
+    use ModelTrait;
+    protected $autoWriteTimestamp = true;
+
+
+
+    public static function list($where)
+    {
+        $model = self::field('*')->order('id DESC')->where('uid', $where['uid']);
+        $data['count'] = $model->count();
+        if ($where['page'] && $where['limit']){
+            $model->page($where['page'], $where['limit']);
+        }else{
+            $model->page(20, 1);
+        }
+        $list = $model->select()->toArray();
+        $data['data'] = $list;
+        return $data;
+
+    }
+}

route/api/route.php

@@ -173,6 +173,9 @@ Route::group(function () {
     Route::get('green/list', 'many.ManyGreenController/list')->name('green');//绿卡记录
     Route::post('green/exchange', 'many.ManyGreenController/exchange')->name('exchange');//绿卡兑换
     Route::post('green/give', 'many.ManyGreenController/give')->name('give');//绿卡赠送
+    //申请商户记录
+    Route::get('enter/list', 'user.UserEnterController/list')->name('enterList');//商户申请记录
+    Route::post('enter/apply', 'user.UserEnterController/apply')->name('apply');//商户申请
 })->middleware(\app\http\middleware\AllowOriginMiddleware::class)->middleware(\app\http\middleware\AuthTokenMiddleware::class, true);
 //未授权接口
 Route::group(function () {