挂售

app/admin/controller/auction/Auction.php

@@ -336,7 +336,8 @@ class Auction extends AuthController
             ['page', 1],
             ['limit', 20],
             ['store_name', ''],
-            ['auction_id']
+            ['auction_id'],
+            ['is_show']
         ]);
         $data = model::list($where, $id);
 

app/admin/model/auction/AuctionProduct.php

@@ -8,6 +8,7 @@
 
 namespace app\admin\model\auction;
 
+use app\models\auction\AuctionTime;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
@@ -46,6 +47,11 @@ class AuctionProduct extends BaseModel
 
             $model->where('a.id|a.name|u.nickname', 'like','%'.$where['store_name'].'%');
         }
+
+        if ( trim($where['is_show']) != ''){
+            $where['is_show'] = $where['is_show'] == 2? 0: 1;
+            $model->where('a.is_show', '=',$where['is_show']);
+        }
         if ($where['page'] && $where['limit']){
             $model->page($where['page'], $where['limit']);
         }else{
@@ -54,6 +60,20 @@ class AuctionProduct extends BaseModel
 
         $data['count'] = $model->count();
         $data['data'] = $model->select()->toArray();
+        foreach ($data['data'] as $k => $v)
+        {
+            if ($v['is_admin'] == 2){
+                $time = AuctionTime::where('product_id', $v['id'])->find();
+                if ($time){
+                    $data['data'][$k]['time'] = date('Y-m-d', $time['add_time']);
+                }else{
+                    $data['data'][$k]['time'] = '未上架';
+
+                }
+            }else{
+                $data['data'][$k]['time'] = date('Y-m-d', time());
+            }
+        }
         return $data;
 
     }

app/admin/view/auction/auction/product.php

@@ -40,6 +40,16 @@
                                     <input type="text" name="store_name" class="layui-input" placeholder="商品名称,编号">
                                 </div>
                             </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="top: -4.5px">是否上架</label>
+                                <div class="layui-input-block">
+                                    <select name="is_show">
+                                        <option value="">全部</option>
+                                        <option value="2">未上架</option>
+                                        <option value="1">已上架</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
@@ -112,6 +122,7 @@
             {field: 'rise', title: '涨幅%', templet: '#rise', align: 'center'},
             {field: 'deduct', title: '扣除%', templet: '#deduct', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
+            {field: 'time', title: '挂售时间', templet: '#time', align: 'center'},
             {field: 'create_time', title: '创建时间', templet: '#create_time', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];

app/admin/view/auction/auction_product/index.php

@@ -51,6 +51,16 @@
                                     <input type="text" name="store_name" class="layui-input" placeholder="商品名称,编号">
                                 </div>
                             </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="top: -4.5px">是否上架</label>
+                                <div class="layui-input-block">
+                                    <select name="is_show">
+                                        <option value="">全部</option>
+                                        <option value="2">未上架</option>
+                                        <option value="1">已上架</option>
+                                    </select>
+                                </div>
+                            </div>
                             <div class="layui-inline">
                                 <div class="layui-input-inline">
                                     <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit="search" lay-filter="search">
@@ -123,6 +133,7 @@
             {field: 'rise', title: '涨幅%', templet: '#rise', align: 'center'},
             {field: 'deduct', title: '扣除%', templet: '#deduct', align: 'center'},
             {field: 'sort', title: '排序', templet: '#sort', align: 'center'},
+            {field: 'time', title: '挂售时间', templet: '#time', align: 'center'},
             {field: 'create_time', title: '创建时间', templet: '#create_time', align: 'center'},
             {field: 'right', title: '操作', align: 'center', toolbar: '#act'},
         ];

app/api/controller/user/UserExtractController.php

@@ -8,6 +8,7 @@ use app\models\user\UserBill;
 use app\models\user\UserExtract;
 use app\Request;
 use crmeb\services\UtilService;
