commit

.env

@@ -0,0 +1 @@
+APP_DEBUG = true

[APP]
DEFAULT_TIMEZONE = Asia/Shanghai

[DATABASE]
TYPE = mysql
HOSTNAME = 127.0.0.1
DATABASE = hz
USERNAME = root
PASSWORD = root
HOSTPORT = 3306
CHARSET = utf8
DEBUG = true

[LANG]
default_lang = zh-cn

app/admin/controller/system/SystemStore.php

@@ -33,7 +33,7 @@ class SystemStore extends AuthController
             ['excel', 0],
             ['type', $this->request->param('type')]
         ]);
-        return JsonService::successlayui(SystemStoreModel::getStoreList($where));
+        return JsonService::successlayui(SystemStoreModel::getStoreList($where, $this->adminInfo));
     }
 
     /**
@@ -72,6 +72,7 @@ class SystemStore extends AuthController
     public function delete($id)
     {
         if (!$id) return $this->failed('数据不存在');
+        if ($this->adminInfo['roles'] == 2) return $this->failed('没有权限删除');
         if (!SystemStoreModel::be(['id' => $id])) return $this->failed('产品数据不存在');
         if (SystemStoreModel::be(['id' => $id, 'is_del' => 1])) {
             $data['is_del'] = 0;

app/admin/model/system/SystemStore.php

@@ -78,7 +78,7 @@ class SystemStore extends BaseModel
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public static function getStoreList($where)
+    public static function getStoreList($where, $admin)
     {
         $model = new self();
         if (isset($where['name']) && $where['name'] != '') {
@@ -87,6 +87,7 @@ class SystemStore extends BaseModel
         if (isset($where['type']) && $where['type'] != '' && ($data = self::setData($where['type']))) {
             $model = $model->where($data);
         }
+        if ($admin['roles'] == 2) $model = $model->where('id', $admin['mer_id']);
         $count = $model->count();
         $data = $model->page((int)$where['page'], (int)$where['limit'])->select();
         if ($where['excel'] == 1) {

app/admin/model/user/UserExtract.php

@@ -90,7 +90,11 @@ class UserExtract extends BaseModel
         $uid = $data['uid'];
         $status = -1;
         $User = User::where('uid', $uid)->find()->toArray();
-        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['now_money'], $extract_number, 2), $mark);
+        $brokerage = round($extract_number * 0.1, 2);
+        $User['now_money'] += $brokerage;// 收取手续费
+
+        UserBill::income('退还手续费', $uid, 'now_money', 'extract_money', $brokerage, 0, $User['now_money'], '提现失败,退还手续费');
+        UserBill::income('提现失败', $uid, 'now_money', 'extract', $extract_number, $id, bcadd($User['brokerage_price'], $extract_number, 2), $mark);
         User::bcInc($uid, 'brokerage_price', $extract_number, 'uid');
         $extract_type = '未知方式';
         switch ($data['extract_type']) {

app/admin/view/index/index.php

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
     <meta http-equiv="Cache-Control" content="no-siteapp" />
-    <title>CRMEB管理系统</title>
+    <title>黄金稻子管理系统</title>
     <!--[if lt IE 9]>
     <meta http-equiv="refresh" content="0;ie.html" />
     <![endif]-->
@@ -29,7 +29,7 @@
                 <li class="nav-header">
                     <div class="dropdown profile-element admin_open">
                         <span>
-                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>
+<!--                            <img alt="image" class="imgbox" src="{$site_logo}" onerror="javascript:this.src='{__ADMIN_PATH}images/admin_logo.png';"/>-->
                         </span>
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
                             <span class="clear" style="margin-top: 20px;">

app/api/controller/user/UserBillController.php

@@ -358,4 +358,22 @@ class UserBillController
         return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status]));
 
     }
+
+
+    /**
+     * 抵扣券记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function voucher_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'voucher', ['pm' => $status]));
+
+    }
 }

app/api/controller/user/UserExtractController.php

@@ -4,6 +4,7 @@ namespace app\api\controller\user;
 
 use app\admin\model\system\SystemConfig;
 use app\models\store\StoreOrder;
+use app\models\user\User;
 use app\models\user\UserBill;
 use app\models\user\UserExtract;
 use app\Request;
@@ -93,13 +94,21 @@ class UserExtractController
         $data['brokerage_price'] = $user['brokerage_price'];
         //可提现佣金
         $commissionCount = $data['brokerage_price'] - $data['broken_commission'];
+        $brokerage = round($extractInfo['money'] * 0.1, 2);
+        if ($user['now_money'] < $brokerage) return app('json')->fail('手续费不足，请保持账户余额拥有提现的百分之十手续费');
+        $user['now_money'] -= $brokerage;// 收取手续费
+        
         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('银行卡号输入有误');
-        if (UserExtract::userExtract($request->user(), $extractInfo))
+        if (UserExtract::userExtract($request->user(), $extractInfo)){
+            User::where('uid', $user['uid'])->update(['now_money' => $user['now_money']]);
+            UserBill::expend('收取手续费', $user['uid'], 'now_money', 'brokerage_money', $brokerage, 0, $user['now_money'], '收取提现手续费');
             return app('json')->successful('申请提现成功!');
-        else
+        } else{
             return app('json')->fail(UserExtract::getErrorInfo('提现失败'));
+        }
+
     }
 }

app/models/store/StoreProduct.php

@@ -113,7 +113,7 @@ class StoreProduct extends BaseModel
         if ($salesOrder) $baseOrder = $salesOrder == 'desc' ? 'sales DESC' : 'sales ASC';//虚拟销量
         if ($baseOrder) $baseOrder .= ', ';
         $model->order($baseOrder . 'sort DESC, add_time DESC');
-        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock')->select()->each(function ($item) use ($uid, $type) {
+        $list = $model->page((int)$page, (int)$limit)->field('id,store_name,cate_id,image,IFNULL(sales,0) + IFNULL(ficti,0) as sales,price,stock,ot_price')->select()->each(function ($item) use ($uid, $type) {
             if ($type) {
                 $item['is_att'] = StoreProductAttrValueModel::where('product_id', $item['id'])->count() ? true : false;
                 if ($uid) $item['cart_num'] = StoreCart::where('is_pay', 0)->where('is_del', 0)->where('is_new', 0)->where('type', 'product')->where('product_id', $item['id'])->where('uid', $uid)->value('cart_num');

app/models/user/UserBill.php

@@ -83,10 +83,15 @@ class UserBill extends BaseModel
         foreach ($list as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
+
         }
-        return $list;
+        $lists['data'] = $list;
+        $lists['sr'] = self::where('uid', $uid)->where('category', $category)->where('status', 1)->where('pm', 1)->sum('number');
+        $lists['zc'] = self::where('uid', $uid)->where('category', $category)->where('status', 1)->where('pm', 0)->sum('number');
+        return $lists;
     }
 
+
     /**
      * 获取昨日佣金
      * @param $uid
@@ -175,7 +180,15 @@ class UserBill extends BaseModel
             $value['list'] = self::where('id', 'in', $item['ids'])->field('FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i") as add_time,title,number,pm')->order('add_time DESC')->select();
             array_push($data, $value);
         }
-        return $data;
+        $lists['data'] = $data;
+        if ($type < 3){
+            $lists['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 1)->sum('number') ?? 0;
+            $lists['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '<>', 'brokerage')->where('pm', 0)->sum('number') ?? 0;
+        }else {
+            $lists['sr'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '=', 'brokerage')->where('pm', 1)->sum('number') ?? 0;
+            $lists['zc'] = self::where('uid', $uid)->where('category', 'now_money')->where('type', '=', 'brokerage')->where('pm', 0)->sum('number') ?? 0;
+        }
+        return $lists;
     }
 
     /**

app/models/user/UserExtract.php

@@ -99,7 +99,7 @@ class UserExtract extends BaseModel
             $res1 = self::create($insertData);
             if(!$res1) return self::setErrorInfo('提现失败');
             $res2 = User::edit(['brokerage_price'=>$balance],$userInfo['uid'],'uid');
-            $res3 = UserBill::expend('余额提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
+            $res3 = UserBill::expend('佣金提现',$userInfo['uid'],'now_money','extract',$data['money'],$res1['id'],$balance,$mark);
             $res = $res2 && $res3;
             if($res){
                 self::commitTrans();

route/api/route.php

@@ -147,6 +147,7 @@ Route::group(function () {
     Route::get('spread/count/:type', 'user.UserBillController/spread_count')->name('spreadCount');//推广 佣金 3/提现 4 总和
     Route::get('spread/banner', 'user.UserBillController/spread_banner')->name('spreadBanner');//推广分销二维码海报生成
     Route::get('integral/list', 'user.UserBillController/integral_list')->name('integralList');//积分记录
+    Route::get('voucher/list', 'user.UserBillController/voucher_list')->name('voucher_list');//抵扣券记录
     //提现类
     Route::get('extract/bank', 'user.UserExtractController/bank')->name('extractBank');//提现银行/提现最低金额
     Route::post('extract/cash', 'user.UserExtractController/cash')->name('extractCash');//提现申请