+use crmeb\services\CacheService;
 
 /**
  * 提现类
@@ -41,7 +42,7 @@ class UserExtractController
         if ($data['broken_commission'] < 0)
             $data['broken_commission'] = 0;
 //        return $data;
-        $data['brokerage_price'] = $user['brokerage_price'];
+        $data['brokerage_price'] = $user['now_money'];
         //可提现佣金
         $data['commissionCount'] = $data['brokerage_price'] - $data['broken_commission'];
         $extractBank = sys_config('user_extract_bank') ?? []; //提现银行
@@ -67,9 +68,9 @@ class UserExtractController
             ['cardnum', ''],
             ['weixin', ''],
         ], $request);
-        if (!preg_match('/^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
-        //提现设置最低金额
-        if($extractInfo['money'] < sys_config('user_extract_min_price')) return app('json')->fail('金额小于最低提现金额');
+        if (time() - CacheService::get('UserExtract_' . $request->uid(), time()) < 2) return app('json')->fail('请勿连续多次提交');
+        else CacheService::set('UserExtract_' . $request->uid(), time());
+        if (!preg_match('/^(([1-9]\d*)|0)(\.\d{1-2})?$/', $extractInfo['money'])) return app('json')->fail('提现金额输入有误');
         $user = $request->user();
         $broken_time = intval(sys_config('extract_time'));
         $search_time = time() - 86400 * $broken_time;
@@ -78,19 +79,21 @@ class UserExtractController
         $brokerage_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
             ->where('add_time', '>', $search_time)
             ->where('pm', 1)
+            ->where('status', 1)
             ->sum('number');
         //退款退的佣金 -
         $refund_commission = UserBill::where(['uid' => $user['uid'], 'category' => 'now_money', 'type' => 'brokerage'])
             ->where('add_time', '>', $search_time)
             ->where('pm', 0)
+            ->where('status', 1)
             ->sum('number');
         $data['broken_commission'] = bcsub($brokerage_commission, $refund_commission, 2);
         if ($data['broken_commission'] < 0)
             $data['broken_commission'] = 0;
-        $data['brokerage_price'] = $user['brokerage_price'];
+        $data['brokerage_price'] = $user['now_money'];
         //可提现佣金
         $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
-        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现佣金不足');
+        if ($extractInfo['money'] > $commissionCount) return app('json')->fail('可提现余额不足');
         if (!$extractInfo['cardnum'] == '')
             if (!preg_match('/^([1-9]{1})(\d{14}|\d{18})$/', $extractInfo['cardnum']))
                 return app('json')->fail('银行卡号输入有误');

app/models/user/UserExtract.php

@@ -60,11 +60,11 @@ class UserExtract extends BaseModel
         if(!in_array($data['extract_type'],self::$extractType))
             return self::setErrorInfo('提现方式不存在');
         $userInfo = User::get($userInfo['uid']);
-        $extractPrice = $userInfo['brokerage_price'];
-        if($extractPrice < 0) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] > $extractPrice) return self::setErrorInfo('提现佣金不足'.$data['money']);
-        if($data['money'] <= 0) return self::setErrorInfo('提现佣金大于0');
-        $balance = bcsub($userInfo['brokerage_price'],$data['money'],2);
+        $extractPrice = $userInfo['now_money'];
+        if($extractPrice < 0) return self::setErrorInfo('提现余额不足'.$data['money']);
+        if($data['money'] > $extractPrice) return self::setErrorInfo('提现余额不足'.$data['money']);
+        if($data['money'] <= 0) return self::setErrorInfo('提现余额大于0');
+        $balance = bcsub($userInfo['now_money'],$data['money'],2);
         if($balance < 0) $balance=0;
         $insertData = [
             'uid' => $userInfo['uid'],
@@ -98,7 +98,7 @@ class UserExtract extends BaseModel
         try{
             $res1 = self::create($insertData);
             if(!$res1) return self::setErrorInfo('提现失败');
-            $res2 = User::edit(['brokerage_price'=>$balance],$userInfo['uid'],'uid');
+            $res2 = User::edit(['now_money'=>$balance],$userInfo['uid'],'uid');
             $res3 = UserBill::expend('余额提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
             $res = $res2 && $res3;
             if($res){