format code

app/admin/controller/AdminException.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/10
- */
 
 namespace app\admin\controller;
 
@@ -33,4 +28,4 @@ class AdminException extends Handle
 
         return parent::render($request, $e);
     }
-}
+}

app/admin/controller/SystemBasic.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/10/09
- */
 
 namespace app\admin\controller;
 
@@ -113,6 +108,4 @@ class SystemBasic extends BaseController
     {
         exit($this->fetch('public/404'));
     }
-
-
 }

app/admin/controller/order/StoreOrder.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\controller\order;
 
@@ -26,7 +21,8 @@ use crmeb\services\{
 use app\admin\model\order\StoreOrderStatus;
 use app\admin\model\ump\StorePink;
 use app\admin\model\user\{
-    User, UserBill
+    User,
+    UserBill
 };
 use crmeb\basic\BaseModel;
 use think\facade\Route as Url;
@@ -244,7 +240,7 @@ class StoreOrder extends AuthController
         $f[] = Form::number('pay_price', '实际支付金额', $product->getData('pay_price'))->min(0);
         $f[] = Form::number('pay_postage', '实际支付邮费', $product->getData('pay_postage'));
         $f[] = Form::number('gain_integral', '赠送积分', $product->getData('gain_integral'));
-//        $f[] = Form::radio('status','状态',$product->getData('status'))->options([['label'=>'开启','value'=>1],['label'=>'关闭','value'=>0]]);
+        //        $f[] = Form::radio('status','状态',$product->getData('status'))->options([['label'=>'开启','value'=>1],['label'=>'关闭','value'=>0]]);
         $form = Form::make_post_form('修改订单', $f, Url::buildUrl('update', array('id' => $id)));
         $this->assign(compact('form'));
         return $this->fetch('public/form-builder');
@@ -582,15 +578,15 @@ class StoreOrder extends AuthController
         return Json::fail('目前系統版本暫不支持在線退款; 如果需要，請聯系工程技術部門升級系統');
 
         if ($product['pay_type'] == 'weixin') {
-            if ($product['is_channel'] == 1) {//小程序
+            if ($product['is_channel'] == 1) { //小程序
                 try {
                     // TODO: 批量支付後，這個訂單號應該爲總訂單號，退款只支持批量購買最多貨品爲 1 種的訂單。
                     throw new \Exception("目前系統部分訂單不支持退款，請聯系工程技術部門升級");
-                    MiniProgramService::payOrderRefund($product['order_id'], $refund_data);//2.5.36
+                    MiniProgramService::payOrderRefund($product['order_id'], $refund_data); //2.5.36
                 } catch (\Exception $e) {
                     return Json::fail($e->getMessage());
                 }
-            } else {//TODO 公众号
+            } else { //TODO 公众号
                 try {
                     WechatService::payOrderRefund($product['order_id'], $refund_data);
                 } catch (\Exception $e) {
@@ -699,11 +695,11 @@ class StoreOrder extends AuthController
             }
             if (is_array($result) && (isset($result['result']) || isset($result['content']))) {
                 $cacheTime = 1200;
-                if(isset($result['content'])){
+                if (isset($result['content'])) {
                     $result['result'] = $result['content'];
                     unset($result['content']);
                 }
-            }else
+            } else
                 $cacheTime = 1800;
             CacheService::set($cacheName, $result, $cacheTime);
         }
@@ -731,7 +727,7 @@ class StoreOrder extends AuthController
             $f[] = Form::input('delivery_id', '送货人电话', $product->getData('delivery_id'));
         } else if ($product['delivery_type'] == 'express') {
             $f[] = Form::select('delivery_name', '快递公司', $product->getData('delivery_name'))->setOptions(function () {
-//                $list = Express::where('is_show', 1)->column('name', 'id');
+                //                $list = Express::where('is_show', 1)->column('name', 'id');
                 try {
                     $list = ExpressService::init()->express(1, 1, 1000);
                     $list = $list['data'] ?? [];
@@ -952,5 +948,4 @@ class StoreOrder extends AuthController
             return Json::fail('核销失败');
         }
     }
-
 }

app/admin/controller/store/StoreCategory.php

@@ -125,7 +125,7 @@ class StoreCategory extends AuthController
         if ($data['sort'] < 0) $data['sort'] = 0;
         $data['pic'] = $data['pic'][0];
         $data['add_time'] = time();
-        if (CategoryModel::create($data)){
+        if (CategoryModel::create($data)) {
             event('StoreCategoryCreated', ['category' => $data]);
             return Json::successful('添加分类成功!');
         }
@@ -144,7 +144,7 @@ class StoreCategory extends AuthController
         $field = [
             Form::select('pid', '父级', (string)$c->getData('pid'))->setOptions(function () use ($id) {
                 $list = CategoryModel::getTierList(CategoryModel::where('id', '<>', $id), 0);
-//                $list = (sort_list_tier((CategoryModel::where('id','<>',$id)->select()->toArray(),'顶级','pid','cate_name'));
+                //                $list = (sort_list_tier((CategoryModel::where('id','<>',$id)->select()->toArray(),'顶级','pid','cate_name'));
                 $menus = [['value' => 0, 'label' => '顶级菜单']];
                 foreach ($list as $menu) {
                     $menus[] = ['value' => $menu['id'], 'label' => $menu['html'] . $menu['cate_name']];
@@ -183,7 +183,7 @@ class StoreCategory extends AuthController
         if (count($data['pic']) < 1) return Json::fail('请上传分类图标');
         if ($data['sort'] < 0) $data['sort'] = 0;
         $data['pic'] = $data['pic'][0];
-        if(CategoryModel::edit($data, $id)) {
+        if (CategoryModel::edit($data, $id)) {
             event('StoreCategoryEdited', ['id' => $id]);
             return Json::successful('修改成功!');
         }

app/admin/controller/store/StoreProduct.php

@@ -3,7 +3,8 @@
 namespace app\admin\controller\store;
 
 use app\admin\controller\AuthController;
-use app\admin\model\store\{StoreDescription,
+use app\admin\model\store\{
+    StoreDescription,
     StoreProductAttrValue,
     StoreProductAttr,
     StoreProductAttrResult,
@@ -11,17 +12,22 @@ use app\admin\model\store\{StoreDescription,
     StoreProductProvider as SPP,
     StoreProductRelation,
     StoreCategory as CategoryModel,
-    StoreProduct as ProductModel};
+    StoreProduct as ProductModel
+};
 use app\admin\model\ump\StoreBargain;
 use app\admin\model\ump\StoreCombination;
 use app\admin\model\ump\StoreSeckill;
 use crmeb\services\{
-    JsonService, UtilService as Util, JsonService as Json, FormBuilder as Form
+    JsonService,
+    UtilService as Util,
+    JsonService as Json,
+    FormBuilder as Form
 };
 use crmeb\traits\CurdControllerTrait;
 use think\facade\Route as Url;
 use app\admin\model\system\{
-    SystemAttachment, ShippingTemplates
+    SystemAttachment,
+    ShippingTemplates
 };
 use \think\facade\Config;
 
@@ -96,7 +102,7 @@ class StoreProduct extends AuthController
             'add_time' => time(),
         ]);
         if ($res) {
-            event('StoreProductOnOffShelf', ['is_show'=>$is_show, 'ids'=>[$id],]);
+            event('StoreProductOnOffShelf', ['is_show' => $is_show, 'ids' => [$id],]);
             return Json::successful($is_show == 1 ? '上架成功' : '下架成功');
         } else {
             return Json::fail($is_show == 1 ? '上架失败' : '下架失败');
@@ -137,7 +143,7 @@ class StoreProduct extends AuthController
                 'add_time' => time(),
             ]);
             if ($res) {
-                event('StoreProductOnOffShelf', ['is_show'=>1, 'ids'=>$post['ids'],]);
+                event('StoreProductOnOffShelf', ['is_show' => 1, 'ids' => $post['ids'],]);
                 return Json::successful('上架成功');
             } else {
                 return Json::fail('上架失败');
@@ -150,13 +156,13 @@ class StoreProduct extends AuthController
      *
      * @return \think\Response
      */
-    public function create($id = 0, $type=1)
+    public function create($id = 0, $type = 1)
     {
         $this->assign('id', (int)$id);
         $this->assign('type', intval($type));
         $luckies = get_luckies();
         $this->assign('lucky_id', json_encode($luckies));
-        $this->assign('lucky_spec_name', Config::get('activity.lucky_spec_name') );
+        $this->assign('lucky_spec_name', Config::get('activity.lucky_spec_name'));
         $this->assign('lucky_name', get_luck_name());
         return $this->fetch();
     }
@@ -186,10 +192,10 @@ class StoreProduct extends AuthController
         $list = CategoryModel::getTierList(null, 1);
         $menus = [];
         foreach ($list as $menu) {
-            $menus[] = ['value' => $menu['id'], 'label' => $menu['html'] . $menu['cate_name'], 'disabled' => $menu['pid'] == 0 ? 0 : 1];//,'disabled'=>$menu['pid']== 0];
+            $menus[] = ['value' => $menu['id'], 'label' => $menu['html'] . $menu['cate_name'], 'disabled' => $menu['pid'] == 0 ? 0 : 1]; //,'disabled'=>$menu['pid']== 0];
         }
         $data['tempList'] = ShippingTemplates::order('sort', 'desc')->field(['id', 'name'])->select()->toArray();
-        $data['providerList'] = SPP::where('status',0)->field(['id', 'name'])->select()->toArray();
+        $data['providerList'] = SPP::where('status', 0)->field(['id', 'name'])->select()->toArray();
         $data['cateList'] = $menus;
         $data['productInfo'] = [];
         if ($id) {
@@ -325,8 +331,8 @@ class StoreProduct extends AuthController
             if (($item['brokerage'] + $item['brokerage_two']) > $item['price']) {
                 return Json::fail('一二级返佣相加不能大于商品售价');
             }
-            foreach($item as $k=>$v) {
-                if(is_string($v)) {
+            foreach ($item as $k => $v) {
+                if (is_string($v)) {
                     $item[$k] = trim($v);
                 }
             }
@@ -355,7 +361,7 @@ class StoreProduct extends AuthController
                 $detail[0]['value1'] = '规格';
                 $detail[0]['detail'] = ['规格' => '默认'];
             } else {
-                if ( in_array($cate_id[0], get_luckies()) ) {
+                if (in_array($cate_id[0], get_luckies())) {
                     if (!array_search($lucky_spec_name, array_column($attr, 'value'))) {
                         $attr[] = [
                             'value' => $lucky_spec_name,
@@ -370,7 +376,7 @@ class StoreProduct extends AuthController
             $attr_res = StoreProductAttr::createProductAttr($attr, $detail, $id);
             if ($attr_res) {
                 ProductModel::commitTrans();
-                event('StoreEditProduct', ['productId'=>$id,]);
+                event('StoreEditProduct', ['productId' => $id,]);
                 return Json::success('修改成功!');
             } else {
                 ProductModel::rollbackTrans();
@@ -399,7 +405,7 @@ class StoreProduct extends AuthController
                 $detail[0]['value1'] = '规格';
                 $detail[0]['detail'] = ['规格' => '默认'];
             } else {
-                if ( in_array($cate_id[0], get_luckies()) ) {
+                if (in_array($cate_id[0], get_luckies())) {
                     $attr[] = [
                         'value' => $lucky_spec_name,
                         'detailValue' => '',
@@ -411,8 +417,8 @@ class StoreProduct extends AuthController
             $attr_res = StoreProductAttr::createProductAttr($attr, $detail, $res['id']);
             if ($attr_res) {
                 ProductModel::commitTrans();
-                event('AdminAddStoreProduct', ['product'=>$res, 'admin'=>$this->adminInfo]);
-                event('StoreProductCreated', ['product'=>$res,]);
+                event('AdminAddStoreProduct', ['product' => $res, 'admin' => $this->adminInfo]);
+                event('StoreProductCreated', ['product' => $res,]);
                 return Json::success('添加产品成功!');
             } else {
                 ProductModel::rollbackTrans();
@@ -451,7 +457,7 @@ class StoreProduct extends AuthController
                 $list = CategoryModel::getTierList(null, 1);
                 $menus = [];
                 foreach ($list as $menu) {
-                    $menus[] = ['value' => $menu['id'], 'label' => $menu['html'] . $menu['cate_name'], 'disabled' => $menu['pid'] == 0];//,'disabled'=>$menu['pid']== 0];
+                    $menus[] = ['value' => $menu['id'], 'label' => $menu['html'] . $menu['cate_name'], 'disabled' => $menu['pid'] == 0]; //,'disabled'=>$menu['pid']== 0];
                 }
                 return $menus;
             })->filterable(1)->multiple(1),
@@ -543,7 +549,7 @@ class StoreProduct extends AuthController
     public function attr($id)
     {
         if (!$id) return $this->failed('数据不存在!');
-//        $result = StoreProductAttrResult::getResult($id);
+        //        $result = StoreProductAttrResult::getResult($id);
         $result = StoreProductAttrValue::getStoreProductAttrResult($id);
         $image = ProductModel::where('id', $id)->value('image');
         $this->assign(compact('id', 'result', 'image'));
@@ -554,7 +560,7 @@ class StoreProduct extends AuthController
      * 生成属性
      * @param int $id
      */
-    public function is_format_attr($id = 0, $cate_id= 0, $type = 0)
+    public function is_format_attr($id = 0, $cate_id = 0, $type = 0)
     {
         $data = Util::postMore([
             ['attrs', []],
@@ -565,7 +571,7 @@ class StoreProduct extends AuthController
         }
         $lucky_spec_name = Config::get('activity.lucky_spec_name');
         $lucky_spec_items = Config::get('activity.lucky_spec_items');
-        if ( in_array($cate_id, get_luckies()) ) {
+        if (in_array($cate_id, get_luckies())) {
             if (!array_search($lucky_spec_name, array_column($data['attrs'], 'value'))) {
                 $data['attrs'][] = [
                     'value' => $lucky_spec_name,
@@ -687,7 +693,7 @@ class StoreProduct extends AuthController
             if (!ProductModel::edit($data, $id)) {
                 return Json::fail(ProductModel::getErrorInfo('恢复失败,请稍候再试!'));
             } else {
-                event('StoreProductOnOffShelf', ['is_show'=>1, 'ids'=>[$id],]);
+                event('StoreProductOnOffShelf', ['is_show' => 1, 'ids' => [$id],]);
                 return Json::successful('成功恢复产品!');
             }
         } else {    // 刪除
@@ -701,16 +707,13 @@ class StoreProduct extends AuthController
                 if (!ProductModel::edit($data, $id)) {
                     return Json::fail(ProductModel::getErrorInfo('删除失败,请稍候再试!'));
                 } else {
-                    event('StoreProductOnOffShelf', ['is_show'=>0, 'ids'=>[$id],]);
+                    event('StoreProductOnOffShelf', ['is_show' => 0, 'ids' => [$id],]);
                     return Json::successful('成功移到回收站!');
                 }
             }
-
         }
-
     }
 
-
     /**
      * 点赞
      * @param $id

app/admin/controller/system/SystemVerifyOrder.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\controller\system;
 
@@ -84,5 +79,4 @@ class SystemVerifyOrder extends AuthController
         else
             return Json::fail('删除失败');
     }
-
 }

app/admin/controller/ump/StoreCouponIssue.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/17
- */
 
 namespace app\admin\controller\ump;
 
@@ -24,7 +19,7 @@ class StoreCouponIssue extends AuthController
         $where = Util::getMore([
             ['status', ''],
             ['coupon_title', ''],
-            ['type','']
+            ['type', '']
         ]);
         $this->assign(CouponIssueModel::stsypage($where));
         $this->assign('where', $where);
@@ -57,4 +52,4 @@ class StoreCouponIssue extends AuthController
         $this->assign(StoreCouponIssueUser::systemCouponIssuePage($id));
         return $this->fetch();
     }
-}
+}

app/admin/controller/user/User.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\controller\user;
 
@@ -73,7 +68,7 @@ class User extends AuthController
         list($group_id) = Util::postMore([
             ['group_id', 0],
         ], $this->request, true);
-        $uids = explode(',',$uid);
+        $uids = explode(',', $uid);
         $res = UserModel::whereIn('uid', $uids)->update(['group_id' => $group_id]);
         if ($res) {
             return Json::successful('设置成功');
@@ -146,8 +141,8 @@ class User extends AuthController
         $res1 = false;
         $res2 = false;
         $edit = array();
-        if ($data['money_status'] && $data['money']) {//余额增加或者减少
-            if ($data['money_status'] == 1) {//增加
+        if ($data['money_status'] && $data['money']) { //余额增加或者减少
+            if ($data['money_status'] == 1) { //增加
                 $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);
                 $res1 = UserBillAdmin::income('系统增加余额', $user['uid'], 'now_money', 'system_add', $data['money'], $this->adminId, $edit['now_money'], '系统增加了' . floatval($data['money']) . '余额');
                 try {
@@ -156,7 +151,7 @@ class User extends AuthController
                     BaseModel::rollbackTrans();
                     return Json::fail($e->getMessage());
                 }
-            } else if ($data['money_status'] == 2) {//减少
+            } else if ($data['money_status'] == 2) { //减少
                 $edit['now_money'] = bcsub($user['now_money'], $data['money'], 2);
                 $res1 = UserBillAdmin::expend('系统减少余额', $user['uid'], 'now_money', 'system_sub', $data['money'], $this->adminId, $edit['now_money'], '系统扣除了' . floatval($data['money']) . '余额');
                 try {
@@ -169,8 +164,8 @@ class User extends AuthController
         } else {
             $res1 = true;
         }
-        if ($data['integration_status'] && $data['integration']) {//积分增加或者减少
-            if ($data['integration_status'] == 1) {//增加
+        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']) . '积分');
                 try {
@@ -179,7 +174,7 @@ class User extends AuthController
                     BaseModel::rollbackTrans();
                     return Json::fail($e->getMessage());
                 }
-            } else if ($data['integration_status'] == 2) {//减少
+            } 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']) . '积分');
                 try {
@@ -366,8 +361,8 @@ class User extends AuthController
         $res1 = false;
         $res2 = false;
         $edit = array();
-        if ($data['money_status'] && $data['money']) {//余额增加或者减少
-            if ($data['money_status'] == 1) {//增加
+        if ($data['money_status'] && $data['money']) { //余额增加或者减少
+            if ($data['money_status'] == 1) { //增加
                 $edit['now_money'] = bcadd($user['now_money'], $data['money'], 2);
                 $res1 = UserBillAdmin::income('系统增加余额', $user['uid'], 'now_money', 'system_add', $data['money'], $this->adminId, $edit['now_money'], '系统增加了' . floatval($data['money']) . '余额');
                 try {
@@ -376,7 +371,7 @@ class User extends AuthController
                     BaseModel::rollbackTrans();
                     return Json::fail($e->getMessage());
                 }
-            } else if ($data['money_status'] == 2) {//减少
+            } else if ($data['money_status'] == 2) { //减少
                 $edit['now_money'] = bcsub($user['now_money'], $data['money'], 2);
                 $res1 = UserBillAdmin::expend('系统减少余额', $user['uid'], 'now_money', 'system_sub', $data['money'], $this->adminId, $edit['now_money'], '系统扣除了' . floatval($data['money']) . '余额');
                 try {
@@ -389,8 +384,8 @@ class User extends AuthController
         } else {
             $res1 = true;
         }
-        if ($data['integration_status'] && $data['integration']) {//积分增加或者减少
-            if ($data['integration_status'] == 1) {//增加
+        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']) . '积分');
                 try {
@@ -399,7 +394,7 @@ class User extends AuthController
                     BaseModel::rollbackTrans();
                     return Json::fail($e->getMessage());
                 }
-            } else if ($data['integration_status'] == 2) {//减少
+            } 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']) . '积分');
                 try {

app/admin/controller/user/UserGroup.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: wuhaotian<442384644@qq.com>
- * @day: 2019/12/07
- */
 
 namespace app\admin\controller\user;
 
@@ -98,4 +93,4 @@ class UserGroup extends AuthController
         else
             return JsonService::successful('恢复门店成功!');
     }
-}
+}

app/admin/model/article/Article.php

@@ -1,11 +1,5 @@
 <?php
 
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
-
 namespace app\admin\model\article;
 
 use app\admin\model\store\StoreProduct;
@@ -41,16 +35,16 @@ class Article extends BaseModel
     public static function getAll($where = [])
     {
         $model = new self;
-//        if($where['status'] !== '') $model = $model->where('status',$where['status']);
-//        if($where['access'] !== '') $model = $model->where('access',$where['access']);
+        //        if($where['status'] !== '') $model = $model->where('status',$where['status']);
+        //        if($where['access'] !== '') $model = $model->where('access',$where['access']);
         if ($where['title'] !== '') $model = $model->where('title', 'LIKE', "%$where[title]%");
         if ($where['cid'] !== '')
             $model = $model->where('cid', 'in', $where['cid']);
         else
             if ($where['merchant'])
-                $model = $model->where('mer_id', '>', 0);
-            else
-                $model = $model->where('mer_id', 0);
+            $model = $model->where('mer_id', '>', 0);
+        else
+            $model = $model->where('mer_id', 0);
         $model = $model->where('status', 1)->where('hide', 0)->order('id desc');
         return self::page($model, function ($item) {
             if (!$item['mer_id']) $item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
@@ -89,7 +83,7 @@ class Article extends BaseModel
      */
     public static function saveBatchCid($cid, $id)
     {
-        $res_all = self::where('cid', 'LIKE', "%$cid%")->select();//获取所有有当前分类的图文
+        $res_all = self::where('cid', 'LIKE', "%$cid%")->select(); //获取所有有当前分类的图文
         foreach ($res_all as $k => $v) {
             $cid_arr = explode(',', $v['cid']);
             if (in_array($cid, $cid_arr)) {
@@ -163,4 +157,4 @@ class Article extends BaseModel
         }
         return $list;
     }
-}
+}

app/admin/model/article/ArticleCategory.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\article;
 
@@ -117,5 +112,4 @@ class ArticleCategory extends BaseModel
         $model = $model->where('status', 1);
         return $model->column($field, 'id');
     }
-
-}
+}

app/admin/model/finance/FinanceModel.php

@@ -51,10 +51,10 @@ class FinanceModel extends BaseModel
         unset($where['sort']);
         unset($where['sortOrder']);
         if (!empty($where['add_time'])) {
-//            list($startTime, $endTime) = explode(' - ', $where['add_time']);
-//            $where['add_time'] = array('between', [strtotime($startTime), strtotime($endTime)]);
-//        } else {
-//            $where['add_time'] = array('between', [strtotime(date('Y/m') . '/01'), strtotime(date('Y/m') . '/' . date('t'))]);
+            //            list($startTime, $endTime) = explode(' - ', $where['add_time']);
+            //            $where['add_time'] = array('between', [strtotime($startTime), strtotime($endTime)]);
+            //        } else {
+            //            $where['add_time'] = array('between', [strtotime(date('Y/m') . '/01'), strtotime(date('Y/m') . '/' . date('t'))]);
             $model = self::getModelTime($where, $model, 'add_time');
         }
         if (empty($where['title'])) {
@@ -134,11 +134,11 @@ class FinanceModel extends BaseModel
         $coupon = 0;
         $cost = 0;
         foreach ($orderinfo as $info) {
-            $price = bcadd($price, $info['total_price'], 2);//应支付
-            $postage = bcadd($postage, $info['pay_postage'], 2);//邮费
-            $deduction = bcadd($deduction, $info['deduction_price'], 2);//抵扣
-            $coupon = bcadd($coupon, $info['coupon_price'], 2);//优惠券
-            $cost = bcadd($cost, $info['cost'], 2);//成本
+            $price = bcadd($price, $info['total_price'], 2); //应支付
+            $postage = bcadd($postage, $info['pay_postage'], 2); //邮费
+            $deduction = bcadd($deduction, $info['deduction_price'], 2); //抵扣
+            $coupon = bcadd($coupon, $info['coupon_price'], 2); //优惠券
+            $cost = bcadd($cost, $info['cost'], 2); //成本
         }
         return compact('orderinfo', 'price', 'postage', 'deduction', 'coupon', 'cost');
     }
@@ -151,11 +151,11 @@ class FinanceModel extends BaseModel
         if ($model == null) $model = new self;
         if ('' === $status)
             return $model;
-        else if ($status == 'weixin')//微信支付
+        else if ($status == 'weixin') //微信支付
             return $model->where('pay_type', 'weixin');
-        else if ($status == 'yue')//余额支付
+        else if ($status == 'yue') //余额支付
             return $model->where('pay_type', 'yue');
-        else if ($status == 'offline')//线下支付
+        else if ($status == 'offline') //线下支付
             return $model->where('pay_type', 'offline');
         else
             return $model;
@@ -280,13 +280,13 @@ class FinanceModel extends BaseModel
                 $price = $info['total_price'] + $info['pay_postage'];
                 $zhichu = $info['coupon_price'] + $info['deduction_price'] + $info['cost'];
                 $profit = ($info['total_price'] + $info['pay_postage']) - ($info['coupon_price'] + $info['deduction_price'] + $info['cost']);
-                $deduction = $info['deduction_price'];//积分抵扣
-                $coupon = $info['coupon_price'];//优惠
-                $cost = $info['cost'];//成本
+                $deduction = $info['deduction_price']; //积分抵扣
+                $coupon = $info['coupon_price']; //优惠
+                $cost = $info['cost']; //成本
                 $export[] = [$time, $price, $zhichu, $cost, $coupon, $deduction, $profit];
             }
-//            ExportService::exportCsv($export,'统计'.time(),['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)']);
+            //            ExportService::exportCsv($export,'统计'.time(),['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)']);
             PHPExcelService::setExcelHeader(['时间', '营业额(元)', '支出(元)', '成本', '优惠', '积分抵扣', '盈利(元)'])->setExcelTile('财务统计', '财务统计', date('Y-m-d H:i:s', time()))->setExcelContent($export)->ExcelSave();
         }
     }
-}
+}

app/admin/model/order/StoreOrder.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\order;
 
@@ -44,7 +39,7 @@ class StoreOrder extends BaseModel
     {
         return json_decode($value, true);
     }
-    
+
     public static function orderCount()
     {
         $data['ys'] = self::statusByWhere(9, new self())->where(['is_system_del' => 0])->count();
@@ -79,17 +74,19 @@ class StoreOrder extends BaseModel
         } else {
             $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
         }
-        $spreadUser = [];$storePink = [];$systemStore = [];
+        $spreadUser = [];
+        $storePink = [];
+        $systemStore = [];
         $spreadIds = array_unique(array_column($data, 'spread_uid'));
-        if($spreadIds) {
-            $spreadUser = User::where('uid', 'IN', $spreadIds)->column('nickname','uid');
+        if ($spreadIds) {
+            $spreadUser = User::where('uid', 'IN', $spreadIds)->column('nickname', 'uid');
         }
         $orderIds = array_column($data, 'id');
-        if($orderIds) {
+        if ($orderIds) {
             $storePink = StorePink::where('order_id_key', 'IN', $orderIds)->column('status', 'order_id_key');
         }
         $storeIds = array_unique(array_column($data, 'store_id'));
-        if($storeIds) {
+        if ($storeIds) {
             $systemStore = SystemStore::where('id', 'IN', $storeIds)->column('name', 'id');
         }
         foreach ($data as &$item) {
@@ -260,10 +257,13 @@ HTML;
                     }
                 }
                 $goodsName[] = implode(
-                    [$v['productInfo']['store_name'],
+                    [
+                        $v['productInfo']['store_name'],
                         $suk,
                         "[{$v['cart_num']} * {$v['truePrice']}]"
-                    ], ' ');
+                    ],
+                    ' '
+                );
                 $cart_sum += $v['cart_num'];
             }
             $item['cartInfo'] = $_info;
@@ -291,8 +291,10 @@ HTML;
                 $item['mark']
             ];
         }
-        PHPExcelService::setExcelHeader(['订单号', '性别', '电话', '收货人姓名', '收货人电话', '收货地址', '商品信息', '商品总件数',
-            '总价格', '实际支付', '邮费', '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '用户备注'])
+        PHPExcelService::setExcelHeader([
+            '订单号', '性别', '电话', '收货人姓名', '收货人电话', '收货地址', '商品信息', '商品总件数',
+            '总价格', '实际支付', '邮费', '优惠金额', '支付状态', '支付时间', '订单状态', '下单时间', '用户备注'
+        ])
             ->setExcelTile('订单导出' . date('YmdHis', time()), '订单信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
             ->ExcelSave();
@@ -332,10 +334,13 @@ HTML;
                 foreach ($_info as $k => $v) {
                     $v = json_decode($v, true);
                     $goodsName[] = implode(
-                        [$v['productInfo']['store_name'],
+                        [
+                            $v['productInfo']['store_name'],
                             isset($v['productInfo']['attrInfo']) ? '(' . $v['productInfo']['attrInfo']['suk'] . ')' : '',
                             "[{$v['cart_num']} * {$v['truePrice']}]"
-                        ], ' ');
+                        ],
+                        ' '
+                    );
                 }
                 $item['cartInfo'] = $_info;
                 $export[] = [
@@ -402,27 +407,27 @@ HTML;
             return $model;
         else if ($status == 8)
             return $model;
-        else if ($status == 0)//未支付
+        else if ($status == 0) //未支付
             return $model->where($alert . 'paid', 0)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == 1)//已支付 未发货
+        else if ($status == 1) //已支付 未发货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'shipping_type', SHIPPING_EXPRESS)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == 2)//已支付  待收货
+        else if ($status == 2) //已支付  待收货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_RECEIPT)->where($alert . 'shipping_type', SHIPPING_EXPRESS)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == 5)//已支付  待核销
+        else if ($status == 5) //已支付  待核销
             return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_SHIP)->where($alert . 'shipping_type', SHIPPING_SELF_COLLECT)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == 3)// 已支付  已收货  待评价
+        else if ($status == 3) // 已支付  已收货  待评价
             return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_RECEIPTED)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == 4)// 交易完成
+        else if ($status == 4) // 交易完成
             return $model->where($alert . 'paid', 1)->where($alert . 'status', ORDER_WAITING_COMMENT)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
-        else if ($status == -1)//退款中
+        else if ($status == -1) //退款中
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUNDING)->where($alert . 'is_del', 0);
-        else if ($status == -2)//已退款
+        else if ($status == -2) //已退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUNDED)->where($alert . 'is_del', 0);
-        else if ($status == -3)//退款
+        else if ($status == -3) //退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 'in', '1,2')->where($alert . 'is_del', 0);
-        else if ($status == -4)//已删除
+        else if ($status == -4) //已删除
             return $model->where($alert . 'is_del', 1);
-        else if ($status == 9)//已卖出
+        else if ($status == 9) //已卖出
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', REFUND_NO)->where($alert . 'is_del', 0);
         else
             return $model;
@@ -499,7 +504,7 @@ HTML;
      */
     public static function getOrderWhere($where, $model, $aler = '', $join = '')
     {
-//        $model = $model->where('combination_id',0);
+        //        $model = $model->where('combination_id',0);
         $model = $model->where('is_system_del', 0);
         if (isset($where['status']) && $where['status'] != '') {
             $model = self::statusByWhere($where['status'], $model, $aler);
@@ -538,7 +543,7 @@ HTML;
                     $model = $model->where($aler . 'combination_id', 0)->where($aler . 'seckill_id', 0)->where($aler . 'bargain_id', 0);
                     break;
                 case 2:
-//                    $model = $model->where($aler.'combination_id',">",0)->where($aler.'pink_id',">",0);
+                    //                    $model = $model->where($aler.'combination_id',">",0)->where($aler.'pink_id',">",0);
                     $model = $model->where($aler . 'combination_id', ">", 0);
                     break;
                 case 3:
@@ -650,18 +655,18 @@ HTML;
      */
     public static function getOrderPrice($where)
     {
-        $where['is_del'] = 0;//删除订单不统计
+        $where['is_del'] = 0; //删除订单不统计
         $model = new self;
         $price = [];
-        $price['pay_price'] = 0;//支付金额
-        $price['refund_price'] = 0;//退款金额
-        $price['pay_price_wx'] = 0;//微信支付金额
-        $price['pay_price_yue'] = 0;//余额支付金额
-        $price['pay_price_offline'] = 0;//线下支付金额
-        $price['pay_price_other'] = 0;//其他支付金额
-        $price['use_integral'] = 0;//用户使用积分
-        $price['back_integral'] = 0;//退积分总数
-        $price['deduction_price'] = 0;//抵扣金额
+        $price['pay_price'] = 0; //支付金额
+        $price['refund_price'] = 0; //退款金额
+        $price['pay_price_wx'] = 0; //微信支付金额
+        $price['pay_price_yue'] = 0; //余额支付金额
+        $price['pay_price_offline'] = 0; //线下支付金额
+        $price['pay_price_other'] = 0; //其他支付金额
+        $price['use_integral'] = 0; //用户使用积分
+        $price['back_integral'] = 0; //退积分总数
+        $price['deduction_price'] = 0; //抵扣金额
         $price['total_num'] = 0; //商品总数
         $price['count_sum'] = 0; //商品总数
         $price['brokerage'] = 0;
@@ -735,10 +740,13 @@ HTML;
                 foreach ($_info as $k => $v) {
                     $v = json_decode($v, true);
                     $goodsName[] = implode(
-                        [$v['productInfo']['store_name'],
+                        [
+                            $v['productInfo']['store_name'],
                             isset($v['productInfo']['attrInfo']) ? '(' . $v['productInfo']['attrInfo']['suk'] . ')' : '',
                             "[{$v['cart_num']} * {$v['truePrice']}]"
-                        ], ' ');
+                        ],
+                        ' '
+                    );
                 }
                 $item['cartInfo'] = $_info;
                 $export[] = [
@@ -775,7 +783,7 @@ HTML;
     {
         $model = $model->where('combination_id', '>', 0);
         if ($where['status'] != '') $model = $model::statusByWhere($where['status']);
-//        if($where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where('is_del',$where['is_del']);
+        //        if($where['is_del'] != '' && $where['is_del'] != -1) $model = $model->where('is_del',$where['is_del']);
         if ($where['real_name'] != '') {
             $model = $model->where('order_id|real_name|user_phone', 'LIKE', "%$where[real_name]%");
         }
@@ -794,15 +802,15 @@ HTML;
     {
         $model = new self;
         $price = [];
-        $price['pay_price'] = 0;//支付金额
-        $price['refund_price'] = 0;//退款金额
-        $price['pay_price_wx'] = 0;//微信支付金额
-        $price['pay_price_yue'] = 0;//余额支付金额
-        $price['pay_price_offline'] = 0;//线下支付金额
-        $price['pay_price_other'] = 0;//其他支付金额
-        $price['use_integral'] = 0;//用户使用积分
-        $price['back_integral'] = 0;//退积分总数
-        $price['deduction_price'] = 0;//抵扣金额
+        $price['pay_price'] = 0; //支付金额
+        $price['refund_price'] = 0; //退款金额
+        $price['pay_price_wx'] = 0; //微信支付金额
+        $price['pay_price_yue'] = 0; //余额支付金额
+        $price['pay_price_offline'] = 0; //线下支付金额
+        $price['pay_price_other'] = 0; //其他支付金额
+        $price['use_integral'] = 0; //用户使用积分
+        $price['back_integral'] = 0; //退积分总数
+        $price['deduction_price'] = 0; //抵扣金额
         $price['total_num'] = 0; //商品总数
         $model = self::getOrderWherePink($where, $model);
         $list = $model->select()->toArray();
@@ -861,7 +869,8 @@ HTML;
         return self::where('uid', $where['uid'])
             ->order('add_time desc')
             ->page((int)$where['page'], (int)$where['limit'])
-            ->field(['order_id,real_name,total_num,total_price,pay_price,FROM_UNIXTIME(pay_time,"%Y-%m-%d") as pay_time,paid,pay_type,pink_id,seckill_id,bargain_id'
+            ->field([
+                'order_id,real_name,total_num,total_price,pay_price,FROM_UNIXTIME(pay_time,"%Y-%m-%d") as pay_time,paid,pay_type,pink_id,seckill_id,bargain_id'
             ])->select()
             ->toArray();
     }
@@ -1107,12 +1116,12 @@ HTML;
             'first' => '亲,您的订单已发货,请注意查收',
             'remark' => '点击查看订单详情'
         ];
-        if ($postageData['delivery_type'] == 'send') {//送货
+        if ($postageData['delivery_type'] == 'send') { //送货
             $goodsName = StoreOrderCartInfo::getProductNameList($order['id']);
             if ($order['is_channel'] == 1) {
                 //小程序送货模版消息
                 RoutineTemplate::sendOrderPostage($order);
-            } else {//公众号
+            } else { //公众号
                 $openid = WechatUser::where('uid', $order['uid'])->value('openid');
                 $group = array_merge($group, [
                     'keyword1' => $goodsName,
@@ -1123,11 +1132,11 @@ HTML;
                 ]);
                 WechatTemplateService::sendTemplate($openid, WechatTemplateService::ORDER_DELIVER_SUCCESS, $group, $url);
             }
-        } else if ($postageData['delivery_type'] == 'express') {//发货
+        } else if ($postageData['delivery_type'] == 'express') { //发货
             if ($order['is_channel'] == 1) {
                 //小程序发货模版消息
                 RoutineTemplate::sendOrderPostage($order, 1);
-            } else {//公众号
+            } else { //公众号
                 $openid = WechatUser::where('uid', $order['uid'])->value('openid');
                 $group = array_merge($group, [
                     'keyword1' => $order['order_id'],
@@ -1160,7 +1169,7 @@ HTML;
             $title = StoreProduct::where('id', $cartInfo['product_id'])->value('store_name');
         }
 
-        if ($order['is_channel'] == 1) {//小程序
+        if ($order['is_channel'] == 1) { //小程序
             RoutineTemplate::sendOrderTakeOver($order, $title);
         } else {
             $openid = WechatUser::where('uid', $order['uid'])->value('openid');
@@ -1300,4 +1309,4 @@ HTML;
         $offline = self::getOrderWhere($where, new self)->count();
         return compact('weixin', 'yue', 'offline');
     }
-}
+}

app/admin/model/order/StoreOrderCartInfo.php

@@ -1,13 +1,7 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/26
- */
 
 namespace app\admin\model\order;
 
-
 use crmeb\basic\BaseModel;
 use crmeb\traits\ModelTrait;
 
@@ -28,17 +22,16 @@ class StoreOrderCartInfo extends BaseModel
      */
     public static function getProductNameList($oid)
     {
-        $cartInfo = self::where('oid',$oid)->select();
+        $cartInfo = self::where('oid', $oid)->select();
         $goodsName = [];
-        foreach ($cartInfo as $cart){
-            if(isset($cart['cart_info']['productInfo'])){
-                $suk = isset($cart['cart_info']['productInfo']['attrInfo']) ? '('.$cart['cart_info']['productInfo']['attrInfo']['suk'].')' : '';
-                $goodsName[] = $cart['cart_info']['productInfo']['store_name'].$suk;
-            }else{
+        foreach ($cartInfo as $cart) {
+            if (isset($cart['cart_info']['productInfo'])) {
+                $suk = isset($cart['cart_info']['productInfo']['attrInfo']) ? '(' . $cart['cart_info']['productInfo']['attrInfo']['suk'] . ')' : '';
+                $goodsName[] = $cart['cart_info']['productInfo']['store_name'] . $suk;
+            } else {
                 $goodsName[] = '';
             }
         }
         return $goodsName;
     }
-
-}
+}

app/admin/model/order/StoreOrderStatus.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\order;
 
@@ -60,8 +55,8 @@ class StoreOrderStatus extends BaseModel
     {
         $model = new self;
         $model = $model->where('oid', $oid);
-//        $model = $model->where('change_type','LIKE','mer_%');
+        //        $model = $model->where('change_type','LIKE','mer_%');
         $model = $model->order('change_time asc');
         return self::page($model);
     }
-}
+}

app/admin/model/record/StoreStatistics.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\model\record;
 
 use crmeb\traits\ModelTrait;
@@ -31,9 +32,9 @@ class StoreStatistics extends BaseModel
     {
         $model = new self;
         $price = array();
-        $price['pay_price_wx'] = 0;//微信支付金额
-        $price['pay_price_yue'] = 0;//余额支付金额
-        $price['pay_price_offline'] = 0;//线下支付金额
+        $price['pay_price_wx'] = 0; //微信支付金额
+        $price['pay_price_yue'] = 0; //余额支付金额
+        $price['pay_price_offline'] = 0; //线下支付金额
         $list = self::getTimeWhere($where, $model)->field('pay_price,total_price,deduction_price,coupon_price,total_postage,pay_type,pay_time')->select()->toArray();
         if (empty($list)) {
             $price['pay_price_wx'] = 0;
@@ -59,7 +60,7 @@ class StoreStatistics extends BaseModel
     {
         $orderinfo = self::getTimeWhere($where)
             ->field('sum(total_price) total_price,sum(cost) cost,sum(pay_postage) pay_postage,sum(pay_price) pay_price,sum(coupon_price) coupon_price,sum(deduction_price) deduction_price,from_unixtime(pay_time,\'%Y-%m-%d\') pay_time')
-            ->order('pay_time')->where('paid',1)->where('refund_status',0)
+            ->order('pay_time')->where('paid', 1)->where('refund_status', 0)
             ->group('from_unixtime(pay_time,\'%Y-%m-%d\')')->select()->toArray();
         $price = 0;
         $postage = 0;
@@ -67,11 +68,11 @@ class StoreStatistics extends BaseModel
         $coupon = 0;
         $cost = 0;
         foreach ($orderinfo as $info) {
-            $price = bcadd($price, $info['total_price'], 2);//应支付
-            $postage = bcadd($postage, $info['pay_postage'], 2);//邮费
-            $deduction = bcadd($deduction, $info['deduction_price'], 2);//抵扣
-            $coupon = bcadd($coupon, $info['coupon_price'], 2);//优惠券
-            $cost = bcadd($cost, $info['cost'], 2);//成本
+            $price = bcadd($price, $info['total_price'], 2); //应支付
+            $postage = bcadd($postage, $info['pay_postage'], 2); //邮费
+            $deduction = bcadd($deduction, $info['deduction_price'], 2); //抵扣
+            $coupon = bcadd($coupon, $info['coupon_price'], 2); //优惠券
+            $cost = bcadd($cost, $info['cost'], 2); //成本
         }
         return compact('orderinfo', 'price', 'postage', 'deduction', 'coupon', 'cost');
     }
@@ -84,11 +85,11 @@ class StoreStatistics extends BaseModel
         if ($model == null) $model = new self;
         if ('' === $status)
             return $model;
-        else if ($status == 'weixin')//微信支付
+        else if ($status == 'weixin') //微信支付
             return $model->where('pay_type', 'weixin');
-        else if ($status == 'yue')//余额支付
+        else if ($status == 'yue') //余额支付
             return $model->where('pay_type', 'yue');
-        else if ($status == 'offline')//线下支付
+        else if ($status == 'offline') //线下支付
             return $model->where('pay_type', 'offline');
         else
             return $model;
@@ -101,23 +102,24 @@ class StoreStatistics extends BaseModel
     /**
      * 获取时间区间
      */
-    public static function getTime($where,$model=null,$prefix='add_time'){
+    public static function getTime($where, $model = null, $prefix = 'add_time')
+    {
         if ($model == null) $model = new self;
-        if(!$where['date'] && !$where['data']) return $model;
+        if (!$where['date'] && !$where['data']) return $model;
         if ($where['data'] == '' && $where['date']) {
             $limitTimeList = [
-                'today'=>implode(' - ',[date('Y/m/d'),date('Y/m/d',strtotime('+1 day'))]),
-                'week'=>implode(' - ',[
+                'today' => implode(' - ', [date('Y/m/d'), date('Y/m/d', strtotime('+1 day'))]),
+                'week' => implode(' - ', [
                     date('Y/m/d', (time() - ((date('w') == 0 ? 7 : date('w')) - 1) * 24 * 3600)),
                     date('Y-m-d', (time() + (7 - (date('w') == 0 ? 7 : date('w'))) * 24 * 3600))
                 ]),
-                'month'=>implode(' - ',[date('Y/m').'/01',date('Y/m').'/'.date('t')]),
-                'quarter'=>implode(' - ',[
-                    date('Y').'/'.(ceil((date('n'))/3)*3-3+1).'/01',
-                    date('Y').'/'.(ceil((date('n'))/3)*3).'/'.date('t',mktime(0,0,0,(ceil((date('n'))/3)*3),1,date('Y')))
+                'month' => implode(' - ', [date('Y/m') . '/01', date('Y/m') . '/' . date('t')]),
+                'quarter' => implode(' - ', [
+                    date('Y') . '/' . (ceil((date('n')) / 3) * 3 - 3 + 1) . '/01',
+                    date('Y') . '/' . (ceil((date('n')) / 3) * 3) . '/' . date('t', mktime(0, 0, 0, (ceil((date('n')) / 3) * 3), 1, date('Y')))
                 ]),
-                'year'=>implode(' - ',[
-                    date('Y').'/01/01',date('Y/m/d',strtotime(date('Y').'/01/01 + 1year -1 day'))
+                'year' => implode(' - ', [
+                    date('Y') . '/01/01', date('Y/m/d', strtotime(date('Y') . '/01/01 + 1year -1 day'))
                 ])
             ];
             $where['data'] = $limitTimeList[$where['date']];
@@ -132,9 +134,9 @@ class StoreStatistics extends BaseModel
      */
     public static function getConsumption($where)
     {
-        $consumption=self::getTime($where,new UserBill,'b.add_time')->alias('a')->join('user b','a.uid = b.uid')
+        $consumption = self::getTime($where, new UserBill, 'b.add_time')->alias('a')->join('user b', 'a.uid = b.uid')
             ->field('sum(a.number) number')
-        ->where('a.type','pay_product')->find()->toArray();
+            ->where('a.type', 'pay_product')->find()->toArray();
         return $consumption;
     }
     /**
@@ -148,8 +150,9 @@ class StoreStatistics extends BaseModel
     /**
      * 获取秒杀商品
      */
-    public static function getSeckill($where){
-        $seckill=self::getTimeWhere($where)->where('seckill_id', '<>', 0)->sum('pay_price');
+    public static function getSeckill($where)
+    {
+        $seckill = self::getTimeWhere($where)->where('seckill_id', '<>', 0)->sum('pay_price');
         return $seckill;
     }
     /**
@@ -157,7 +160,7 @@ class StoreStatistics extends BaseModel
      */
     public static function getOrdinary($where)
     {
-        $ordinary = self::getTimeWhere($where)->where('pink_id',  0)->where('seckill_id','0')->sum('pay_price');
+        $ordinary = self::getTimeWhere($where)->where('pink_id',  0)->where('seckill_id', '0')->sum('pay_price');
         return $ordinary;
     }
 
@@ -166,15 +169,15 @@ class StoreStatistics extends BaseModel
      */
     public static function getRecharge($where)
     {
-            $Recharge = self::getTime($where,new UserBill)->where('type', 'system_add')->where('category','now_money')->sum('number');
-            return $Recharge;
+        $Recharge = self::getTime($where, new UserBill)->where('type', 'system_add')->where('category', 'now_money')->sum('number');
+        return $Recharge;
     }
     /**
      * 获取推广金
      */
     public static function getExtension($where)
     {
-        $extension = self::getTime($where,new UserBill)->where('type', 'brokerage')->where('category','now_money')->sum('number');
+        $extension = self::getTime($where, new UserBill)->where('type', 'brokerage')->where('category', 'now_money')->sum('number');
         return $extension;
     }
 
@@ -184,7 +187,7 @@ class StoreStatistics extends BaseModel
     public static function trans()
     {
         $trans = self::alias('a')
-            ->join('user b', 'a.uid=b.uid','left')
+            ->join('user b', 'a.uid=b.uid', 'left')
             ->join('store_order_cart_info c', 'a.id=c.oid')
             ->join('store_product d', 'c.product_id=d.id')
             ->field('b.nickname,a.pay_price,d.store_name')
@@ -197,24 +200,25 @@ class StoreStatistics extends BaseModel
     /**
      * 导出表格
      */
-    public static function systemTable($where){
-        $orderinfos=self::getOrderInfo($where);
-        if($where['export'] == 1){
+    public static function systemTable($where)
+    {
+        $orderinfos = self::getOrderInfo($where);
+        if ($where['export'] == 1) {
             $export = [];
-            $orderinfo=$orderinfos['orderinfo'];
-            foreach($orderinfo as $info){
-                $time=$info['pay_time'];
-                $price = $info['total_price']+$info['pay_postage'];
-                $zhichu = $info['coupon_price']+$info['deduction_price']+$info['cost'];
-                $profit = ($info['total_price']+$info['pay_postage'])-($info['coupon_price']+$info['deduction_price']+$info['cost']);
-                $deduction=$info['deduction_price'];//积分抵扣
-                $coupon=$info['coupon_price'];//优惠
-                $cost=$info['cost'];//成本
-                $export[] = [$time,$price,$zhichu,$cost,$coupon,$deduction,$profit];
+            $orderinfo = $orderinfos['orderinfo'];
+            foreach ($orderinfo as $info) {
+                $time = $info['pay_time'];
+                $price = $info['total_price'] + $info['pay_postage'];
+                $zhichu = $info['coupon_price'] + $info['deduction_price'] + $info['cost'];
+                $profit = ($info['total_price'] + $info['pay_postage']) - ($info['coupon_price'] + $info['deduction_price'] + $info['cost']);
+                $deduction = $info['deduction_price']; //积分抵扣
+                $coupon = $info['coupon_price']; //优惠
+                $cost = $info['cost']; //成本
+                $export[] = [$time, $price, $zhichu, $cost, $coupon, $deduction, $profit];
             }
-//            ExportService::exportCsv($export,'统计'.time(),['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)']);
+            //            ExportService::exportCsv($export,'统计'.time(),['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)']);
             dump($export);
-            PHPExcelService::setExcelHeader(['时间','营业额(元)','支出(元)','成本','优惠','积分抵扣','盈利(元)'])->setExcelTile('财务统计', '财务统计',date('Y-m-d H:i:s',time()))->setExcelContent($export)->ExcelSave();
+            PHPExcelService::setExcelHeader(['时间', '营业额(元)', '支出(元)', '成本', '优惠', '积分抵扣', '盈利(元)'])->setExcelTile('财务统计', '财务统计', date('Y-m-d H:i:s', time()))->setExcelContent($export)->ExcelSave();
         }
     }
-}
+}

app/admin/model/record/StoreVisit.php

@@ -1,8 +1,5 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
+
 namespace app\admin\model\store;
 
 use crmeb\traits\ModelTrait;
@@ -38,35 +35,39 @@ class StoreVisit extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getVisit($date,$class=[]){
-        $model=new self();
-        switch ($date){
-            case null:case 'today':case 'week':case 'year':
-                if($date==null) $date='month';
-                $model=$model->whereTime('add_time',$date);
+    public static function getVisit($date, $class = [])
+    {
+        $model = new self();
+        switch ($date) {
+            case null:
+            case 'today':
+            case 'week':
+            case 'year':
+                if ($date == null) $date = 'month';
+                $model = $model->whereTime('add_time', $date);
                 break;
             case 'quarter':
-                list($startTime,$endTime)=User::getMonth('n');
-                $model = $model->where('add_time','>',$startTime);
-                $model = $model->where('add_time','<',$endTime);
+                list($startTime, $endTime) = User::getMonth('n');
+                $model = $model->where('add_time', '>', $startTime);
+                $model = $model->where('add_time', '<', $endTime);
                 break;
             default:
-                list($startTime,$endTime)=explode('-',$date);
-                $model = $model->where('add_time','>',strtotime($startTime));
-                $model = $model->where('add_time','<',strtotime($endTime));
+                list($startTime, $endTime) = explode('-', $date);
+                $model = $model->where('add_time', '>', strtotime($startTime));
+                $model = $model->where('add_time', '<', strtotime($endTime));
                 break;
         }
-        $list=$model->group('type')->field('sum(count) as sum,product_id,cate_id,type,content')->order('sum desc')->limit(0,10)->select()->toArray();
-        $view=[];
-        foreach ($list as $key=>$val){
-            $now_list['name']=$val['type']=='viwe'?'浏览量':'搜索';
-            $now_list['value']=$val['sum'];
-            $now_list['class']=isset($class[$key])?$class[$key]:'';
-            $view[]=$now_list;
+        $list = $model->group('type')->field('sum(count) as sum,product_id,cate_id,type,content')->order('sum desc')->limit(0, 10)->select()->toArray();
+        $view = [];
+        foreach ($list as $key => $val) {
+            $now_list['name'] = $val['type'] == 'viwe' ? '浏览量' : '搜索';
+            $now_list['value'] = $val['sum'];
+            $now_list['class'] = isset($class[$key]) ? $class[$key] : '';
+            $view[] = $now_list;
         }
-        if(empty($list)){
-            $view=[['name'=>'暂无数据', 'value'=>100, 'class'=>'']];
+        if (empty($list)) {
+            $view = [['name' => '暂无数据', 'value' => 100, 'class' => '']];
         }
         return $view;
     }
-}
+}

app/admin/model/routine/RoutineFormId.php

@@ -58,4 +58,4 @@ class RoutineFormId extends BaseModel
         if ($formId == '') return true;
         return self::where('form_id', $formId)->update(['status' => 2]);
     }
-}
+}

app/admin/model/routine/RoutineTemplate.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\routine;
 
@@ -59,4 +55,4 @@ class RoutineTemplate extends BaseModel
     {
         return self::vialdWhere()->where('tempkey', $tempkey)->where('status', 1)->cache(true, 3600)->value('tempid');
     }
-}
+}

app/admin/model/sms/SmsRecord.php

@@ -2,7 +2,6 @@
 
 namespace app\admin\model\sms;
 
-use app\admin\model\system\SystemConfig;
 use crmeb\basic\BaseModel;
 use crmeb\services\sms\Sms;
 use \think\facade\Config;

app/admin/model/store/StoreCategory.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\store;
 
@@ -129,7 +125,7 @@ class StoreCategory extends BaseModel
         self::beginTrans();
         $res1 = true;
         $res2 = self::where('id', $id)->update(['is_show' => $show]);
-        if (!$pid) {//一级分类隐藏
+        if (!$pid) { //一级分类隐藏
             $count = self::where('pid', $id)->count();
             if ($count) {
                 $count      = self::where('pid', $id)->where('is_show', $show)->count();
@@ -143,4 +139,4 @@ class StoreCategory extends BaseModel
         self::checkTrans($res);
         return $res;
     }
-}
+}

app/admin/model/store/StoreProduct.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\store;
 
@@ -13,7 +9,9 @@ use crmeb\traits\ModelTrait;
 use app\admin\model\order\StoreOrder;
 use app\admin\model\store\StoreCategory as CategoryModel;
 use app\admin\model\ump\{
-    StoreBargain, StoreCombination, StoreSeckill
+    StoreBargain,
+    StoreCombination,
+    StoreSeckill
 };
 
 /**
@@ -103,9 +101,9 @@ class StoreProduct extends BaseModel
      */
     protected static function getCateSql($cateid)
     {
-        $lcateid = $cateid . ',%';//匹配最前面的cateid
-        $ccatid = '%,' . $cateid . ',%';//匹配中间的cateid
-        $ratidid = '%,' . $cateid;//匹配后面的cateid
+        $lcateid = $cateid . ',%'; //匹配最前面的cateid
+        $ccatid = '%,' . $cateid . ',%'; //匹配中间的cateid
+        $ratidid = '%,' . $cateid; //匹配后面的cateid
         return " `cate_id` LIKE '$lcateid' OR `cate_id` LIKE '$ccatid' OR `cate_id` LIKE '$ratidid' OR `cate_id`=$cateid";
     }
 
@@ -136,11 +134,11 @@ class StoreProduct extends BaseModel
         foreach ($data as &$item) {
             $cateName = CategoryModel::where('id', 'IN', $item['cate_id'])->column('cate_name', 'id');
             $item['cate_name'] = is_array($cateName) ? implode(',', $cateName) : '';
-            $item['collect'] = StoreProductRelation::where('product_id', $item['id'])->where('type', 'collect')->count();//收藏
-            $item['like'] = StoreProductRelation::where('product_id', $item['id'])->where('type', 'like')->count();//点赞
-            $item['stock'] = self::getStock($item['id']) > 0 ? self::getStock($item['id']) : $item['stock'];//库存
-            $item['stock_attr'] = self::getStock($item['id']) > 0 ? true : false;//库存
-            $item['sales_attr'] = self::getSales($item['id']);//属性销量
+            $item['collect'] = StoreProductRelation::where('product_id', $item['id'])->where('type', 'collect')->count(); //收藏
+            $item['like'] = StoreProductRelation::where('product_id', $item['id'])->where('type', 'like')->count(); //点赞
+            $item['stock'] = self::getStock($item['id']) > 0 ? self::getStock($item['id']) : $item['stock']; //库存
+            $item['stock_attr'] = self::getStock($item['id']) > 0 ? true : false; //库存
+            $item['sales_attr'] = self::getSales($item['id']); //属性销量
             $item['visitor'] = StoreVisit::where('product_id', $item['id'])->where('product_type', 'product')->count();
         }
         unset($item);
@@ -202,7 +200,6 @@ class StoreProduct extends BaseModel
         $badge = self::getbadge(compact('data'), $type);
         $count = self::setWhereType(self::getModelTime(compact('data'), new self()), $type)->count();
         return compact('datetime', 'chatrList', 'legdata', 'badge', 'count');
-
     }
 
     //获取 badge 内容
@@ -501,8 +498,10 @@ class StoreProduct extends BaseModel
         $data = self::setWhere($where)
             ->where('a.is_pay', 1)
             ->group('a.product_id')
-            ->field(['sum(a.cart_num) * b.price as sum_price', 'sum(a.cart_num) as num_product', 'b.store_name',
-                'b.image', 'b.price', 'b.id'])
+            ->field([
+                'sum(a.cart_num) * b.price as sum_price', 'sum(a.cart_num) as num_product', 'b.store_name',
+                'b.image', 'b.price', 'b.id'
+            ])
             ->order('num_product desc')
             ->whereIn('a.product_id', function ($query) {
                 $query->name('store_order_cart_info')->alias('k')->join('store_order q', 'q.id = k.oid')
@@ -702,8 +701,8 @@ class StoreProduct extends BaseModel
     /**
      * 获取库存低于 @stock 的商品数量
      */
-    public static function getProductNumStockLessThan(int $stock) : int
+    public static function getProductNumStockLessThan(int $stock): int
     {
         return self::where('stock', '<=', $stock)->where('is_show', 1)->where('is_del', 0)->count();
     }
-}
+}

app/admin/model/store/StoreProductAttr.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\store;
 
@@ -32,7 +28,7 @@ class StoreProductAttr extends BaseModel
     }
 
 
-    public static function createProductAttr($attrList, $valueList, $productId, $type=0)
+    public static function createProductAttr($attrList, $valueList, $productId, $type = 0)
     {
         $result = ['attr' => $attrList, 'value' => $valueList];
         $attrValueList = [];
@@ -96,7 +92,7 @@ class StoreProductAttr extends BaseModel
                 'cost' => $value['cost'],
                 'ot_price' => $value['ot_price'],
                 'stock' => $value['stock'],
-                'unique' => StoreProductAttrValue::where(['product_id'=>$productId,'suk'=>$suk,'type'=>$type])->value('unique') ? : '',
+                'unique' => StoreProductAttrValue::where(['product_id' => $productId, 'suk' => $suk, 'type' => $type])->value('unique') ?: '',
                 'image' => $value['pic'],
                 'bar_code' => $value['bar_code'] ?? '',
                 'weight' => $value['weight'] ?? 0,
@@ -111,7 +107,7 @@ class StoreProductAttr extends BaseModel
         if (!count($attrGroup) || !count($valueGroup)) return self::setErrorInfo('请设置至少一个属性!');
         $attrModel = new self;
         $attrValueModel = new StoreProductAttrValue;
-        if (!self::clearProductAttr($productId,$type)) return false;
+        if (!self::clearProductAttr($productId, $type)) return false;
         $res = false !== $attrModel->saveAll($attrGroup)
             && false !== $attrValueModel->saveAll($valueGroup)
             && false !== StoreProductAttrResult::setResult($result, $productId, $type);
@@ -121,11 +117,11 @@ class StoreProductAttr extends BaseModel
             return self::setErrorInfo('编辑商品属性失败!');
     }
 
-    public static function clearProductAttr($productId,$type=0)
+    public static function clearProductAttr($productId, $type = 0)
     {
         if (empty($productId) && $productId != 0) return self::setErrorInfo('商品不存在!');
         $res = false !== self::where('product_id', $productId)->where('type', $type)->delete()
-            && false !== StoreProductAttrValue::clearProductAttrValue($productId,$type);
+            && false !== StoreProductAttrValue::clearProductAttrValue($productId, $type);
         if (!$res)
             return self::setErrorInfo('编辑属性失败,清除旧属性失败!');
         else
@@ -151,8 +147,8 @@ class StoreProductAttr extends BaseModel
     /**
      * 
      */
-    public static function getLuckyAttrs(string $attr_name) : array
+    public static function getLuckyAttrs(string $attr_name): array
     {
         return self::where('attr_name', $attr_name)->select()->toArray();
     }
-}
+}

app/admin/model/store/StoreProductAttrResult.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/09
- */
 
 namespace app\admin\model\store;
 
@@ -52,5 +48,4 @@ class StoreProductAttrResult extends BaseModel
     {
         return self::where('product_id', $productId)->delete();
     }
-
-}
+}

app/admin/model/store/StoreProductAttrValue.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\store;
 
@@ -47,7 +43,7 @@ class StoreProductAttrValue extends BaseModel
         if ($productAttr->sales < 0) $productAttr->sales = 0;
         $productAttr->stock = bcadd($productAttr->stock, $num, 0);
         //活动商品有限量数
-        if($type > 0){
+        if ($type > 0) {
             $productAttr->quota = bcadd($productAttr->quota, $num, 0);
         }
         return $productAttr->save();
@@ -65,7 +61,7 @@ class StoreProductAttrValue extends BaseModel
 
         if ($res) {
             $stock = self::where('product_id', $productId)->where('unique', $unique)->where('type', $type)->value('stock');
-            $replenishment_num = sys_config('store_stock') ?? 0;//库存预警界限
+            $replenishment_num = sys_config('store_stock') ?? 0; //库存预警界限
             if ($replenishment_num >= $stock) {
                 try {
                     ChannelService::instance()->send('STORE_STOCK', ['id' => $productId]);
@@ -129,6 +125,4 @@ class StoreProductAttrValue extends BaseModel
     {
         return self::where('product_id', $productId)->where('type', $type)->delete();
     }
-
-
 }

app/admin/model/store/StoreProductRelation.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\store;
 
@@ -17,27 +13,28 @@ use crmeb\basic\BaseModel;
 class StoreProductRelation extends BaseModel
 {
 
-    /**
-     * 模型名称
-     * @var string
-     */
-    protected $name = 'store_product_relation';
-
-    use ModelTrait;
+  /**
+   * 模型名称
+   * @var string
+   */
+  protected $name = 'store_product_relation';
 
-    public static function getCollect($pid){
-      $model = new self();
-      $model = $model->where('r.product_id',$pid)->where('r.type','collect');
-      $model = $model->alias('r')->join('wechat_user u','u.uid=r.uid');
-      $model = $model->field('r.*,u.nickname');
-      return self::page($model);
-    }
-    public static function getLike($pid){
-      $model = new self();
-      $model = $model->where('r.product_id',$pid)->where('r.type','like');
-      $model = $model->alias('r')->join('wechat_user u','u.uid=r.uid');
-      $model = $model->field('r.*,u.nickname');
-      return self::page($model);
-    }
+  use ModelTrait;
 
-}
+  public static function getCollect($pid)
+  {
+    $model = new self();
+    $model = $model->where('r.product_id', $pid)->where('r.type', 'collect');
+    $model = $model->alias('r')->join('wechat_user u', 'u.uid=r.uid');
+    $model = $model->field('r.*,u.nickname');
+    return self::page($model);
+  }
+  public static function getLike($pid)
+  {
+    $model = new self();
+    $model = $model->where('r.product_id', $pid)->where('r.type', 'like');
+    $model = $model->alias('r')->join('wechat_user u', 'u.uid=r.uid');
+    $model = $model->field('r.*,u.nickname');
+    return self::page($model);
+  }
+}

app/admin/model/store/StoreProductReply.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\store;
 
@@ -135,8 +131,6 @@ class StoreProductReply extends BaseModel
         $model = $model->field('r.*,u.nickname,u.headimgurl,p.store_name');
         $model = $model->order('r.add_time desc,r.is_reply asc');
         return self::page($model, function ($itme) {
-
         }, $where);
     }
-
-}
+}

app/admin/model/store/StoreVisit.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\store;
 
@@ -39,35 +35,39 @@ class StoreVisit extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getVisit($date,$class=[]){
-        $model=new self();
-        switch ($date){
-            case null:case 'today':case 'week':case 'year':
-                if($date==null) $date='month';
-                $model=$model->whereTime('add_time',$date);
+    public static function getVisit($date, $class = [])
+    {
+        $model = new self();
+        switch ($date) {
+            case null:
+            case 'today':
+            case 'week':
+            case 'year':
+                if ($date == null) $date = 'month';
+                $model = $model->whereTime('add_time', $date);
                 break;
             case 'quarter':
-                list($startTime,$endTime)=User::getMonth('n');
-                $model = $model->where('add_time','>',$startTime);
-                $model = $model->where('add_time','<',$endTime);
+                list($startTime, $endTime) = User::getMonth('n');
+                $model = $model->where('add_time', '>', $startTime);
+                $model = $model->where('add_time', '<', $endTime);
                 break;
             default:
-                list($startTime,$endTime)=explode('-',$date);
-                $model = $model->where('add_time','>',strtotime($startTime));
-                $model = $model->where('add_time','<',strtotime($endTime));
+                list($startTime, $endTime) = explode('-', $date);
+                $model = $model->where('add_time', '>', strtotime($startTime));
+                $model = $model->where('add_time', '<', strtotime($endTime));
                 break;
         }
-        $list=$model->group('type')->field('sum(count) as sum,product_id,cate_id,type,content')->order('sum desc')->limit(0,10)->select()->toArray();
-        $view=[];
-        foreach ($list as $key=>$val){
-            $now_list['name']=$val['type']=='viwe'?'浏览量':'搜索';
-            $now_list['value']=$val['sum'];
-            $now_list['class']=isset($class[$key])?$class[$key]:'';
-            $view[]=$now_list;
+        $list = $model->group('type')->field('sum(count) as sum,product_id,cate_id,type,content')->order('sum desc')->limit(0, 10)->select()->toArray();
+        $view = [];
+        foreach ($list as $key => $val) {
+            $now_list['name'] = $val['type'] == 'viwe' ? '浏览量' : '搜索';
+            $now_list['value'] = $val['sum'];
+            $now_list['class'] = isset($class[$key]) ? $class[$key] : '';
+            $view[] = $now_list;
         }
-        if(empty($list)){
-            $view=[['name'=>'暂无数据', 'value'=>100, 'class'=>'']];
+        if (empty($list)) {
+            $view = [['name' => '暂无数据', 'value' => 100, 'class' => '']];
         }
         return $view;
     }
-}
+}

app/admin/model/system/Express.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\system;
 
@@ -36,4 +32,4 @@ class Express extends BaseModel
         $model = $model->order('sort DESC,id DESC');
         return self::page($model, $params);
     }
-}
+}

app/admin/model/system/SystemAdmin.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\system;
 
@@ -171,4 +167,4 @@ class SystemAdmin extends BaseModel
             $admin->roles = SystemRole::where('id', 'IN', $admin->roles)->column('role_name', 'id');
         }, $where);
     }
-}
+}

app/admin/model/system/SystemAttachment.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -83,7 +79,7 @@ class SystemAttachment extends BaseModel
         $model = $model->where('module_type', 1);
         if (isset($where['pid']) && $where['pid']) {
             $model = $model->where('pid', $where['pid']);
-        }else{
+        } else {
             $model = $model->where('pid', '<>', 20);
         }
         $model = $model->page((int)$where['page'], (int)$where['limit']);
@@ -129,7 +125,7 @@ class SystemAttachment extends BaseModel
      */
     public static function emptyYesterdayAttachment()
     {
-        $list = self::whereTime('time', 'yesterday')->where('module_type',2)->field('name,att_dir,att_id,image_type')->select();
+        $list = self::whereTime('time', 'yesterday')->where('module_type', 2)->field('name,att_dir,att_id,image_type')->select();
         try {
             $uploadType = (int)sys_config('upload_type', 1);
             $upload = new Upload($uploadType, [
@@ -171,21 +167,21 @@ where esa.att_dir = 'http://twongpicd.shotshock.shop/606882670534/澳乐月亮
     
         @return: ['pid'=>int, 'ppid'=>int]
      */
-    public static function getPidByProductId($productId) 
+    public static function getPidByProductId($productId)
     {
         $model = new self;
         $res = StoreProductModel::where('id', $productId)->field('image,slider_image')->select()->toArray();
         if ($res) {
-            $image=$res[0]['image'];
-            if(!$image){
+            $image = $res[0]['image'];
+            if (!$image) {
                 $arr = $res[0]['slider_image'];
-                if($arr) {
+                if ($arr) {
                     $image = $arr[0];
                 }
             }
         }
         $ids = $model::alias('a')->field('a.pid, c.pid as ppid')->join('SystemAttachmentCategory c', 'c.id=a.pid')
             ->where('a.att_dir', $image)->find();
-        return $ids ? $ids->toArray() : ['pid'=>0, 'ppid'=>0];
+        return $ids ? $ids->toArray() : ['pid' => 0, 'ppid' => 0];
     }
-}
+}

app/admin/model/system/SystemConfig.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\system;
 
@@ -46,14 +42,14 @@ class SystemConfig extends BaseModel
                     $option[$k] = explode('-', $v);
                 }
             }
-            $value_arr = [];//选项的值
+            $value_arr = []; //选项的值
             foreach ($option as $k => $v) {
                 foreach ($v as $kk => $vv)
                     if (!$kk) {
                         $value_arr[$k] = $vv;
                     }
             }
-            $i = 0;//
+            $i = 0; //
             if (is_array($value)) {
                 foreach ($value as $value_v) {
                     if (in_array($value_v, $value_arr)) {
@@ -136,7 +132,7 @@ class SystemConfig extends BaseModel
         $parameter = [];
         $option = [];
         $option_new = [];
-        $data['parameter'] = str_replace("\r\n", "\n", $data['parameter']);//防止不兼容
+        $data['parameter'] = str_replace("\r\n", "\n", $data['parameter']); //防止不兼容
         $parameter = explode("\n", $data['parameter']);
         if (count($parameter) < 2) return self::setErrorInfo('请输入正确格式的配置参数');
         foreach ($parameter as $k => $v) {
@@ -156,9 +152,9 @@ class SystemConfig extends BaseModel
             }
         }
         if (!$bool) return self::setErrorInfo('请输入正确格式的配置参数');
-        $num1 = count($option_new);//提取该数组的数目
-        $arr2 = array_unique($option_new);//合并相同的元素
-        $num2 = count($arr2);//提取合并后数组个数
+        $num1 = count($option_new); //提取该数组的数目
+        $arr2 = array_unique($option_new); //合并相同的元素
+        $num2 = count($arr2); //提取合并后数组个数
         if ($num1 > $num2) return self::setErrorInfo('请输入正确格式的配置参数');
         return true;
     }
@@ -223,7 +219,6 @@ class SystemConfig extends BaseModel
                 $config_tab[$k]['icon'] = $v['icon'];
                 $config_tab[$k]['type'] = $v['type'];
                 $config_tab[$k]['pid'] = $v['pid'];
-
             }
         }
         return $config_tab;
@@ -258,11 +253,7 @@ class SystemConfig extends BaseModel
     public static function radiotype($type = 'text')
     {
         return [
-            ['value' => 'text', 'label' => '文本框', 'disabled' => 1]
-            , ['value' => 'textarea', 'label' => '多行文本框', 'disabled' => 1]
-            , ['value' => 'radio', 'label' => '单选按钮', 'disabled' => 1]
-            , ['value' => 'upload', 'label' => '文件上传', 'disabled' => 1]
-            , ['value' => 'checkbox', 'label' => '多选按钮', 'disabled' => 1]
+            ['value' => 'text', 'label' => '文本框', 'disabled' => 1], ['value' => 'textarea', 'label' => '多行文本框', 'disabled' => 1], ['value' => 'radio', 'label' => '单选按钮', 'disabled' => 1], ['value' => 'upload', 'label' => '文件上传', 'disabled' => 1], ['value' => 'checkbox', 'label' => '多选按钮', 'disabled' => 1]
         ];
     }
 
@@ -274,10 +265,7 @@ class SystemConfig extends BaseModel
     public static function texttype($type = 'text')
     {
         return [
-            ['value' => 'input', 'label' => '文本框']
-            , ['value' => 'dateTime', 'label' => '时间']
-            , ['value' => 'color', 'label' => '颜色']
-            , ['value' => 'number', 'label' => '数字']
+            ['value' => 'input', 'label' => '文本框'], ['value' => 'dateTime', 'label' => '时间'], ['value' => 'color', 'label' => '颜色'], ['value' => 'number', 'label' => '数字']
         ];
     }
 
@@ -288,9 +276,9 @@ class SystemConfig extends BaseModel
      */
     public static function uploadtype($type = 'text')
     {
-        return [['value' => 1, 'label' => '单图']
-            , ['value' => 2, 'label' => '多图']
-            , ['value' => 3, 'label' => '文件']];
+        return [
+            ['value' => 1, 'label' => '单图'], ['value' => 2, 'label' => '多图'], ['value' => 3, 'label' => '文件']
+        ];
     }
 
     /**
@@ -313,16 +301,16 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'text');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
         $formbuider[] = Form::select('input_type', '类型')->setOptions(self::texttype());
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::input('value', '默认值');
         $formbuider[] = Form::number('width', '文本框宽(%)', 100);
         $formbuider[] = Form::input('required', '验证规则')->placeholder('多个请用,隔开例如：required:true,url:true');
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
     }
 
@@ -336,15 +324,15 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'textarea');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::textarea('value', '默认值');
         $formbuider[] = Form::number('width', '文本框宽(%)', 100);
         $formbuider[] = Form::number('high', '多行文本框高(%)', 5);
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
     }
 
@@ -358,14 +346,14 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'radio');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::textarea('parameter', '配置参数')->placeholder("参数方式例如:\n1=>男\n2=>女\n3=>保密");
         $formbuider[] = Form::input('value', '默认值');
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
     }
 
@@ -379,15 +367,14 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'upload');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::radio('upload_type', '上传类型', 1)->options(self::uploadtype());
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
-
     }
 
     /**
@@ -400,14 +387,14 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'checkbox');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::textarea('parameter', '配置参数')->placeholder("参数方式例如:\n1=>白色\n2=>红色\n3=>黑色");
-//        $formbuider[] = Form::input('value','默认值');
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::input('value','默认值');
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
     }
 
@@ -421,14 +408,14 @@ class SystemConfig extends BaseModel
     {
         $formbuider = [];
         $formbuider[] = Form::hidden('type', 'select');
-//        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
-//        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
-//        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
-//        $formbuider[] = Form::input('desc','配置简介');
+        //        $formbuider[] = Form::select('config_tab_id','分类',$tab_id)->setOptions(SystemConfig::getConfigTabAll(-1));
+        //        $formbuider[] = Form::input('info','配置名称')->autofocus(1);
+        //        $formbuider[] = Form::input('menu_name','字段变量')->placeholder('例如：site_url');
+        //        $formbuider[] = Form::input('desc','配置简介');
         $formbuider[] = Form::textarea('parameter', '配置参数')->placeholder("参数方式例如:\n1=>白色\n2=>红色\n3=>黑色");
-//        $formbuider[] = Form::input('value','默认值');
-//        $formbuider[] = Form::number('sort','排序');
-//        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
+        //        $formbuider[] = Form::input('value','默认值');
+        //        $formbuider[] = Form::number('sort','排序');
+        //        $formbuider[] = Form::radio('status','状态',1)->options(self::formstatus());
         return $formbuider;
     }
     /** 生成配置表单
@@ -440,7 +427,7 @@ class SystemConfig extends BaseModel
         $formbuider = [];
         foreach ($list as $data) {
             switch ($data['type']) {
-                case 'text'://文本框
+                case 'text': //文本框
                     switch ($data['input_type']) {
                         case 'input':
                             $data['value'] = json_decode($data['value'], true) ?: '';
@@ -463,11 +450,11 @@ class SystemConfig extends BaseModel
                             break;
                     }
                     break;
-                case 'textarea'://多行文本框
+                case 'textarea': //多行文本框
                     $data['value'] = json_decode($data['value'], true) ?: '';
                     $formbuider[] = Form::textarea($data['menu_name'], $data['info'], $data['value'])->placeholder($data['desc'])->info($data['desc'])->rows(6)->col(13);
                     break;
-                case 'radio'://单选框
+                case 'radio': //单选框
                     $data['value'] = json_decode($data['value'], true) ?: '0';
                     $parameter = explode("\n", $data['parameter']);
                     $options = [];
@@ -479,7 +466,7 @@ class SystemConfig extends BaseModel
                         $formbuider[] = Form::radio($data['menu_name'], $data['info'], $data['value'])->options($options)->info($data['desc'])->col(13);
                     }
                     break;
-                case 'upload'://文件上传
+                case 'upload': //文件上传
                     switch ($data['upload_type']) {
                         case 1:
                             $data['value'] = json_decode($data['value'], true) ?: '';
@@ -496,7 +483,7 @@ class SystemConfig extends BaseModel
                     }
 
                     break;
-                case 'checkbox'://多选框
+                case 'checkbox': //多选框
                     $data['value'] = json_decode($data['value'], true) ?: [];
                     $parameter = explode("\n", $data['parameter']);
                     $options = [];
@@ -508,7 +495,7 @@ class SystemConfig extends BaseModel
                         $formbuider[] = Form::checkbox($data['menu_name'], $data['info'], $data['value'])->options($options)->info($data['desc'])->col(13);
                     }
                     break;
-                case 'select'://多选框
+                case 'select': //多选框
                     $data['value'] = json_decode($data['value'], true) ?: [];
                     $parameter = explode("\n", $data['parameter']);
                     $options = [];
@@ -542,4 +529,4 @@ class SystemConfig extends BaseModel
         self::checkTrans($res);
         return $res;
     }
-}
+}

app/admin/model/system/SystemConfigTab.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\system;
 
@@ -103,6 +99,5 @@ class SystemConfigTab extends BaseModel
         if ($where['status'] != '') $model = $model->where('status', $where['status']);
         $model = $model->where('pid', $where['pid']);
         return self::page($model, $where);
-
     }
-}
+}

app/admin/model/system/SystemFile.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -30,6 +26,4 @@ class SystemFile extends BaseModel
     protected $name = 'system_file';
 
     use ModelTrait;
-
-
-}
+}

app/admin/model/system/SystemGroup.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -36,8 +32,9 @@ class SystemGroup extends BaseModel
      * @param $id
      * @return array
      */
-    public static function getField($id){
-        $fields = json_decode(self::where('id',$id)->value("fields"),true)?:[];
+    public static function getField($id)
+    {
+        $fields = json_decode(self::where('id', $id)->value("fields"), true) ?: [];
         return compact('fields');
     }
-}
+}

app/admin/model/system/SystemGroupData.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -89,7 +85,7 @@ class SystemGroupData extends BaseModel
             $data[$key]["id"] = $value["id"];
             $fields = json_decode($value["value"], true);
             foreach ($fields as $index => $field) {
-//                $data[$key][$index] = $field['type'] == 'upload' ? (isset($field["value"][0]) ? $field["value"][0]: ''):$field["value"];
+                //                $data[$key][$index] = $field['type'] == 'upload' ? (isset($field["value"][0]) ? $field["value"][0]: ''):$field["value"];
                 $data[$key][$index] = $field["value"];
             }
         }
@@ -133,4 +129,4 @@ class SystemGroupData extends BaseModel
         }
         return $data;
     }
-}
+}

app/admin/model/system/SystemLog.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/28
- */
 
 namespace app\admin\model\system;
 
@@ -78,7 +74,6 @@ class SystemLog extends BaseModel
             self::rollback();
             return self::setErrorInfo($e->getMessage());
         }
-
     }
 
     /**
@@ -141,4 +136,4 @@ class SystemLog extends BaseModel
         $model->where('add_time', '<', time() - 7776000);
         $model->delete();
     }
-}
+}

app/admin/model/system/SystemMenus.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\system;
 
@@ -144,14 +140,14 @@ class SystemMenus extends BaseModel
     {
         static $allAuth = null;
         static $adminAuth = null;
-        if ($allAuth === null) $allAuth = $adminFilter == true ? SystemRole::getAllAuth() : [];//所有的菜单
-        if ($adminAuth === null) $adminAuth = $adminFilter == true ? SystemAdmin::activeAdminAuthOrFail() : [];//当前登录用户的菜单
+        if ($allAuth === null) $allAuth = $adminFilter == true ? SystemRole::getAllAuth() : []; //所有的菜单
+        if ($adminAuth === null) $adminAuth = $adminFilter == true ? SystemAdmin::activeAdminAuthOrFail() : []; //当前登录用户的菜单
         foreach ($menusList as $k => $menu) {
             $menu = $menu->getData();
             if ($menu['pid'] == $pid) {
                 unset($menusList[$k]);
-                $params = json_decode($menu['params'], true);//获取参数
-                $authName = self::getAuthName($menu['action'], $menu['controller'], $menu['module'], $params);// 按钮链接
+                $params = json_decode($menu['params'], true); //获取参数
+                $authName = self::getAuthName($menu['action'], $menu['controller'], $menu['module'], $params); // 按钮链接
                 if ($pid != 0 && $adminFilter && in_array($authName, $allAuth) && (!in_array($authName, $adminAuth) || !array_key_exists($menu['id'], $adminAuth))) continue;
                 $menu['child'] = self::tidyMenuTier($adminFilter, $menusList, $menu['id']);
                 if ($pid != 0 && !count($menu['child']) && !$menu['controller'] && !$menu['action']) continue;
@@ -182,7 +178,7 @@ class SystemMenus extends BaseModel
     {
         $model = new self;
         if ($params['is_show'] !== '') $model = $model->where('is_show', $params['is_show']);
-//        if($params['access'] !== '') $model = $model->where('access',$params['access']);//子管理员是否可用
+        //        if($params['access'] !== '') $model = $model->where('access',$params['access']);//子管理员是否可用
         if ($params['pid'] !== '' && !$params['keyword']) $model = $model->where('pid', $params['pid']);
         if ($params['keyword'] !== '') $model = $model->where('menu_name|id|pid', 'LIKE', "%$params[keyword]%");
         $model = $model->order('sort DESC,id ASC');
@@ -222,5 +218,4 @@ class SystemMenus extends BaseModel
             ->order('id DESC')
             ->value('menu_name');
     }
-
-}
+}

app/admin/model/system/SystemNotice.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\system;
 
@@ -143,5 +139,4 @@ class SystemNotice extends BaseModel
                 ->update(['is_visit' => 1, 'visit_time' => time()]);
         return $list;
     }
-
-}
+}

app/admin/model/system/SystemRole.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -32,7 +28,7 @@ class SystemRole extends BaseModel
 
     public static function setRulesAttr($value)
     {
-        return is_array($value) ? implode(',',$value) : $value;
+        return is_array($value) ? implode(',', $value) : $value;
     }
 
     /**
@@ -42,50 +38,50 @@ class SystemRole extends BaseModel
      */
     public static function getRole($level = 0)
     {
-        return self::where('status',1)->where('level',$level)->column('role_name','id');
+        return self::where('status', 1)->where('level', $level)->column('role_name', 'id');
     }
 
 
     public static function rolesByAuth($rules)
     {
-        if(empty($rules)) return [];
-        $rules = self::where('id','IN',$rules)->where('status','1')->column('rules','id');
-        $rules = array_unique(explode(',',implode(',',$rules)));
-        $_auth = SystemMenus::all(function($query) use($rules){
-            $query->where('id','IN',$rules)
-                ->where('controller|action','<>','')
+        if (empty($rules)) return [];
+        $rules = self::where('id', 'IN', $rules)->where('status', '1')->column('rules', 'id');
+        $rules = array_unique(explode(',', implode(',', $rules)));
+        $_auth = SystemMenus::all(function ($query) use ($rules) {
+            $query->where('id', 'IN', $rules)
+                ->where('controller|action', '<>', '')
                 ->field('id,module,controller,action,params');
         });
-        return self::tidyAuth($_auth?:[]);
+        return self::tidyAuth($_auth ?: []);
     }
 
     public static function getAllAuth()
     {
         static $auth = null;
-        $auth === null  && ($auth = self::tidyAuth(SystemMenus::all(function($query){
-            $query->where('controller|action','<>','')->field('id,module,controller,action,params');
-        })?:[]));
+        $auth === null  && ($auth = self::tidyAuth(SystemMenus::all(function ($query) {
+            $query->where('controller|action', '<>', '')->field('id,module,controller,action,params');
+        }) ?: []));
         return $auth;
     }
 
     protected static function tidyAuth($_auth)
     {
         $auth = [];
-        foreach ($_auth as $k=>$val){
-            $auth[$val['id']] =  SystemMenus::getAuthName($val['action'],$val['controller'],$val['module'],$val['params']);
+        foreach ($_auth as $k => $val) {
+            $auth[$val['id']] =  SystemMenus::getAuthName($val['action'], $val['controller'], $val['module'], $val['params']);
         }
         return $auth;
     }
 
 
-    public static function systemPage($where){
+    public static function systemPage($where)
+    {
         $model = new self;
-        if(strlen(trim($where['role_name']))) $model = $model->where('role_name','LIKE',"%$where[role_name]%");
-        if(strlen(trim($where['status']))) $model = $model->where('status',$where['status']);
-        $model = $model->where('level',bcadd($where['level'],1,0));
-        return self::page($model,(function($item){
-            $item->rules = SystemMenus::where('id','IN',$item->rules)->column('menu_name','id');
-        }),$where);
+        if (strlen(trim($where['role_name']))) $model = $model->where('role_name', 'LIKE', "%$where[role_name]%");
+        if (strlen(trim($where['status']))) $model = $model->where('status', $where['status']);
+        $model = $model->where('level', bcadd($where['level'], 1, 0));
+        return self::page($model, (function ($item) {
+            $item->rules = SystemMenus::where('id', 'IN', $item->rules)->column('menu_name', 'id');
+        }), $where);
     }
-
-}
+}

app/admin/model/system/SystemUserLevel.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -37,7 +33,7 @@ class SystemUserLevel extends BaseModel
     }
     public static function getAddTimeAttr($value)
     {
-        return date('Y-m-d H:i:s',$value);
+        return date('Y-m-d H:i:s', $value);
     }
 
     /**
@@ -47,14 +43,14 @@ class SystemUserLevel extends BaseModel
      * @param null $model
      * @return SystemUserLevel|null
      */
-    public static function setWhere($where,$alert='',$model=null)
+    public static function setWhere($where, $alert = '', $model = null)
     {
-        $model=$model===null ? new self() : $model;
-        if($alert) $model=$model->alias($alert);
-        $alert=$alert ? $alert.'.': '';
-        $model = $model->where("{$alert}is_del",0);
-        if(isset($where['is_show']) && $where['is_show']!=='') $model=$model->where("{$alert}is_show",$where['is_show']);
-        if(isset($where['title']) && $where['title']) $model=$model->where("{$alert}name",'LIKE',"%$where[title]%");
+        $model = $model === null ? new self() : $model;
+        if ($alert) $model = $model->alias($alert);
+        $alert = $alert ? $alert . '.' : '';
+        $model = $model->where("{$alert}is_del", 0);
+        if (isset($where['is_show']) && $where['is_show'] !== '') $model = $model->where("{$alert}is_show", $where['is_show']);
+        if (isset($where['title']) && $where['title']) $model = $model->where("{$alert}name", 'LIKE', "%$where[title]%");
         return $model;
     }
 
@@ -65,10 +61,9 @@ class SystemUserLevel extends BaseModel
      */
     public static function getSytemList($where)
     {
-        $data=self::setWhere($where)->order('grade asc')->page((int)$where['page'],(int)$where['limit'])->select();
-        $data=count($data) ? $data->toArray() : [];
-        $count=self::setWhere($where)->count();
-        return compact('data','count');
+        $data = self::setWhere($where)->order('grade asc')->page((int)$where['page'], (int)$where['limit'])->select();
+        $data = count($data) ? $data->toArray() : [];
+        $count = self::setWhere($where)->count();
+        return compact('data', 'count');
     }
-
-}
+}

app/admin/model/system/SystemUserTask.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/13
- */
 
 namespace app\admin\model\system;
 
@@ -142,5 +138,4 @@ class SystemUserTask extends BaseModel
         $count = self::where('level_id', $level_id)->count();
         return compact('data', 'count');
     }
-
-}
+}

app/admin/model/system/SystemVerifyOrder.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\system;
 
@@ -16,13 +11,16 @@ use app\admin\model\wechat\WechatUser;
 use app\admin\model\store\StoreProduct;
 use app\models\routine\RoutineTemplate;
 use app\admin\model\user\{
-    User, UserBill
+    User,
+    UserBill
 };
 use app\admin\model\ump\{
-    StoreCouponUser, StorePink
+    StoreCouponUser,
+    StorePink
 };
 use crmeb\services\{
-    PHPExcelService, WechatTemplateService
+    PHPExcelService,
+    WechatTemplateService
 };
 
 /**
@@ -214,25 +212,25 @@ class SystemVerifyOrder extends BaseModel
             return $model;
         else if ($status == 8)
             return $model;
-        else if ($status == 0)//未支付
+        else if ($status == 0) //未支付
             return $model->where($alert . 'paid', 0)->where($alert . 'status', 0)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == 1)//已支付 未发货
+        else if ($status == 1) //已支付 未发货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'shipping_type', 1)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == 2)//已支付  待收货
+        else if ($status == 2) //已支付  待收货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 1)->where($alert . 'shipping_type', 1)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == 5)//已支付  待核销
+        else if ($status == 5) //已支付  待核销
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'shipping_type', 2)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == 3)// 已支付  已收货  待评价
+        else if ($status == 3) // 已支付  已收货  待评价
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 2)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == 4)// 交易完成
+        else if ($status == 4) // 交易完成
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 3)->where($alert . 'refund_status', 0)->where($alert . 'is_del', 0);
-        else if ($status == -1)//退款中
+        else if ($status == -1) //退款中
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 1)->where($alert . 'is_del', 0);
-        else if ($status == -2)//已退款
+        else if ($status == -2) //已退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 2)->where($alert . 'is_del', 0);
-        else if ($status == -3)//退款
+        else if ($status == -3) //退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 'in', '1,2')->where($alert . 'is_del', 0);
-        else if ($status == -4)//已删除
+        else if ($status == -4) //已删除
             return $model->where($alert . 'is_del', 1);
         else
             return $model;
@@ -266,13 +264,13 @@ class SystemVerifyOrder extends BaseModel
      */
     public static function getOrderPrice($where)
     {
-        $where['is_del'] = 0;//删除订单不统计
+        $where['is_del'] = 0; //删除订单不统计
         $model = new self;
         $price = [];
-        $price['pay_price'] = 0;//支付金额
-        $price['refund_price'] = 0;//退款金额
+        $price['pay_price'] = 0; //支付金额
+        $price['refund_price'] = 0; //退款金额
         $price['count_sum'] = 0; //核销订单数
-        $price['refund_sum'] = 0;//退款订单数
+        $price['refund_sum'] = 0; //退款订单数
 
         $whereData = ['is_del' => 0];
         if ($where['status'] == '') {
@@ -292,5 +290,4 @@ class SystemVerifyOrder extends BaseModel
         }
         return $price;
     }
-
-}
+}

app/admin/model/ump/StoreBargain.php

@@ -119,7 +119,6 @@ class StoreBargain extends BaseModel
         $badge = self::getbadge(compact('data'), $type);
         $count = self::setWhereType(self::getModelTime(compact('data'), new self()), $type)->count();
         return compact('datetime', 'chatrList', 'legdata', 'badge', 'count');
-
     }
 
     /**
@@ -320,8 +319,10 @@ class StoreBargain extends BaseModel
                 $list[$index] = $item;
             }
 
-            PHPExcelService::setExcelHeader(['砍价活动名称', '砍价活动简介', '砍价产品名称', '砍价金额', '成本价', '每次购买的砍价产品数量', '用户每次砍价的最大金额', '用户每次砍价的最小金额',
-                '用户每次砍价的次数', '砍价状态', '砍价开启时间', '砍价结束时间', '销量', '库存', '返多少积分', '添加时间'])
+            PHPExcelService::setExcelHeader([
+                '砍价活动名称', '砍价活动简介', '砍价产品名称', '砍价金额', '成本价', '每次购买的砍价产品数量', '用户每次砍价的最大金额', '用户每次砍价的最小金额',
+                '用户每次砍价的次数', '砍价状态', '砍价开启时间', '砍价结束时间', '销量', '库存', '返多少积分', '添加时间'
+            ])
                 ->setExcelTile('砍价产品导出', '产品信息' . time(), ' 生成时间：' . date('Y-m-d H:i:s', time()))
                 ->setExcelContent($export)
                 ->ExcelSave();
@@ -335,9 +336,9 @@ class StoreBargain extends BaseModel
                 else if ($item['stop_time'] > time() && $item['start_time'] < time())
                     $item['start_name'] = '正在进行中';
             }
-            $item['count_people_all'] = StoreBargainUser::getCountPeopleAll($item['id']);//参与人数
-            $item['count_people_help'] = StoreBargainUserHelp::getCountPeopleHelp($item['id']);//帮忙砍价人数
-            $item['count_people_success'] = StoreBargainUser::getCountPeopleAll($item['id'], 3);//砍价成功人数
+            $item['count_people_all'] = StoreBargainUser::getCountPeopleAll($item['id']); //参与人数
+            $item['count_people_help'] = StoreBargainUserHelp::getCountPeopleHelp($item['id']); //帮忙砍价人数
+            $item['count_people_success'] = StoreBargainUser::getCountPeopleAll($item['id'], 3); //砍价成功人数
         }, $where);
     }
 
@@ -374,4 +375,4 @@ class StoreBargain extends BaseModel
     {
         return self::where('id', $id)->value($field);
     }
-}
+}

app/admin/model/ump/StoreCombination.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\ump;
 
@@ -66,9 +62,9 @@ class StoreCombination extends BaseModel
     {
         $model = self::setWhere($where)->limit(bcmul($where['page'], $where['limit'], 0), $where['limit']);
         return self::page($model, function ($item) {
-            $item['count_people_all'] = StorePink::getCountPeopleAll($item['id']);//参与人数
-            $item['count_people_pink'] = StorePink::getCountPeoplePink($item['id']);//成团人数
-            $item['count_people_browse'] = self::getVisitPeople($item['id']);//访问人数
+            $item['count_people_all'] = StorePink::getCountPeopleAll($item['id']); //参与人数
+            $item['count_people_pink'] = StorePink::getCountPeoplePink($item['id']); //成团人数
+            $item['count_people_browse'] = self::getVisitPeople($item['id']); //访问人数
         }, $where, $where['limit']);
     }
 
@@ -82,9 +78,9 @@ class StoreCombination extends BaseModel
         count($list) && $list = $list->toArray();
         $excel = [];
         foreach ($list as $item) {
-            $item['count_people_all'] = StorePink::getCountPeopleAll($item['id']);//参与人数
-            $item['count_people_pink'] = StorePink::getCountPeoplePink($item['id']);//成团人数
-            $item['count_people_browse'] = self::getVisitPeople($item['id']);//访问人数
+            $item['count_people_all'] = StorePink::getCountPeopleAll($item['id']); //参与人数
+            $item['count_people_pink'] = StorePink::getCountPeoplePink($item['id']); //成团人数
+            $item['count_people_browse'] = self::getVisitPeople($item['id']); //访问人数
             $item['_stop_time'] = date('Y/m/d H:i:s', $item['stop_time']);
             $excel[] = [
                 $item['id'],
@@ -133,11 +129,11 @@ class StoreCombination extends BaseModel
     public static function getStatistics()
     {
         $statistics = [];
-        $statistics['browseCount'] = self::value('sum(browse) as browse');//总展现量
+        $statistics['browseCount'] = self::value('sum(browse) as browse'); //总展现量
         $statistics['browseCount'] = $statistics['browseCount'] ? $statistics['browseCount'] : 0;
-        $statistics['visitCount'] = StoreVisit::where('product_type', 'combination')->count();//访客人数
-        $statistics['partakeCount'] = StorePink::getCountPeopleAll();//参与人数
-        $statistics['pinkCount'] = StorePink::getCountPeoplePink();//成团数量
+        $statistics['visitCount'] = StoreVisit::where('product_type', 'combination')->count(); //访客人数
+        $statistics['partakeCount'] = StorePink::getCountPeopleAll(); //参与人数
+        $statistics['pinkCount'] = StorePink::getCountPeoplePink(); //成团数量
         return compact('statistics');
     }
 
@@ -487,5 +483,4 @@ class StoreCombination extends BaseModel
     {
         return self::where('id', $id)->value($field);
     }
-
-}
+}

app/admin/model/ump/StoreCombinationAttr.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\ump;
 
@@ -21,28 +17,28 @@ class StoreCombinationAttr extends BaseModel
 
     protected function setAttrValuesAttr($value)
     {
-        return is_array($value) ? implode(',',$value) : $value;
+        return is_array($value) ? implode(',', $value) : $value;
     }
 
     protected function getAttrValuesAttr($value)
     {
-        return explode(',',$value);
+        return explode(',', $value);
     }
 
 
-    public static function createProductAttr($attrList,$valueList,$productId)
+    public static function createProductAttr($attrList, $valueList, $productId)
     {
-        $result = ['attr'=>$attrList,'value'=>$valueList];
+        $result = ['attr' => $attrList, 'value' => $valueList];
         $attrValueList = [];
         $attrNameList = [];
-        foreach ($attrList as $index=>$attr){
-            if(!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!');
+        foreach ($attrList as $index => $attr) {
+            if (!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!');
             $attr['value'] = trim($attr['value']);
-            if(!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!!');
-            if(!isset($attr['detail']) || !count($attr['detail'])) return self::setErrorInfo('请输入属性名称!');
-            foreach ($attr['detail'] as $k=>$attrValue){
+            if (!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!!');
+            if (!isset($attr['detail']) || !count($attr['detail'])) return self::setErrorInfo('请输入属性名称!');
+            foreach ($attr['detail'] as $k => $attrValue) {
                 $attrValue = trim($attrValue);
-                if(empty($attrValue)) return self::setErrorInfo('请输入正确的属性');
+                if (empty($attrValue)) return self::setErrorInfo('请输入正确的属性');
                 $attr['detail'][$k] = $attrValue;
                 $attrValueList[] = $attrValue;
                 $attr['detail'][$k] = $attrValue;
@@ -51,54 +47,54 @@ class StoreCombinationAttr extends BaseModel
             $attrList[$index] = $attr;
         }
         $attrCount = count($attrList);
-        foreach ($valueList as $index=>$value){
-            if(!isset($value['detail']) || count($value['detail']) != $attrCount) return self::setErrorInfo('请填写正确的商品信息');
-            if(!isset($value['price']) || !is_numeric($value['price']) || floatval($value['price']) != $value['price'])
+        foreach ($valueList as $index => $value) {
+            if (!isset($value['detail']) || count($value['detail']) != $attrCount) return self::setErrorInfo('请填写正确的商品信息');
+            if (!isset($value['price']) || !is_numeric($value['price']) || floatval($value['price']) != $value['price'])
                 return self::setErrorInfo('请填写正确的商品价格');
-            if(!isset($value['sales']) || !is_numeric($value['sales']) || intval($value['sales']) != $value['sales'])
+            if (!isset($value['sales']) || !is_numeric($value['sales']) || intval($value['sales']) != $value['sales'])
                 return self::setErrorInfo('请填写正确的商品库存');
-            if(!isset($value['pic']) || empty($value['pic']))
+            if (!isset($value['pic']) || empty($value['pic']))
                 return self::setErrorInfo('请上传商品图片');
-            foreach ($value['detail'] as $attrName=>$attrValue){
+            foreach ($value['detail'] as $attrName => $attrValue) {
                 $attrName = trim($attrName);
                 $attrValue = trim($attrValue);
-                if(!in_array($attrName,$attrNameList,true)) return self::setErrorInfo($attrName.'规则不存在');
-                if(!in_array($attrValue,$attrValueList,true)) return self::setErrorInfo($attrName.'属性不存在');
-                if(empty($attrName)) return self::setErrorInfo('请输入正确的属性');
+                if (!in_array($attrName, $attrNameList, true)) return self::setErrorInfo($attrName . '规则不存在');
+                if (!in_array($attrValue, $attrValueList, true)) return self::setErrorInfo($attrName . '属性不存在');
+                if (empty($attrName)) return self::setErrorInfo('请输入正确的属性');
                 $value['detail'][$attrName] = $attrValue;
             }
             $valueList[$index] = $value;
         }
         $attrGroup = [];
         $valueGroup = [];
-        foreach ($attrList as $k=>$value){
+        foreach ($attrList as $k => $value) {
             $attrGroup[] = [
-                'product_id'=>$productId,
-                'attr_name'=>$value['value'],
-                'attr_values'=>$value['detail']
+                'product_id' => $productId,
+                'attr_name' => $value['value'],
+                'attr_values' => $value['detail']
             ];
         }
-        foreach ($valueList as $k=>$value){
-            ksort($value['detail'],SORT_STRING);
-            $suk = implode(',',$value['detail']);
+        foreach ($valueList as $k => $value) {
+            ksort($value['detail'], SORT_STRING);
+            $suk = implode(',', $value['detail']);
             $valueGroup[$suk] = [
-                'product_id'=>$productId,
-                'suk'=>$suk,
-                'price'=>$value['price'],
-                'stock'=>$value['sales'],
-                'image'=>$value['pic']
+                'product_id' => $productId,
+                'suk' => $suk,
+                'price' => $value['price'],
+                'stock' => $value['sales'],
+                'image' => $value['pic']
             ];
         }
-        if(!count($attrGroup) || !count($valueGroup)) return self::setErrorInfo('请设置至少一个属性!');
+        if (!count($attrGroup) || !count($valueGroup)) return self::setErrorInfo('请设置至少一个属性!');
         $attrModel = new self;
         $attrValueModel = new StoreCombinationAttrValue;
         self::beginTrans();
-        if(!self::clearProductAttr($productId)) return false;
+        if (!self::clearProductAttr($productId)) return false;
         $res = false !== $attrModel->saveAll($attrGroup)
             && false !== $attrValueModel->saveAll($valueGroup)
-        && false !== StoreCombinationAttrResult::setResult($result,$productId);
+            && false !== StoreCombinationAttrResult::setResult($result, $productId);
         self::checkTrans($res);
-        if($res)
+        if ($res)
             return true;
         else
             return self::setErrorInfo('编辑商品属性失败!');
@@ -107,12 +103,11 @@ class StoreCombinationAttr extends BaseModel
     public static function clearProductAttr($productId)
     {
         if (empty($productId) && $productId != 0) return self::setErrorInfo('商品不存在!');
-        $res = false !== self::where('product_id',$productId)->delete()
+        $res = false !== self::where('product_id', $productId)->delete()
             && false !== StoreCombinationAttrValue::clearProductAttrValue($productId);
-        if(!$res)
+        if (!$res)
             return self::setErrorInfo('编辑属性失败,清除旧属性失败!');
         else
             return true;
     }
-
-}
+}

app/admin/model/ump/StoreCombinationAttrResult.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/09
- */
 
 namespace app\admin\model\ump;
 
@@ -32,21 +28,20 @@ class StoreCombinationAttrResult extends BaseModel
         return is_array($value) ? json_encode($value) : $value;
     }
 
-    public static function setResult($result,$product_id)
+    public static function setResult($result, $product_id)
     {
         $result = self::setResultAttr($result);
         $change_time = self::setChangeTimeAttr(0);
-        return self::insert(compact('product_id','result','change_time'),true);
+        return self::insert(compact('product_id', 'result', 'change_time'), true);
     }
 
     public static function getResult($productId)
     {
-        return json_decode(self::where('product_id',$productId)->value('result'),true) ?: [];
+        return json_decode(self::where('product_id', $productId)->value('result'), true) ?: [];
     }
 
     public static function clearResult($productId)
     {
         return self::del($productId);
     }
-
-}
+}

app/admin/model/ump/StoreCombinationAttrValue.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\ump;
 
@@ -23,31 +19,29 @@ class StoreCombinationAttrValue extends BaseModel
 
     protected function setSukAttr($value)
     {
-        return is_array($value) ? implode(',',$value) : $value;
+        return is_array($value) ? implode(',', $value) : $value;
     }
 
-    protected function setUniqueAttr($value,$data)
+    protected function setUniqueAttr($value, $data)
     {
-        if(is_array($data['suk'])) $data['suk'] = $this->setSukAttr($data['suk']);
-        return self::uniqueId($data['product_id'].$data['suk'].uniqid(true));
+        if (is_array($data['suk'])) $data['suk'] = $this->setSukAttr($data['suk']);
+        return self::uniqueId($data['product_id'] . $data['suk'] . uniqid(true));
     }
 
-    public static function decProductAttrStock($productId,$unique,$num)
+    public static function decProductAttrStock($productId, $unique, $num)
     {
-        return false !== self::where('product_id',$productId)->where('unique',$unique)
-            ->dec('stock',$num)->inc('sales',$num)->update();
+        return false !== self::where('product_id', $productId)->where('unique', $unique)
+            ->dec('stock', $num)->inc('sales', $num)->update();
     }
 
 
     public static function uniqueId($key)
     {
-        return substr(md5($key),12,8);
+        return substr(md5($key), 12, 8);
     }
 
     public static function clearProductAttrValue($productId)
     {
-        return self::where('product_id',$productId)->delete();
+        return self::where('product_id', $productId)->delete();
     }
-
-
-}
+}

app/admin/model/ump/StoreCoupon.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\ump;
 
@@ -43,7 +39,7 @@ class StoreCoupon extends BaseModel
         if ($where['status'] != '') $model = $model->where('status', $where['status']);
         if ($where['type'] != '') $model = $model->where('type', $where['type']);
         if ($where['title'] != '') $model = $model->where('title', 'LIKE', "%$where[title]%");
-//        if($where['is_del'] != '')  $model = $model->where('is_del',$where['is_del']);
+        //        if($where['is_del'] != '')  $model = $model->where('is_del',$where['is_del']);
         $model = $model->where('is_del', 0);
         $model = $model->order('id desc');
         return self::page($model, $where);
@@ -58,7 +54,7 @@ class StoreCoupon extends BaseModel
         $model = new self;
         if ($where['status'] != '') $model = $model->where('status', $where['status']);
         if ($where['title'] != '') $model = $model->where('title', 'LIKE', "%$where[title]%");
-//        if($where['is_del'] != '')  $model = $model->where('is_del',$where['is_del']);
+        //        if($where['is_del'] != '')  $model = $model->where('is_del',$where['is_del']);
         $model = $model->where('is_del', 0);
         $model = $model->where('status', 1);
         $model = $model->order('sort desc,id desc');
@@ -75,7 +71,6 @@ class StoreCoupon extends BaseModel
         $res = $res1 && $res2 && $res3;
         self::checkTrans($res);
         return $res;
-
     }
 
     /**
@@ -111,4 +106,4 @@ class StoreCoupon extends BaseModel
         $formbuider[] = Form::hidden('product_id', 0);
         return $formbuider;
     }
-}
+}

app/admin/model/ump/StoreCouponIssue.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/17
- */
 
 namespace app\admin\model\ump;
 
@@ -69,4 +65,4 @@ class StoreCouponIssue extends BaseModel
     {
         return self::create(compact('cid', 'start_time', 'end_time', 'total_count', 'remain_count', 'status', 'is_permanent', 'full_reduction', 'is_give_subscribe', 'is_full_give'));
     }
-}
+}

app/admin/model/ump/StoreCouponIssueUser.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/23
- */
 
 namespace app\admin\model\ump;
 
@@ -29,5 +25,4 @@ class StoreCouponIssueUser extends BaseModel
             return $item;
         }, ['id' => $issue_coupon_id]);
     }
-
-}
+}

app/admin/model/ump/StoreCouponUser.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\ump;
 
@@ -44,7 +40,7 @@ class StoreCouponUser extends BaseModel
             $uid = UserModel::where('nickname', 'LIKE', "%$where[nickname]%")->column('uid', 'uid');
             $model = $model->where('uid', 'IN', implode(',', $uid));
         };
-//        $model = $model->where('is_del',0);
+        //        $model = $model->where('is_del',0);
         $model = $model->order('id desc');
         return self::page($model, function ($item) {
             $item['nickname'] = UserModel::where('uid', $item['uid'])->value('nickname');
@@ -90,4 +86,4 @@ class StoreCouponUser extends BaseModel
         if ($status) return self::where('id', $id)->update(['status' => 0, 'use_time' => '']);
         else return true;
     }
-}
+}

app/admin/model/ump/StoreSeckill.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\ump;
 
@@ -109,7 +105,6 @@ class StoreSeckill extends BaseModel
         $badge = self::getbadge(compact('data'), $type);
         $count = self::setWhereType(self::getModelTime(compact('data'), new self()), $type)->count();
         return compact('datetime', 'chatrList', 'legdata', 'badge', 'count');
-
     }
 
     /**
@@ -283,7 +278,7 @@ class StoreSeckill extends BaseModel
     {
         $model = new self;
         $model = $model->alias('s');
-//        $model = $model->join('StoreProduct p','p.id=s.product_id');
+        //        $model = $model->join('StoreProduct p','p.id=s.product_id');
         if ($where['status'] != '') $model = $model->where('s.status', $where['status']);
         if ($where['store_name'] != '') $model = $model->where('s.title|s.id', 'LIKE', "%$where[store_name]%");
         $model = $model->page(bcmul($where['page'], $where['limit'], 0), $where['limit']);
@@ -316,7 +311,6 @@ class StoreSeckill extends BaseModel
                     }
                 }
             } else $item['start_name'] = '关闭';
-
         }, $where, $where['limit']);
     }
 
@@ -397,6 +391,6 @@ class StoreSeckill extends BaseModel
      */
     public static function checkSeckill($product_id, $time_id)
     {
-        return self::where('product_id', $product_id)->where('time_id', $time_id)->where('is_del',0)->find();
+        return self::where('product_id', $product_id)->where('time_id', $time_id)->where('is_del', 0)->find();
     }
-}
+}

app/admin/model/ump/StoreSeckillAttr.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\ump;
 
@@ -21,28 +17,28 @@ class StoreSeckillAttr extends BaseModel
 
     protected function setAttrValuesAttr($value)
     {
-        return is_array($value) ? implode(',',$value) : $value;
+        return is_array($value) ? implode(',', $value) : $value;
     }
 
     protected function getAttrValuesAttr($value)
     {
-        return explode(',',$value);
+        return explode(',', $value);
     }
 
 
-    public static function createProductAttr($attrList,$valueList,$productId)
+    public static function createProductAttr($attrList, $valueList, $productId)
     {
-        $result = ['attr'=>$attrList,'value'=>$valueList];
+        $result = ['attr' => $attrList, 'value' => $valueList];
         $attrValueList = [];
         $attrNameList = [];
-        foreach ($attrList as $index=>$attr){
-            if(!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!');
+        foreach ($attrList as $index => $attr) {
+            if (!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!');
             $attr['value'] = trim($attr['value']);
-            if(!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!!');
-            if(!isset($attr['detail']) || !count($attr['detail'])) return self::setErrorInfo('请输入属性名称!');
-            foreach ($attr['detail'] as $k=>$attrValue){
+            if (!isset($attr['value'])) return self::setErrorInfo('请输入规则名称!!');
+            if (!isset($attr['detail']) || !count($attr['detail'])) return self::setErrorInfo('请输入属性名称!');
+            foreach ($attr['detail'] as $k => $attrValue) {
                 $attrValue = trim($attrValue);
-                if(empty($attrValue)) return self::setErrorInfo('请输入正确的属性');
+                if (empty($attrValue)) return self::setErrorInfo('请输入正确的属性');
                 $attr['detail'][$k] = $attrValue;
                 $attrValueList[] = $attrValue;
                 $attr['detail'][$k] = $attrValue;
@@ -51,54 +47,54 @@ class StoreSeckillAttr extends BaseModel
             $attrList[$index] = $attr;
         }
         $attrCount = count($attrList);
-        foreach ($valueList as $index=>$value){
-            if(!isset($value['detail']) || count($value['detail']) != $attrCount) return self::setErrorInfo('请填写正确的商品信息');
-            if(!isset($value['price']) || !is_numeric($value['price']) || floatval($value['price']) != $value['price'])
+        foreach ($valueList as $index => $value) {
+            if (!isset($value['detail']) || count($value['detail']) != $attrCount) return self::setErrorInfo('请填写正确的商品信息');
+            if (!isset($value['price']) || !is_numeric($value['price']) || floatval($value['price']) != $value['price'])
                 return self::setErrorInfo('请填写正确的商品价格');
-            if(!isset($value['sales']) || !is_numeric($value['sales']) || intval($value['sales']) != $value['sales'])
+            if (!isset($value['sales']) || !is_numeric($value['sales']) || intval($value['sales']) != $value['sales'])
                 return self::setErrorInfo('请填写正确的商品库存');
-            if(!isset($value['pic']) || empty($value['pic']))
+            if (!isset($value['pic']) || empty($value['pic']))
                 return self::setErrorInfo('请上传商品图片');
-            foreach ($value['detail'] as $attrName=>$attrValue){
+            foreach ($value['detail'] as $attrName => $attrValue) {
                 $attrName = trim($attrName);
                 $attrValue = trim($attrValue);
-                if(!in_array($attrName,$attrNameList,true)) return self::setErrorInfo($attrName.'规则不存在');
-                if(!in_array($attrValue,$attrValueList,true)) return self::setErrorInfo($attrName.'属性不存在');
-                if(empty($attrName)) return self::setErrorInfo('请输入正确的属性');
+                if (!in_array($attrName, $attrNameList, true)) return self::setErrorInfo($attrName . '规则不存在');
+                if (!in_array($attrValue, $attrValueList, true)) return self::setErrorInfo($attrName . '属性不存在');
+                if (empty($attrName)) return self::setErrorInfo('请输入正确的属性');
                 $value['detail'][$attrName] = $attrValue;
             }
             $valueList[$index] = $value;
         }
         $attrGroup = [];
         $valueGroup = [];
-        foreach ($attrList as $k=>$value){
+        foreach ($attrList as $k => $value) {
             $attrGroup[] = [
-                'product_id'=>$productId,
-                'attr_name'=>$value['value'],
-                'attr_values'=>$value['detail']
+                'product_id' => $productId,
+                'attr_name' => $value['value'],
+                'attr_values' => $value['detail']
             ];
         }
-        foreach ($valueList as $k=>$value){
-            ksort($value['detail'],SORT_STRING);
-            $suk = implode(',',$value['detail']);
+        foreach ($valueList as $k => $value) {
+            ksort($value['detail'], SORT_STRING);
+            $suk = implode(',', $value['detail']);
             $valueGroup[$suk] = [
-                'product_id'=>$productId,
-                'suk'=>$suk,
-                'price'=>$value['price'],
-                'stock'=>$value['sales'],
-                'image'=>$value['pic']
+                'product_id' => $productId,
+                'suk' => $suk,
+                'price' => $value['price'],
+                'stock' => $value['sales'],
+                'image' => $value['pic']
             ];
         }
-        if(!count($attrGroup) || !count($valueGroup)) return self::setErrorInfo('请设置至少一个属性!');
+        if (!count($attrGroup) || !count($valueGroup)) return self::setErrorInfo('请设置至少一个属性!');
         $attrModel = new self;
         $attrValueModel = new StoreSeckillAttrValue;
         self::beginTrans();
-        if(!self::clearProductAttr($productId)) return false;
+        if (!self::clearProductAttr($productId)) return false;
         $res = false !== $attrModel->saveAll($attrGroup)
             && false !== $attrValueModel->saveAll($valueGroup)
-        && false !== StoreSeckillAttrResult::setResult($result,$productId);
+            && false !== StoreSeckillAttrResult::setResult($result, $productId);
         self::checkTrans($res);
-        if($res)
+        if ($res)
             return true;
         else
             return self::setErrorInfo('编辑商品属性失败!');
@@ -107,12 +103,11 @@ class StoreSeckillAttr extends BaseModel
     public static function clearProductAttr($productId)
     {
         if (empty($productId) && $productId != 0) return self::setErrorInfo('商品不存在!');
-        $res = false !== self::where('product_id',$productId)->delete()
+        $res = false !== self::where('product_id', $productId)->delete()
             && false !== StoreSeckillAttrValue::clearProductAttrValue($productId);
-        if(!$res)
+        if (!$res)
             return self::setErrorInfo('编辑属性失败,清除旧属性失败!');
         else
             return true;
     }
-
-}
+}

app/admin/model/ump/StoreSeckillAttrResult.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/09
- */
 
 namespace app\admin\model\ump;
 
@@ -31,21 +27,20 @@ class StoreSeckillAttrResult extends BaseModel
         return is_array($value) ? json_encode($value) : $value;
     }
 
-    public static function setResult($result,$product_id)
+    public static function setResult($result, $product_id)
     {
         $result = self::setResultAttr($result);
         $change_time = self::setChangeTimeAttr(0);
-        return self::insert(compact('product_id','result','change_time'),true);
+        return self::insert(compact('product_id', 'result', 'change_time'), true);
     }
 
     public static function getResult($productId)
     {
-        return json_decode(self::where('product_id',$productId)->value('result'),true) ?: [];
+        return json_decode(self::where('product_id', $productId)->value('result'), true) ?: [];
     }
 
     public static function clearResult($productId)
     {
         return self::del($productId);
     }
-
-}
+}

app/admin/model/ump/StoreSeckillAttrValue.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/08
- */
 
 namespace app\admin\model\ump;
 
@@ -23,31 +19,29 @@ class StoreSeckillAttrValue extends BaseModel
 
     protected function setSukAttr($value)
     {
-        return is_array($value) ? implode(',',$value) : $value;
+        return is_array($value) ? implode(',', $value) : $value;
     }
 
-    protected function setUniqueAttr($value,$data)
+    protected function setUniqueAttr($value, $data)
     {
-        if(is_array($data['suk'])) $data['suk'] = $this->setSukAttr($data['suk']);
-        return self::uniqueId($data['product_id'].$data['suk'].uniqid(true));
+        if (is_array($data['suk'])) $data['suk'] = $this->setSukAttr($data['suk']);
+        return self::uniqueId($data['product_id'] . $data['suk'] . uniqid(true));
     }
 
-    public static function decProductAttrStock($productId,$unique,$num)
+    public static function decProductAttrStock($productId, $unique, $num)
     {
-        return false !== self::where('product_id',$productId)->where('unique',$unique)
-            ->dec('stock',$num)->inc('sales',$num)->update();
+        return false !== self::where('product_id', $productId)->where('unique', $unique)
+            ->dec('stock', $num)->inc('sales', $num)->update();
     }
 
 
     public static function uniqueId($key)
     {
-        return substr(md5($key),12,8);
+        return substr(md5($key), 12, 8);
     }
 
     public static function clearProductAttrValue($productId)
     {
-        return self::where('product_id',$productId)->delete();
+        return self::where('product_id', $productId)->delete();
     }
-
-
-}
+}

app/admin/model/user/User.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\user;
 
@@ -47,23 +43,23 @@ class User extends BaseModel
             if (!count($uid)) return 0;
         } else
             $uid = [$uid];
-        $brokerage = UserBill::getBrokerage($uid, 'now_money', 'brokerage', $where);//获取总佣金
-        $recharge = UserBill::getBrokerage($uid, 'now_money', 'recharge', $where);//累计充值
-        $extractTotalPrice = UserExtract::userExtractTotalPrice($uid, 1, $where);//累计提现
+        $brokerage = UserBill::getBrokerage($uid, 'now_money', 'brokerage', $where); //获取总佣金
+        $recharge = UserBill::getBrokerage($uid, 'now_money', 'recharge', $where); //累计充值
+        $extractTotalPrice = UserExtract::userExtractTotalPrice($uid, 1, $where); //累计提现
         if ($brokerage > $extractTotalPrice) {
-            $orderYuePrice = self::getModelTime($where, StoreOrder::where('uid', 'in', $uid)->where(['is_del' => 0, 'paid' => 1]))->sum('pay_price');//余额累计消费
-            $systemAdd = UserBill::getBrokerage($uid, 'now_money', 'system_add', $where);//后台添加余额
-            $yueCount = bcadd($recharge, $systemAdd, 2);// 后台添加余额 + 累计充值  = 非佣金的总金额
-            $orderYuePrice = $yueCount > $orderYuePrice ? 0 : bcsub($orderYuePrice, $yueCount, 2);// 余额累计消费（使用佣金消费的金额）
-            $brokerage = bcsub($brokerage, $extractTotalPrice, 2);//减去已提现金额
+            $orderYuePrice = self::getModelTime($where, StoreOrder::where('uid', 'in', $uid)->where(['is_del' => 0, 'paid' => 1]))->sum('pay_price'); //余额累计消费
+            $systemAdd = UserBill::getBrokerage($uid, 'now_money', 'system_add', $where); //后台添加余额
+            $yueCount = bcadd($recharge, $systemAdd, 2); // 后台添加余额 + 累计充值  = 非佣金的总金额
+            $orderYuePrice = $yueCount > $orderYuePrice ? 0 : bcsub($orderYuePrice, $yueCount, 2); // 余额累计消费（使用佣金消费的金额）
+            $brokerage = bcsub($brokerage, $extractTotalPrice, 2); //减去已提现金额
             $extract_price = UserExtract::userExtractTotalPrice($uid, 0, $where);
-            $brokerage = $extract_price < $brokerage ? bcsub($brokerage, $extract_price, 2) : 0;//减去审核中的提现金额
-            $brokerage = $brokerage > $orderYuePrice ? bcsub($brokerage, $orderYuePrice, 2) : 0;//减掉余额支付
+            $brokerage = $extract_price < $brokerage ? bcsub($brokerage, $extract_price, 2) : 0; //减去审核中的提现金额
+            $brokerage = $brokerage > $orderYuePrice ? bcsub($brokerage, $orderYuePrice, 2) : 0; //减掉余额支付
         } else {
             $brokerage = 0;
         }
         $num = (float)bcsub($brokerage, $extractTotalPrice, 2);
-        return $num > 0 ? $num : 0;//可提现
+        return $num > 0 ? $num : 0; //可提现
     }
 
     /**
@@ -150,15 +146,15 @@ class User extends BaseModel
             ->select()
             ->each(function ($item) {
                 $item['group_name'] = '';
-                if($item['group_id']){
-                    $group = UserGroup::where('id',$item['group_id'])->find();
+                if ($item['group_id']) {
+                    $group = UserGroup::where('id', $item['group_id'])->find();
                     $item['group_name'] = $group ? $group['group_name'] : '';
                 }
                 $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-                if ($item['last_time']) $item['last_time'] = date('Y-m-d H:i:s', $item['last_time']);//最近一次访问日期
-                else $item['last_time'] = '无访问';//最近一次访问日期
+                if ($item['last_time']) $item['last_time'] = date('Y-m-d H:i:s', $item['last_time']); //最近一次访问日期
+                else $item['last_time'] = '无访问'; //最近一次访问日期
                 self::edit(['pay_count' => StoreOrder::getUserCountPay($item['uid'])], $item['uid']);
-                $item['extract_count_price'] = UserExtract::getUserCountPrice($item['uid']);//累计提现
+                $item['extract_count_price'] = UserExtract::getUserCountPrice($item['uid']); //累计提现
                 if ($item['spread_uid']) {
                     $item['spread_uid_nickname'] = self::where('uid', $item['spread_uid'])->value('nickname') . '/' . $item['spread_uid'];
                 } else {
@@ -184,7 +180,7 @@ class User extends BaseModel
                     if ($levelinfo['is_forever']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
                     else if (time() > $levelinfo['valid_time']) $item['vip_name'] = SystemUserLevel::where('id', $levelinfo['level_id'])->value('name');
                 }
-            });//->toArray();
+            }); //->toArray();
         $count = self::setWherePage(self::setWhere($where), $where, ['w.sex', 'w.province', 'w.city', 'u.status', 'u.is_promoter'], ['u.nickname', 'u.uid'])->alias('u')->join('WechatUser w', 'u.uid=w.uid')->count();
         return ['count' => $count, 'data' => $list];
     }
@@ -632,7 +628,7 @@ class User extends BaseModel
                 ->where('pm', 0)
                 ->sum('number');
             if ($value['sum_number'] > $refund_commission)
-                $value['sum_number'] = bcsub($value['sum_number'],$refund_commission,2);
+                $value['sum_number'] = bcsub($value['sum_number'], $refund_commission, 2);
             else
                 $value['sum_number'] = 0;
             $value['ex_price'] = UserExtract::where('uid', $value['uid'])->sum('extract_price');
@@ -665,7 +661,7 @@ class User extends BaseModel
             ->join('user_bill B', 'B.uid=A.uid')
             ->group('A.uid')
             ->where('B.type', 'brokerage')
-            ->where('B.pm',1)
+            ->where('B.pm', 1)
             ->where('B.category', 'now_money')
             ->field('sum(B.number) as sum_number,A.nickname,A.uid,A.now_money,A.brokerage_price');
         if ($where['order'] == '') {
@@ -694,13 +690,13 @@ class User extends BaseModel
     public static function getUserinfo($uid)
     {
         $userinfo = self::where('uid', $uid)->field('nickname,spread_uid,now_money,add_time')->find()->toArray();
-        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('pm',1)->where('type', 'brokerage')->sum('number');
+        $userinfo['number'] = (float)UserBill::where('category', 'now_money')->where('uid', $uid)->where('pm', 1)->where('type', 'brokerage')->sum('number');
         //退款退的佣金 -
         $refund_commission = UserBill::where(['uid' => $uid, 'category' => 'now_money', 'type' => 'brokerage'])
             ->where('pm', 0)
             ->sum('number');
         if ($userinfo['number'] > $refund_commission)
-            $userinfo['number'] = bcsub($userinfo['number'],$refund_commission,2);
+            $userinfo['number'] = bcsub($userinfo['number'], $refund_commission, 2);
         else
             $userinfo['number'] = 0;
         $userinfo['spread_name'] = $userinfo['spread_uid'] ? self::where('uid', $userinfo['spread_uid'])->value('nickname') : '';
@@ -717,9 +713,9 @@ class User extends BaseModel
         $UserInfo = self::get($uid);
         return [
             ['col' => 12, 'name' => '默认收货地址', 'value' => $thisAddress ? '收货人:' . $thisAddress['real_name'] . '邮编:' . $thisAddress['post_code'] . ' 收货人电话:' . $thisAddress['phone'] . ' 地址:' . $thisAddress['province'] . ' ' . $thisAddress['city'] . ' ' . $thisAddress['district'] . ' ' . $thisAddress['detail'] : ''],
-//            ['name'=>'微信OpenID','value'=>WechatUser::where('uid', $uid)->value('openid'),'col'=>8],
+            //            ['name'=>'微信OpenID','value'=>WechatUser::where('uid', $uid)->value('openid'),'col'=>8],
             ['name' => '手机号码', 'value' => $UserInfo['phone']],
-//            ['name'=>'ID','value'=>$uid],
+            //            ['name'=>'ID','value'=>$uid],
             ['name' => '姓名', 'value' => ''],
             ['name' => '微信昵称', 'value' => $UserInfo['nickname']],
             ['name' => '邮箱', 'value' => ''],
@@ -922,7 +918,7 @@ class User extends BaseModel
                 ->join('store_order r', 'r.uid=a.uid')
                 ->where('r.paid', 1)
                 ->where('a.is_promoter', $is_promoter)
-//                ->whereTime('r.pay_time','last month')
+                //                ->whereTime('r.pay_time','last month')
                 ->where('r.pay_time', 'between', [strtotime(date('Y-m', strtotime('-1 month'))), strtotime(date('Y-m'))])
                 ->group('r.uid')
                 ->field('a.nickname,a.phone,sum(r.pay_price) as sum_price,FROM_UNIXTIME(a.add_time,"%Y-%m-%d") as add_time,r.uid')
@@ -1084,7 +1080,7 @@ class User extends BaseModel
             ->group('_add_time')
             ->order('_add_time asc')
             ->select();
-//        echo self::getLastSql();die;
+        //        echo self::getLastSql();die;
         count($visit) && $visit = $visit->toArray();
         $visit_data = [];
         $visit_xdata = [];
@@ -1196,14 +1192,14 @@ class User extends BaseModel
     {
         $userInfo = User::getUserInfo($orderInfo['uid']);
         if (!$userInfo || !$userInfo['spread_uid']) return true;
-        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED;//获取后台分销类型
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED; //获取后台分销类型
         if ($storeBrokerageStatu == 1) {
             if (!User::be(['uid' => $userInfo['spread_uid'], 'is_promoter' => 1])) return true;
         }
         $brokerageRatio = (sys_config('store_brokerage_ratio') ?: 0) / 100;
         if ($brokerageRatio <= 0) return true;
-        $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0;//成本价
-        if ($cost > $orderInfo['pay_price']) return true;//成本价大于支付价格时直接返回
+        $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0; //成本价
+        if ($cost > $orderInfo['pay_price']) return true; //成本价大于支付价格时直接返回
         $brokeragePrice = bcmul(bcsub($orderInfo['pay_price'], $cost, 2), $brokerageRatio, 2);
         //返佣之后余额
         $spNow_money = User::where('uid', $userInfo['spread_uid'])->value('now_money');
@@ -1229,14 +1225,14 @@ class User extends BaseModel
         $userInfo = User::getUserInfo($orderInfo['uid']);
         $userInfoTwo = User::getUserInfo($userInfo['spread_uid']);
         if (!$userInfoTwo || !$userInfoTwo['spread_uid']) return true;
-        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED;//获取后台分销类型
+        $storeBrokerageStatu = sys_config('store_brokerage_statu') ?: DISTRIBUTE_SPECIFIED; //获取后台分销类型
         if ($storeBrokerageStatu == 1) {
             if (!User::be(['uid' => $userInfoTwo['spread_uid'], 'is_promoter' => 1])) return true;
         }
         $brokerageRatio = (sys_config('store_brokerage_two') ?: 0) / 100;
         if ($brokerageRatio <= 0) return true;
-        $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0;//成本价
-        if ($cost > $orderInfo['pay_price']) return true;//成本价大于支付价格时直接返回
+        $cost = isset($orderInfo['cost']) ? $orderInfo['cost'] : 0; //成本价
+        if ($cost > $orderInfo['pay_price']) return true; //成本价大于支付价格时直接返回
         $brokeragePrice = bcmul(bcsub($orderInfo['pay_price'], $cost, 2), $brokerageRatio, 2);
         //返佣之后余额
         $spNow_money = User::where('uid', $userInfo['spread_uid'])->value('now_money');
@@ -1250,4 +1246,4 @@ class User extends BaseModel
         self::checkTrans($res);
         return $res;
     }
-}
+}

app/admin/model/user/UserAddress.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/25
- */
 
 namespace app\admin\model\user;
 
@@ -32,30 +28,30 @@ class UserAddress extends BaseModel
         return time();
     }
 
-    public static function setDefaultAddress($id,$uid)
+    public static function setDefaultAddress($id, $uid)
     {
         self::beginTrans();
-        $res1 = self::where('uid',$uid)->update(['is_default'=>0]);
-        $res2 = self::where('id',$id)->where('uid',$uid)->update(['is_default'=>1]);
-        $res =$res1 !== false && $res2 !== false;
+        $res1 = self::where('uid', $uid)->update(['is_default' => 0]);
+        $res2 = self::where('id', $id)->where('uid', $uid)->update(['is_default' => 1]);
+        $res = $res1 !== false && $res2 !== false;
         self::checkTrans($res);
         return $res;
     }
 
-    public static function userValidAddressWhere($model=null,$prefix = '')
+    public static function userValidAddressWhere($model = null, $prefix = '')
     {
-        if($prefix) $prefix .='.';
+        if ($prefix) $prefix .= '.';
         $model = self::getSelfModel($model);
-        return $model->where("{$prefix}is_del",0);
+        return $model->where("{$prefix}is_del", 0);
     }
 
-    public static function getUserValidAddressList($uid,$field = '*')
+    public static function getUserValidAddressList($uid, $field = '*')
     {
-        return self::userValidAddressWhere()->where('uid',$uid)->order('add_time DESC')->field($field)->select()->toArray()?:[];
+        return self::userValidAddressWhere()->where('uid', $uid)->order('add_time DESC')->field($field)->select()->toArray() ?: [];
     }
 
-    public static function getUserDefaultAddress($uid,$field = '*')
+    public static function getUserDefaultAddress($uid, $field = '*')
     {
-        return self::userValidAddressWhere()->where('uid',$uid)->where('is_default',1)->field($field)->find();
+        return self::userValidAddressWhere()->where('uid', $uid)->where('is_default', 1)->field($field)->find();
     }
-}
+}

app/admin/model/user/UserBill.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\model\user;
 
 use crmeb\traits\ModelTrait;
@@ -29,50 +30,52 @@ class UserBill extends BaseModel
     /*
      * 获取总佣金
      * */
-    public static function getBrokerage($uid,$category = 'now_money',$type='brokerage',$where)
+    public static function getBrokerage($uid, $category = 'now_money', $type = 'brokerage', $where)
     {
-        return self::getModelTime($where,self::where('uid','in',$uid)->where('category',$category)
-            ->where('type',$type)->where('pm',1)->where('status',1))->sum('number');
+        return self::getModelTime($where, self::where('uid', 'in', $uid)->where('category', $category)
+            ->where('type', $type)->where('pm', 1)->where('status', 1))->sum('number');
     }
 
     //修改积分减少积分记录
-    public static function expend($title,$uid,$category,$type,$number,$link_id = 0,$balance = 0,$mark = '',$status = 1)
+    public static function expend($title, $uid, $category, $type, $number, $link_id = 0, $balance = 0, $mark = '', $status = 1)
     {
         $pm = 0;
         $add_time = time();
-        return self::create(compact('title','uid','link_id','category','type','number','balance','mark','status','pm','add_time'));
+        return self::create(compact('title', 'uid', 'link_id', 'category', 'type', 'number', 'balance', 'mark', 'status', 'pm', 'add_time'));
     }
     //修改积分增加积分记录
-    public static function income($title,$uid,$category,$type,$number,$link_id = 0,$balance = 0,$mark = '',$status = 1){
+    public static function income($title, $uid, $category, $type, $number, $link_id = 0, $balance = 0, $mark = '', $status = 1)
+    {
         $pm = 1;
         $add_time = time();
-        return self::create(compact('title','uid','link_id','category','type','number','balance','mark','status','pm','add_time'));
+        return self::create(compact('title', 'uid', 'link_id', 'category', 'type', 'number', 'balance', 'mark', 'status', 'pm', 'add_time'));
     }
     //获取柱状图和饼状图数据
-    public static function getUserBillChart($where,$category='now_money',$type='brokerage',$pm=1,$zoom=15){
-        $model=self::getModelTime($where,new self());
-        $list=$model->field('FROM_UNIXTIME(add_time,"%Y-%c-%d") as un_time,sum(number) as sum_number')
+    public static function getUserBillChart($where, $category = 'now_money', $type = 'brokerage', $pm = 1, $zoom = 15)
+    {
+        $model = self::getModelTime($where, new self());
+        $list = $model->field('FROM_UNIXTIME(add_time,"%Y-%c-%d") as un_time,sum(number) as sum_number')
             ->order('un_time asc')
             ->where('category', $category)
             ->where('type', $type)
             ->where('pm', $pm)
             ->group('un_time')
             ->select();
-        if(count($list)) $list=$list->toArray();
+        if (count($list)) $list = $list->toArray();
         $legdata = [];
         $listdata = [];
         $dataZoom = '';
-        foreach ($list as $item){
-            $legdata[]=$item['un_time'];
-            $listdata[]=$item['sum_number'];
+        foreach ($list as $item) {
+            $legdata[] = $item['un_time'];
+            $listdata[] = $item['sum_number'];
         }
-        if(count($legdata)>=$zoom) $dataZoom=$legdata[$zoom-1];
+        if (count($legdata) >= $zoom) $dataZoom = $legdata[$zoom - 1];
         //获取用户分布钱数
-        $fenbulist=self::getModelTime($where,new self(),'a.add_time')
+        $fenbulist = self::getModelTime($where, new self(), 'a.add_time')
             ->alias('a')
-            ->join('user r','a.uid=r.uid')
+            ->join('user r', 'a.uid=r.uid')
             ->field('a.uid,sum(a.number) as sum_number,r.nickname')
-            ->where('a.category',$category)
+            ->where('a.category', $category)
             ->where('a.type', $type)
             ->where('a.pm', $pm)
             ->order('sum_number desc')
@@ -80,243 +83,258 @@ class UserBill extends BaseModel
             ->limit(8)
             ->select();
         //获取用户当前时间段总钱数
-        $sum_number=self::getModelTime($where,new self())
+        $sum_number = self::getModelTime($where, new self())
             ->alias('a')
-            ->where('a.category',$category)
+            ->where('a.category', $category)
             ->where('a.type', $type)
             ->where('a.pm', $pm)
             ->sum('number');
-        if(count($fenbulist)) $fenbulist=$fenbulist->toArray();
-        $fenbudate=[];
-        $fenbu_legend=[];
-        $color=['#ffcccc','#99cc00','#fd99cc','#669966','#66CDAA','#ADFF2F','#00BFFF','#00CED1','#66cccc','#ff9900','#ffcc00','#336699','#cccc00','#99ccff','#990066'];
-        foreach ($fenbulist as $key=>$value){
-            $fenbu_legend[]=$value['nickname'];
-            $items['name']=$value['nickname'];
-            $items['value']=bcdiv($value['sum_number'],$sum_number,2)*100;
-            $items['itemStyle']['color']=$color[$key];
-            $fenbudate[]=$items;
+        if (count($fenbulist)) $fenbulist = $fenbulist->toArray();
+        $fenbudate = [];
+        $fenbu_legend = [];
+        $color = ['#ffcccc', '#99cc00', '#fd99cc', '#669966', '#66CDAA', '#ADFF2F', '#00BFFF', '#00CED1', '#66cccc', '#ff9900', '#ffcc00', '#336699', '#cccc00', '#99ccff', '#990066'];
+        foreach ($fenbulist as $key => $value) {
+            $fenbu_legend[] = $value['nickname'];
+            $items['name'] = $value['nickname'];
+            $items['value'] = bcdiv($value['sum_number'], $sum_number, 2) * 100;
+            $items['itemStyle']['color'] = $color[$key];
+            $fenbudate[] = $items;
         }
-        return compact('legdata','listdata','fenbudate','fenbu_legend','dataZoom');
+        return compact('legdata', 'listdata', 'fenbudate', 'fenbu_legend', 'dataZoom');
     }
     //获取头部信息
-    public static function getRebateBadge($where){
-        $datawhere=['category'=>'now_money','type'=>'brokerage','pm'=>1];
+    public static function getRebateBadge($where)
+    {
+        $datawhere = ['category' => 'now_money', 'type' => 'brokerage', 'pm' => 1];
         return [
             [
-                'name'=>'返利数(笔)',
-                'field'=>'个',
-                'count'=>self::getModelTime($where,new self())->where($datawhere)->count(),
-                'content'=>'返利总笔数',
-                'background_color'=>'layui-bg-blue',
-                'sum'=>self::where($datawhere)->count(),
-                'class'=>'fa fa-bar-chart',
+                'name' => '返利数(笔)',
+                'field' => '个',
+                'count' => self::getModelTime($where, new self())->where($datawhere)->count(),
+                'content' => '返利总笔数',
+                'background_color' => 'layui-bg-blue',
+                'sum' => self::where($datawhere)->count(),
+                'class' => 'fa fa-bar-chart',
             ],
             [
-                'name'=>'返利金额（元）',
-                'field'=>'个',
-                'count'=>self::getModelTime($where,new self())->where($datawhere)->sum('number'),
-                'content'=>'返利总金额',
-                'background_color'=>'layui-bg-cyan',
-                'sum'=>self::where($datawhere)->sum('number'),
-                'class'=>'fa fa-line-chart',
+                'name' => '返利金额（元）',
+                'field' => '个',
+                'count' => self::getModelTime($where, new self())->where($datawhere)->sum('number'),
+                'content' => '返利总金额',
+                'background_color' => 'layui-bg-cyan',
+                'sum' => self::where($datawhere)->sum('number'),
+                'class' => 'fa fa-line-chart',
             ],
         ];
     }
     //获取返佣用户信息列表
-    public static function getFanList($where){
-        $list=self::alias('a')->join('user r','a.uid=r.uid')
-            ->where('a.category','now_money')
+    public static function getFanList($where)
+    {
+        $list = self::alias('a')->join('user r', 'a.uid=r.uid')
+            ->where('a.category', 'now_money')
             ->where('a.type', 'brokerage')
             ->where('a.pm', 1)
             ->order('a.number desc')
-            ->join('store_order o','o.id=a.link_id')
+            ->join('store_order o', 'o.id=a.link_id')
             ->field('o.order_id,FROM_UNIXTIME(a.add_time,"%Y-%c-%d") as add_time,a.uid,o.uid as down_uid,r.nickname,r.avatar,r.spread_uid,r.level,a.number')
-            ->page((int)$where['page'],(int)$where['limit'])
+            ->page((int)$where['page'], (int)$where['limit'])
             ->select();
-        if(count($list)) $list=$list->toArray();
+        if (count($list)) $list = $list->toArray();
         return $list;
     }
     //获取返佣用户总人数
-    public static function getFanCount(){
-        return self::alias('a')->join('user r','a.uid=r.uid')->join('store_order o','o.id=a.link_id')->where('a.category','now_money')->where('a.type', 'brokerage')->where('a.pm', 1)->count();
+    public static function getFanCount()
+    {
+        return self::alias('a')->join('user r', 'a.uid=r.uid')->join('store_order o', 'o.id=a.link_id')->where('a.category', 'now_money')->where('a.type', 'brokerage')->where('a.pm', 1)->count();
     }
     //获取用户充值数据
-    public static function getEchartsRecharge($where,$limit=15){
-        $datawhere=['category'=>'now_money','pm'=>1];
-        $list=self::getModelTime($where,self::where($datawhere)->where('type','in',['recharge','system_add']))
+    public static function getEchartsRecharge($where, $limit = 15)
+    {
+        $datawhere = ['category' => 'now_money', 'pm' => 1];
+        $list = self::getModelTime($where, self::where($datawhere)->where('type', 'in', ['recharge', 'system_add']))
             ->field('sum(number) as sum_money,FROM_UNIXTIME(add_time,"%Y-%c-%d") as un_time,count(id) as count')
             ->group('un_time')
             ->order('un_time asc')
             ->select();
-        if(count($list)) $list=$list->toArray();
-        $sum_count = self::getModelTime($where,self::where($datawhere)->where('type','in','recharge,system_add'))->count();
+        if (count($list)) $list = $list->toArray();
+        $sum_count = self::getModelTime($where, self::where($datawhere)->where('type', 'in', 'recharge,system_add'))->count();
         $xdata = [];
         $seriesdata = [];
         $data = [];
         $zoom = '';
-        foreach ($list as $value){
-            $xdata[]=$value['un_time'];
-            $seriesdata[]=$value['sum_money'];
-            $data[]=$value['count'];
+        foreach ($list as $value) {
+            $xdata[] = $value['un_time'];
+            $seriesdata[] = $value['sum_money'];
+            $data[] = $value['count'];
         }
-        if(count($xdata)>$limit){
-            $zoom=$xdata[$limit-5];
+        if (count($xdata) > $limit) {
+            $zoom = $xdata[$limit - 5];
         }
-        return compact('xdata','seriesdata','data','zoom');
+        return compact('xdata', 'seriesdata', 'data', 'zoom');
     }
     //获取佣金提现列表
-    public static function getExtrctOneList($where,$uid){
-        $list=self::setOneWhere($where,$uid)
+    public static function getExtrctOneList($where, $uid)
+    {
+        $list = self::setOneWhere($where, $uid)
             ->field('number,link_id,mark,FROM_UNIXTIME(add_time,"%Y-%m-%d %H:%i:%s") as _add_time,status')
             ->select();
-        count($list) && $list=$list->toArray();
-        $count=self::setOneWhere($where,$uid)->count();
-        foreach ($list as &$value){
+        count($list) && $list = $list->toArray();
+        $count = self::setOneWhere($where, $uid)->count();
+        foreach ($list as &$value) {
             $value['order_id'] = Db::name('store_order')->where('order_id', $value['link_id'])->value('order_id');
         }
-        return ['data'=>$list,'count'=>$count];
+        return ['data' => $list, 'count' => $count];
     }
     //设置单个用户查询
-    public static function setOneWhere($where,$uid){
-        $model=self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage');
+    public static function setOneWhere($where, $uid)
+    {
+        $model = self::where('uid', $uid)->where('category', 'now_money')->where('type', 'brokerage');
         $time['data'] = '';
-        if(strlen(trim($where['start_time'])) && strlen(trim($where['end_time']))){
-            $time['data'] = $where['start_time'].' - '.$where['end_time'];
-            $model = self::getModelTime($time,$model);
+        if (strlen(trim($where['start_time'])) && strlen(trim($where['end_time']))) {
+            $time['data'] = $where['start_time'] . ' - ' . $where['end_time'];
+            $model = self::getModelTime($time, $model);
         }
-        if(strlen(trim($where['nickname']))){
-            $model = $model->where('link_id|mark','like',"%$where[nickname]%");
+        if (strlen(trim($where['nickname']))) {
+            $model = $model->where('link_id|mark', 'like', "%$where[nickname]%");
         }
         return $model;
     }
     //查询积分个人明细
-    public static function getOneIntegralList($where){
+    public static function getOneIntegralList($where)
+    {
         return self::setWhereList(
-            $where,'',
-//            ['deduction','system_add','sign'],
-            ['title','number','balance','mark','FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time'],
+            $where,
+            '',
+            //            ['deduction','system_add','sign'],
+            ['title', 'number', 'balance', 'mark', 'FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time'],
             'integral'
         );
     }
     //查询个人签到明细
-    public static function getOneSignList($where){
+    public static function getOneSignList($where)
+    {
         return self::setWhereList(
-            $where,'sign',
-            ['title','number','mark','FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time']
-            );
+            $where,
+            'sign',
+            ['title', 'number', 'mark', 'FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time']
+        );
     }
     //查询个人余额变动记录
-    public static function getOneBalanceChangList($where){
-         $list=self::setWhereList(
-            $where,'',
-//            ['system_add','pay_product','extract','pay_product_refund','system_sub','brokerage','recharge','user_recharge_refund'],
-            ['FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time','title','type','mark','number','balance','pm','status'],
+    public static function getOneBalanceChangList($where)
+    {
+        $list = self::setWhereList(
+            $where,
+            '',
+            //            ['system_add','pay_product','extract','pay_product_refund','system_sub','brokerage','recharge','user_recharge_refund'],
+            ['FROM_UNIXTIME(add_time,"%Y-%m-%d") as add_time', 'title', 'type', 'mark', 'number', 'balance', 'pm', 'status'],
             'now_money'
         );
-         foreach ($list as &$item){
-            switch ($item['type']){
+        foreach ($list as &$item) {
+            switch ($item['type']) {
                 case 'system_add':
-                    $item['_type']='系统添加';
+                    $item['_type'] = '系统添加';
                     break;
                 case 'pay_product':
-                    $item['_type']='商品购买';
+                    $item['_type'] = '商品购买';
                     break;
                 case 'extract':
-                    $item['_type']='提现';
+                    $item['_type'] = '提现';
                     break;
                 case 'pay_product_refund':
-                    $item['_type']='退款';
+                    $item['_type'] = '退款';
                     break;
                 case 'system_sub':
-                    $item['_type']='系统减少';
+                    $item['_type'] = '系统减少';
                     break;
                 case 'brokerage':
-                    $item['_type']='系统返佣';
+                    $item['_type'] = '系统返佣';
                     break;
                 case 'recharge':
-                    $item['_type']='余额充值';
+                    $item['_type'] = '余额充值';
                     break;
                 case 'user_recharge_refund':
-                    $item['_type']='系统退款';
+                    $item['_type'] = '系统退款';
                     break;
             }
-            $item['_pm']=$item['pm']==1 ? '获得': '支出';
-         }
-         return $list;
+            $item['_pm'] = $item['pm'] == 1 ? '获得' : '支出';
+        }
+        return $list;
     }
     //设置where条件分页.返回数据
-    public static function setWhereList($where,$type='',$field=[],$category='integral'){
-        $models=self::where('uid',$where['uid'])
-            ->where('category',$category)
-            ->page((int)$where['page'],(int)$where['limit'])
-            ->order('id','desc')
+    public static function setWhereList($where, $type = '', $field = [], $category = 'integral')
+    {
+        $models = self::where('uid', $where['uid'])
+            ->where('category', $category)
+            ->page((int)$where['page'], (int)$where['limit'])
+            ->order('id', 'desc')
             ->field($field);
-        if(is_array($type)){
-            $models=$models->where('type','in',$type);
-        }else{
-            if(!empty($type))$models=$models->where('type',$type);
+        if (is_array($type)) {
+            $models = $models->where('type', 'in', $type);
+        } else {
+            if (!empty($type)) $models = $models->where('type', $type);
         }
-        return ($list=$models->select()) && count($list) ? $list->toArray():[];
+        return ($list = $models->select()) && count($list) ? $list->toArray() : [];
     }
     //获取积分统计头部信息
-    public static function getScoreBadgeList($where){
+    public static function getScoreBadgeList($where)
+    {
         return [
             [
-                'name'=>'历史总积分',
-                'field'=>'个',
-                'count'=>self::getModelTime($where,new self())->where('category','integral')->where('type','in','gain,system_sub,deduction,sign')->sum('number'),
-                'background_color'=>'layui-bg-blue',
-                'col'=>4,
+                'name' => '历史总积分',
+                'field' => '个',
+                'count' => self::getModelTime($where, new self())->where('category', 'integral')->where('type', 'in', 'gain,system_sub,deduction,sign')->sum('number'),
+                'background_color' => 'layui-bg-blue',
+                'col' => 4,
             ],
             [
-                'name'=>'已使用积分',
-                'field'=>'个',
-                'count'=>self::getModelTime($where,new self())->where('category','integral')->where('type','deduction')->sum('number'),
-                'background_color'=>'layui-bg-cyan',
-                'col'=>4,
+                'name' => '已使用积分',
+                'field' => '个',
+                'count' => self::getModelTime($where, new self())->where('category', 'integral')->where('type', 'deduction')->sum('number'),
+                'background_color' => 'layui-bg-cyan',
+                'col' => 4,
             ],
             [
-                'name'=>'未使用积分',
-                'field'=>'个',
-                'count'=>self::getModelTime($where,Db::name('user'))->sum('integral'),
-                'background_color'=>'layui-bg-cyan',
-                'col'=>4,
+                'name' => '未使用积分',
+                'field' => '个',
+                'count' => self::getModelTime($where, Db::name('user'))->sum('integral'),
+                'background_color' => 'layui-bg-cyan',
+                'col' => 4,
             ],
         ];
     }
     //获取积分统计曲线图和柱状图
-    public static function getScoreCurve($where){
+    public static function getScoreCurve($where)
+    {
         //发放积分趋势图
-         $list=self::getModelTime($where,self::where('category','integral')
+        $list = self::getModelTime($where, self::where('category', 'integral')
             ->field('FROM_UNIXTIME(add_time,"%Y-%m-%d") as _add_time,sum(number) as sum_number')
             ->group('_add_time')->order('_add_time asc'))->select()->toArray();
-         $date=[];
-         $zoom='';
-         $seriesdata=[];
-         foreach ($list as $item){
-             $date[]=$item['_add_time'];
-             $seriesdata[]=$item['sum_number'];
-         }
-         unset($item);
-         if(count($date)>$where['limit']){
-             $zoom=$date[$where['limit']-5];
-         }
+        $date = [];
+        $zoom = '';
+        $seriesdata = [];
+        foreach ($list as $item) {
+            $date[] = $item['_add_time'];
+            $seriesdata[] = $item['sum_number'];
+        }
+        unset($item);
+        if (count($date) > $where['limit']) {
+            $zoom = $date[$where['limit'] - 5];
+        }
         //使用积分趋势图
-        $deductionlist=self::getModelTime($where,self::where('category','integral')->where('type','deduction')
+        $deductionlist = self::getModelTime($where, self::where('category', 'integral')->where('type', 'deduction')
             ->field('FROM_UNIXTIME(add_time,"%Y-%m-%d") as _add_time,sum(number) as sum_number')
             ->group('_add_time')->order('_add_time asc'))->select()->toArray();
-         $deduction_date=[];
-         $deduction_zoom='';
-         $deduction_seriesdata=[];
-         foreach ($deductionlist as $item){
-             $deduction_date[]=$item['_add_time'];
-             $deduction_seriesdata[]=$item['sum_number'];
-         }
-         if(count($deductionlist)>$where['limit']){
-             $deduction_zoom=$deductionlist[$where['limit']-5];
-         }
-         return compact('date','seriesdata','zoom','deduction_date','deduction_zoom','deduction_seriesdata');
+        $deduction_date = [];
+        $deduction_zoom = '';
+        $deduction_seriesdata = [];
+        foreach ($deductionlist as $item) {
+            $deduction_date[] = $item['_add_time'];
+            $deduction_seriesdata[] = $item['sum_number'];
+        }
+        if (count($deductionlist) > $where['limit']) {
+            $deduction_zoom = $deductionlist[$where['limit'] - 5];
+        }
+        return compact('date', 'seriesdata', 'zoom', 'deduction_date', 'deduction_zoom', 'deduction_seriesdata');
     }
 
     /**
@@ -336,4 +354,4 @@ class UserBill extends BaseModel
     {
         return self::where('type', 'brokerage')->where('category', 'now_money')->where('status', 1)->where('pm', 0)->sum('number');
     }
-}
+}

app/admin/model/user/UserExtract.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: lianghuan
- * Date: 2018-03-03
- * Time: 16:47
- */
 
 namespace app\admin\model\user;
 
@@ -347,4 +341,4 @@ class UserExtract extends BaseModel
         if (!$uid) return 0;
         return self::where('uid', $uid)->count();
     }
-}
+}

app/admin/model/user/UserGroup.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: wuhaotian<442384644@qq.com>
- * @day: 2019/12/07
- */
 
 namespace app\admin\model\user;
 
@@ -41,4 +36,4 @@ class UserGroup extends BaseModel
         $count = $data->count();
         return compact('count', 'data');
     }
-}
+}

app/admin/model/user/UserLevel.php

@@ -7,7 +7,7 @@ use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
 /**
- * 用户管理 model
+ * 用户等级管理 model
  * Class User
  * @package app\admin\model\user
  */
@@ -74,7 +74,7 @@ class UserLevel extends BaseModel
         $res = false !== self::where('uid', $uid)->update(['is_del' => 1]);
         $res = $res && UserTaskFinish::where('uid', $uid)->delete();
         if ($res) {
-            User::where('uid', $uid)->update(['level'=>0,'clean_time' => time()]);
+            User::where('uid', $uid)->update(['level' => 0, 'clean_time' => time()]);
             self::commitTrans();
             return true;
         } else {
@@ -82,5 +82,4 @@ class UserLevel extends BaseModel
             return self::setErrorInfo('清除失败');
         }
     }
-
-}
+}

app/admin/model/user/UserNotice.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\user;
 
@@ -16,7 +12,6 @@ use crmeb\basic\BaseModel;
  */
 class UserNotice extends BaseModel
 {
-
     /**
      * 数据表主键
      * @var string
@@ -41,15 +36,15 @@ class UserNotice extends BaseModel
         $model->order('id desc');
         if (!empty($where)) {
             $data = ($data = $model->page((int)$where['page'], (int)$where['limit'])->select()) && count($data) ? $data->toArray() : [];
-//            foreach ($data as &$item) {
-//                if ($item["uid"] != '') {
-//                    $uids = explode(",", $item["uid"]);
-//                    array_splice($uids, 0, 1);
-//                    array_splice($uids, count($uids) - 1, 1);
-//                    $item["uid"] = $uids;
-//                }
-//                $item['send_time'] = date('Y-m-d H:i:s', $item['send_time']);
-//            }
+            //            foreach ($data as &$item) {
+            //                if ($item["uid"] != '') {
+            //                    $uids = explode(",", $item["uid"]);
+            //                    array_splice($uids, 0, 1);
+            //                    array_splice($uids, count($uids) - 1, 1);
+            //                    $item["uid"] = $uids;
+            //                }
+            //                $item['send_time'] = date('Y-m-d H:i:s', $item['send_time']);
+            //            }
             $count = count($data); // self::count();
             return compact('data', 'count');
         }
@@ -77,4 +72,4 @@ class UserNotice extends BaseModel
         $model = $model->order('id desc');
         return self::page($model, $where);
     }
-}
+}

app/admin/model/user/UserNoticeSee.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\admin\model\user;
 

app/admin/model/user/UserPoint.php

@@ -1,10 +1,4 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: liying
- * Date: 2018/7/20
- * Time: 18:08
- */
 
 namespace app\admin\model\user;
 
@@ -126,4 +120,4 @@ class UserPoint extends BaseModel
             ],
         ];
     }
-}
+}

app/admin/model/user/UserRecharge.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/28
- */
 
 namespace app\admin\model\user;
 
@@ -172,5 +168,4 @@ class UserRecharge extends BaseModel
             ],
         ];
     }
-
-}
+}

app/admin/model/user/UserTaskFinish.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\model\user;
 
 use crmeb\traits\ModelTrait;
@@ -32,10 +33,10 @@ class UserTaskFinish extends BaseModel
      * @param int $task_id 任务id
      * @return Boolean
      * */
-    public static function setFinish($uid,$task_id)
+    public static function setFinish($uid, $task_id)
     {
-        $add_time=time();
-        if(self::be(['uid'=>$uid,'task_id'=>$task_id])) return true;
-        return self::create(compact('uid','task_id','add_time'));
+        $add_time = time();
+        if (self::be(['uid' => $uid, 'task_id' => $task_id])) return true;
+        return self::create(compact('uid', 'task_id', 'add_time'));
     }
-}
+}

app/admin/model/wechat/StoreService.php

@@ -67,4 +67,4 @@ class StoreService extends BaseModel
         }
         return null;
     }
-}
+}

app/admin/model/wechat/StoreServiceLog.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\admin\model\wechat;
 
 use app\models\user\User;
@@ -6,7 +7,6 @@ use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
 /**
- * 客服管理 model
  * Class StoreProduct
  * @package app\admin\model\store
  */
@@ -30,17 +30,18 @@ class StoreServiceLog extends BaseModel
      * @param $where
      * @return array
      */
-    public static function getChatList($where, $mer_id){
+    public static function getChatList($where, $mer_id)
+    {
         $model = new self;
         $model = $model->where('mer_id', $mer_id);
         $model = $model->whereIn('uid', [$where['uid'], $where['to_uid']]);
         $model = $model->whereIn('to_uid', [$where['uid'], $where['to_uid']]);
         $model->order("add_time desc");
-        return self::page($model,function($item) use ($mer_id){
-            $user = StoreService::field("nickname,avatar")->where('mer_id',$mer_id)->where(array("uid"=>$item["uid"]))->find();
-            if(!$user)$user = User::field("nickname,avatar")->where(array("uid"=>$item["uid"]))->find();
+        return self::page($model, function ($item) use ($mer_id) {
+            $user = StoreService::field("nickname,avatar")->where('mer_id', $mer_id)->where(array("uid" => $item["uid"]))->find();
+            if (!$user) $user = User::field("nickname,avatar")->where(array("uid" => $item["uid"]))->find();
             $item["nickname"] = $user["nickname"];
             $item["avatar"] = $user["avatar"];
         }, $where);
     }
-}
+}

app/admin/model/wechat/WechatMessage.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/28
- */
 
 namespace app\admin\model\wechat;
 
@@ -242,7 +238,7 @@ class WechatMessage extends BaseModel
                 case 'event_scan':
                     $item['result_arr'] = self::tidyNull();
                     break;
-                default :
+                default:
                     $item['result_arr'] = ['msg' => $item['type']];
                     break;
             }
@@ -285,4 +281,4 @@ class WechatMessage extends BaseModel
         }
         return $viwe;
     }
-}
+}

app/admin/model/wechat/WechatNews.php

@@ -1,8 +1,5 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
+
 namespace app\admin\model\wechat;
 
 use app\admin\model\system\SystemAdmin;
@@ -37,19 +34,20 @@ class WechatNews extends BaseModel
      * @param array $where
      * @return array
      */
-    public static function getAll($where = array()){
+    public static function getAll($where = array())
+    {
         $model = new self;
-        if($where['title'] !== '') $model = $model->where('title','LIKE',"%$where[title]%");
-        if($where['cid'] !== '') $model = $model->where("CONCAT(',',cid,',')  LIKE '%,$where[cid],%'");
-        if($where['cid'] == ''){
-            if(!$where['merchant']) $model = $model->where('mer_id',0);
-            if($where['merchant']) $model = $model->where('mer_id','>',0);
+        if ($where['title'] !== '') $model = $model->where('title', 'LIKE', "%$where[title]%");
+        if ($where['cid'] !== '') $model = $model->where("CONCAT(',',cid,',')  LIKE '%,$where[cid],%'");
+        if ($where['cid'] == '') {
+            if (!$where['merchant']) $model = $model->where('mer_id', 0);
+            if ($where['merchant']) $model = $model->where('mer_id', '>', 0);
         }
-        $model = $model->where('status',1)->where('hide',0);
-        return self::page($model,function($item){
-            $item['admin_name'] = '总后台管理员---》'.SystemAdmin::where('id',$item['admin_id'])->value('real_name');
-            $item['content'] = Db::name('wechatNewsContent')->where('nid',$item['id'])->value('content');
-        },$where);
+        $model = $model->where('status', 1)->where('hide', 0);
+        return self::page($model, function ($item) {
+            $item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
+            $item['content'] = Db::name('wechatNewsContent')->where('nid', $item['id'])->value('content');
+        }, $where);
     }
 
     /**
@@ -57,8 +55,9 @@ class WechatNews extends BaseModel
      * @param $id
      * @return bool
      */
-    public static function del($id){
-        return self::edit(['status'=>0],$id,'id');
+    public static function del($id)
+    {
+        return self::edit(['status' => 0], $id, 'id');
     }
 
     /**
@@ -67,7 +66,7 @@ class WechatNews extends BaseModel
      */
     public static function getNews()
     {
-        return self::where('status',1)->where('hide',0)->order('id desc')->column('id,title');
+        return self::where('status', 1)->where('hide', 0)->order('id desc')->column('id,title');
     }
 
     /**
@@ -77,62 +76,64 @@ class WechatNews extends BaseModel
      * @param $id
      * @return bool
      */
-    public static function saveBatchCid($cid,$id){
-        $res_all = self::where('cid','LIKE',"%$cid%")->select();//获取所有有当前分类的图文
-        foreach ($res_all as $k=>$v){
-            $cid_arr = explode(',',$v['cid']);
-            if(in_array($cid,$cid_arr)){
+    public static function saveBatchCid($cid, $id)
+    {
+        $res_all = self::where('cid', 'LIKE', "%$cid%")->select(); //获取所有有当前分类的图文
+        foreach ($res_all as $k => $v) {
+            $cid_arr = explode(',', $v['cid']);
+            if (in_array($cid, $cid_arr)) {
                 $key = array_search($cid, $cid_arr);
                 array_splice($cid_arr, $key, 1);
             }
-            if(empty($cid_arr)) {
+            if (empty($cid_arr)) {
                 $data['cid'] = 0;
-                self::edit($data,$v['id']);
-            }else{
-                $data['cid'] = implode(',',$cid_arr);
-                self::edit($data,$v['id']);
+                self::edit($data, $v['id']);
+            } else {
+                $data['cid'] = implode(',', $cid_arr);
+                self::edit($data, $v['id']);
             }
         }
-        $res = self::where('id','IN',$id)->select();
-        foreach ($res as $k=>$v){
-            if(!in_array($cid,explode(',',$v['cid']))){
-                if(!$v['cid']){
+        $res = self::where('id', 'IN', $id)->select();
+        foreach ($res as $k => $v) {
+            if (!in_array($cid, explode(',', $v['cid']))) {
+                if (!$v['cid']) {
                     $data['cid'] = $cid;
-                }else{
-                    $data['cid'] = $v['cid'].','.$cid;
+                } else {
+                    $data['cid'] = $v['cid'] . ',' . $cid;
                 }
-                self::edit($data,$v['id']);
+                self::edit($data, $v['id']);
             }
         }
-       return true;
+        return true;
     }
 
-    public static function setContent($id,$content){
-        $count = Db::name('wechatNewsContent')->where('nid',$id)->count();
+    public static function setContent($id, $content)
+    {
+        $count = Db::name('wechatNewsContent')->where('nid', $id)->count();
         $data['nid'] = $id;
         $data['content'] = $content;
-        if($count){
-            $contentSql = Db::name('wechatNewsContent')->where('nid',$id)->value('content');
-            if($contentSql == $content) $res = true;
-            else $res = Db::name('wechatNewsContent')->where('nid',$id)->update(['content'=>$content]);
-            if($res !== false) $res = true;
-        }
-        else
+        if ($count) {
+            $contentSql = Db::name('wechatNewsContent')->where('nid', $id)->value('content');
+            if ($contentSql == $content) $res = true;
+            else $res = Db::name('wechatNewsContent')->where('nid', $id)->update(['content' => $content]);
+            if ($res !== false) $res = true;
+        } else
             $res = Db::name('wechatNewsContent')->insert($data);
         return $res;
     }
 
-    public static function merchantPage($where = array()){
+    public static function merchantPage($where = array())
+    {
         $model = new self;
-        if($where['title'] !== '') $model = $model->where('title','LIKE',"%$where[title]%");
-        if($where['cid'] !== '') $model = $model->where('cid','LIKE',"%$where[cid]%");
+        if ($where['title'] !== '') $model = $model->where('title', 'LIKE', "%$where[title]%");
+        if ($where['cid'] !== '') $model = $model->where('cid', 'LIKE', "%$where[cid]%");
         $model = $model
-            ->where('status',1)
-            ->where('hide',0)
-            ->where('admin_id',$where['admin_id'])
-            ->where('mer_id',$where['mer_id']);
-        return self::page($model,function($item){
-            $item['content'] = Db::name('wechatNewsContent')->where('nid',$item['id'])->value('content');
-        },$where);
+            ->where('status', 1)
+            ->where('hide', 0)
+            ->where('admin_id', $where['admin_id'])
+            ->where('mer_id', $where['mer_id']);
+        return self::page($model, function ($item) {
+            $item['content'] = Db::name('wechatNewsContent')->where('nid', $item['id'])->value('content');
+        }, $where);
     }
-}
+}

app/admin/model/wechat/WechatNewsCategory.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\wechat;
 
@@ -39,8 +35,8 @@ class WechatNewsCategory extends BaseModel
     public static function getAll($where = array())
     {
         $model = new self;
-//        if($where['status'] !== '') $model = $model->where('status',$where['status']);
-//        if($where['access'] !== '') $model = $model->where('access',$where['access']);
+        //        if($where['status'] !== '') $model = $model->where('status',$where['status']);
+        //        if($where['access'] !== '') $model = $model->where('access',$where['access']);
         if ($where['cate_name'] !== '') $model = $model->where('cate_name', 'LIKE', "%$where[cate_name]%");
         $model = $model->where('status', 1);
         return self::page($model, function ($item) use ($where) {
@@ -70,7 +66,6 @@ class WechatNewsCategory extends BaseModel
             } else {
                 $list['new'] = $new;
             }
-
         }
         return $list;
     }
@@ -100,6 +95,4 @@ class WechatNewsCategory extends BaseModel
             $item['new'] = $temp;
         });
     }
-
-
-}
+}

app/admin/model/wechat/WechatQrcode.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/22
- */
 
 namespace app\admin\model\wechat;
 
@@ -39,18 +35,19 @@ class WechatQrcode extends BaseModel
      * @param $type
      * @param string $qtcode_id
      */
-    public static function createTemporaryQrcode($id,$type,$qtcode_id=''){
+    public static function createTemporaryQrcode($id, $type, $qtcode_id = '')
+    {
         $qrcode = WechatService::qrcodeService();
-        $data  = $qrcode->temporary($id,30*24*3600)->toArray();
+        $data  = $qrcode->temporary($id, 30 * 24 * 3600)->toArray();
         $data['qrcode_url'] = $data['url'];
-        $data['expire_seconds'] = $data['expire_seconds']+time();
+        $data['expire_seconds'] = $data['expire_seconds'] + time();
         $data['url'] = $qrcode->url($data['ticket']);
         $data['status'] = 1;
         $data['third_id'] = $id;
         $data['third_type'] = $type;
-        if($qtcode_id){
-            self::edit($data,$qtcode_id);
-        }else{
+        if ($qtcode_id) {
+            self::edit($data, $qtcode_id);
+        } else {
             $data['add_time'] = time();
             self::create($data);
         }
@@ -61,7 +58,8 @@ class WechatQrcode extends BaseModel
      * @param $id
      * @param $type
      */
-    public static function createForeverQrcode($id,$type){
+    public static function createForeverQrcode($id, $type)
+    {
         $qrcode = WechatService::qrcodeService();
         $data  = $qrcode->forever($id)->toArray();
         $data['qrcode_url'] = $data['url'];
@@ -80,17 +78,18 @@ class WechatQrcode extends BaseModel
      * @param $id
      * @return array|false|\PDOStatement|string|\think\Model
      */
-    public static function getTemporaryQrcode($type,$id){
-          $res = self::where('third_id',$id)->where('third_type',$type)->find();
-          if(empty($res)){
-              self::createTemporaryQrcode($id,$type);
-              $res = self::getTemporaryQrcode($type,$id);
-          }else if(empty($res['expire_seconds']) || $res['expire_seconds'] < time()){
-              self::createTemporaryQrcode($id,$type,$res['id']);
-              $res = self::getTemporaryQrcode($type,$id);
-          }
-          if(!$res['ticket']) exception('临时二维码获取错误');
-          return $res;
+    public static function getTemporaryQrcode($type, $id)
+    {
+        $res = self::where('third_id', $id)->where('third_type', $type)->find();
+        if (empty($res)) {
+            self::createTemporaryQrcode($id, $type);
+            $res = self::getTemporaryQrcode($type, $id);
+        } else if (empty($res['expire_seconds']) || $res['expire_seconds'] < time()) {
+            self::createTemporaryQrcode($id, $type, $res['id']);
+            $res = self::getTemporaryQrcode($type, $id);
+        }
+        if (!$res['ticket']) exception('临时二维码获取错误');
+        return $res;
     }
 
     /**
@@ -99,24 +98,24 @@ class WechatQrcode extends BaseModel
      * @param $id
      * @return array|false|\PDOStatement|string|\think\Model
      */
-    public static function getForeverQrcode($type,$id){
-        $res = self::where('third_id',$id)->where('third_type',$type)->find();
-        if(empty($res)) {
+    public static function getForeverQrcode($type, $id)
+    {
+        $res = self::where('third_id', $id)->where('third_type', $type)->find();
+        if (empty($res)) {
             self::createForeverQrcode($id, $type);
             $res = self::getForeverQrcode($type, $id);
         }
-        if(!$res['ticket']) exception('永久二维码获取错误');
+        if (!$res['ticket']) exception('永久二维码获取错误');
         return $res;
     }
 
-    public static function getQrcode($id,$type = 'id')
+    public static function getQrcode($id, $type = 'id')
     {
-        return self::where($type,$id)->find();
+        return self::where($type, $id)->find();
     }
 
-    public static function scanQrcode($id,$type = 'id')
+    public static function scanQrcode($id, $type = 'id')
     {
-        return self::where($type,$id)->inc('scan')->update();
+        return self::where($type, $id)->inc('scan')->update();
     }
-
-}
+}

app/admin/model/wechat/WechatReply.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/22
- */
 
 namespace app\admin\model\wechat;
 
@@ -220,6 +216,4 @@ class WechatReply extends BaseModel
             return WechatService::voiceMessage($res['data']['media_id']);
         }
     }
-
-
-}
+}

app/admin/model/wechat/WechatTemplate.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/02
- */
 
 namespace app\admin\model\wechat;
 
@@ -50,4 +46,4 @@ class WechatTemplate extends BaseModel
         if ($where['status'] !== '') $model = $model->where('status', $where['status']);
         return self::page($model);
     }
-}
+}

app/admin/model/wechat/WechatUser.php

@@ -1,8 +1,4 @@
 <?php
-/**
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/28
- */
 
 namespace app\admin\model\wechat;
 
@@ -20,7 +16,6 @@ use app\admin\model\order\{StoreOrder, StoreOrderStatus};
  */
 class WechatUser extends BaseModel
 {
-
     /**
      * 数据表主键
      * @var string
@@ -333,7 +328,7 @@ class WechatUser extends BaseModel
             }
         }
         if (isset($where['data']) && $where['data']) $model = self::getModelTime($where, $model, "{$alias}add_time");
-        return $model->where("{$alias}is_del", 0)->where("{$alias}is_system_del", 0)->where($alias . 'paid', 1)->where('seckill_id&bargain_id&combination_id','=',0);
+        return $model->where("{$alias}is_del", 0)->where("{$alias}is_system_del", 0)->where($alias . 'paid', 1)->where('seckill_id&bargain_id&combination_id', '=', 0);
     }
 
     /*
@@ -535,7 +530,7 @@ class WechatUser extends BaseModel
                 $item['avatar'] = $userInfo->avatar;
             }
             $item['spread_info'] = $Info->nickname . "|" . ($Info->phone ? $Info->phone . "|" : '') . $Info->uid;
-            $item['number_price'] = UserBill::where(['uid'=>$Info['uid'], 'category' => 'now_money', 'type' => 'brokerage', 'link_id' => $item['id']])->value('number');
+            $item['number_price'] = UserBill::where(['uid' => $Info['uid'], 'category' => 'now_money', 'type' => 'brokerage', 'link_id' => $item['id']])->value('number');
             $item['_pay_time'] = date('Y-m-d H:i:s', $item['pay_time']);
             $item['_add_time'] = date('Y-m-d H:i:s', $item['add_time']);
             $item['take_time'] = ($change_time = StoreOrderStatus::where(['change_type' => 'user_take_delivery', 'oid' => $item['id']])->value('change_time')) ?
@@ -714,10 +709,10 @@ class WechatUser extends BaseModel
      */
     public static function getUserSpreadUidCount($uid, $spread = 1)
     {
-        $userStair = User::where('spread_uid', $uid)->column('uid', 'uid');//获取一级推家人
+        $userStair = User::where('spread_uid', $uid)->column('uid', 'uid'); //获取一级推家人
         if ($userStair) {
-            if (!$spread) return count($userStair);//返回一级推人人数
-            else return User::where('spread_uid', 'IN', implode(',', $userStair))->count();//二级推荐人数
+            if (!$spread) return count($userStair); //返回一级推人人数
+            else return User::where('spread_uid', 'IN', implode(',', $userStair))->count(); //二级推荐人数
         } else return 0;
     }
 
@@ -730,17 +725,16 @@ class WechatUser extends BaseModel
      */
     public static function getUserSpreadOrderCount($uid, $spread = 1)
     {
-        $userStair = User::where('spread_uid', $uid)->column('uid', 'uid');//获取一级推家人uid
+        $userStair = User::where('spread_uid', $uid)->column('uid', 'uid'); //获取一级推家人uid
         if ($userStair) {
             if (!$spread) {
-                return StoreOrder::where('uid', 'IN', implode(',', $userStair))->where('paid', 1)->where('refund_status', 0)->where('status', 2)->count();//获取一级推广人订单数
+                return StoreOrder::where('uid', 'IN', implode(',', $userStair))->where('paid', 1)->where('refund_status', 0)->where('status', 2)->count(); //获取一级推广人订单数
             } else {
-                $userSecond = User::where('spread_uid', 'IN', implode(',', $userStair))->column('uid', 'uid');//二级推广人的uid
+                $userSecond = User::where('spread_uid', 'IN', implode(',', $userStair))->column('uid', 'uid'); //二级推广人的uid
                 if ($userSecond) {
-                    return StoreOrder::where('uid', 'IN', implode(',', $userSecond))->where('paid', 1)->where('refund_status', 0)->where('status', 2)->count();//获取二级推广人订单数
+                    return StoreOrder::where('uid', 'IN', implode(',', $userSecond))->where('paid', 1)->where('refund_status', 0)->where('status', 2)->count(); //获取二级推广人订单数
                 } else return 0;
             }
         } else return 0;
     }
-
-}
+}

app/api/controller/store/StoreProductController.php

@@ -6,16 +6,13 @@ use app\admin\model\store\StoreDescription;
 use app\admin\model\system\SystemAttachment;
 use app\models\store\StoreOrder;
 use app\models\store\StoreVisit;
-use app\models\system\SystemStore;
 use app\models\store\StoreProduct;
 use app\models\store\StoreProductAttr;
 use app\models\store\StoreProductRelation;
 use app\models\store\StoreProductReply;
 use app\models\user\User;
 use app\Request;
-use crmeb\services\GroupDataService;
 use crmeb\services\QrcodeService;
-use crmeb\services\SystemConfigService;
 use crmeb\services\UtilService;
 use crmeb\services\upload\Upload;
 
@@ -157,7 +154,7 @@ class StoreProductController
         // array_multisort($prices, SORT_ASC, SORT_NUMERIC, $productValue);
         // $keys = array_keys($productValue);
         // $productValue = array_combine($keys, $productValue);
-        StoreVisit::setView($uid, $id, 'product',$storeInfo['cate_id'], 'viwe');
+        StoreVisit::setView($uid, $id, 'product', $storeInfo['cate_id'], 'viwe');
         $data['storeInfo'] = StoreProduct::setLevelPrice($storeInfo, $uid, true);
         $data['similarity'] = StoreProduct::cateIdBySimilarityProduct($storeInfo['cate_id'], 'id,store_name,image,price,sales,ficti', 4);
         $data['productAttr'] = $productAttr;
@@ -194,7 +191,7 @@ class StoreProductController
         $data['system_store'] = []; // ($res = SystemStore::getStoreDispose()) ? $res : [];
         $data['good_list'] = StoreProduct::getGoodList(18, 'image,store_name,price,id,ot_price');
         $data['mapKey'] = sys_config('tengxun_map_key');
-        $data['store_self_mention'] = (int)sys_config('store_self_mention') ?? 0;//门店自提是否开启
+        $data['store_self_mention'] = (int)sys_config('store_self_mention') ?? 0; //门店自提是否开启
         $data['activity'] = []; // StoreProduct::activity($data['storeInfo']['id'], false);
         return app('json')->successful($data);
     }
@@ -235,18 +232,18 @@ class StoreProductController
         ], $request, true);
         $info['banner'] = [];
         $info['list'] = [];
-        if ($type == 1) {//TODO 精品推荐
-            $info['banner'] = sys_data('routine_home_bast_banner') ?: [];//TODO 首页精品推荐图片
-            $info['list'] = StoreProduct::getBestProduct('id,image,store_name,cate_id,price,ot_price,IFNULL(sales,0) + IFNULL(ficti,0) as sales,unit_name,sort', 0, 0, true, $page, $limit);//TODO 精品推荐个数
-        } else if ($type == 2) {//TODO  热门榜单
-            $info['banner'] = sys_data('routine_home_hot_banner') ?: [];//TODO 热门榜单 猜你喜欢推荐图片
-            $info['list'] = StoreProduct::getHotProduct('id,image,store_name,cate_id,price,ot_price,unit_name,sort,IFNULL(sales,0) + IFNULL(ficti,0) as sales', 0, $request->uid(), $page, $limit);//TODO 热门榜单 猜你喜欢
-        } else if ($type == 3) {//TODO 首发新品
-            $info['banner'] = sys_data('routine_home_new_banner') ?: [];//TODO 首发新品推荐图片
-            $info['list'] = StoreProduct::getNewProduct('id,image,store_name,cate_id,price,ot_price,unit_name,sort,IFNULL(sales,0) + IFNULL(ficti,0) as sales', 0, $request->uid(), true, $page, $limit);//TODO 首发新品
-        } else if ($type == 4) {//TODO 促销单品
-            $info['banner'] = sys_data('routine_home_benefit_banner') ?: [];//TODO 促销单品推荐图片
-            $info['list'] = StoreProduct::getBenefitProduct('id,image,store_name,cate_id,price,ot_price,stock,unit_name,sort', 0, $page, $limit);//TODO 促销单品
+        if ($type == 1) { //TODO 精品推荐
+            $info['banner'] = sys_data('routine_home_bast_banner') ?: []; //TODO 首页精品推荐图片
+            $info['list'] = StoreProduct::getBestProduct('id,image,store_name,cate_id,price,ot_price,IFNULL(sales,0) + IFNULL(ficti,0) as sales,unit_name,sort', 0, 0, true, $page, $limit); //TODO 精品推荐个数
+        } else if ($type == 2) { //TODO  热门榜单
+            $info['banner'] = sys_data('routine_home_hot_banner') ?: []; //TODO 热门榜单 猜你喜欢推荐图片
+            $info['list'] = StoreProduct::getHotProduct('id,image,store_name,cate_id,price,ot_price,unit_name,sort,IFNULL(sales,0) + IFNULL(ficti,0) as sales', 0, $request->uid(), $page, $limit); //TODO 热门榜单 猜你喜欢
+        } else if ($type == 3) { //TODO 首发新品
+            $info['banner'] = sys_data('routine_home_new_banner') ?: []; //TODO 首发新品推荐图片
+            $info['list'] = StoreProduct::getNewProduct('id,image,store_name,cate_id,price,ot_price,unit_name,sort,IFNULL(sales,0) + IFNULL(ficti,0) as sales', 0, $request->uid(), true, $page, $limit); //TODO 首发新品
+        } else if ($type == 4) { //TODO 促销单品
+            $info['banner'] = sys_data('routine_home_benefit_banner') ?: []; //TODO 促销单品推荐图片
+            $info['list'] = StoreProduct::getBenefitProduct('id,image,store_name,cate_id,price,ot_price,stock,unit_name,sort', 0, $page, $limit); //TODO 促销单品
         }
         return app('json')->successful($info);
     }
@@ -278,5 +275,4 @@ class StoreProductController
         $list = StoreProductReply::getProductReplyList($id, (int)$type, $page, $limit);
         return app('json')->successful($list);
     }
-
-}
+}

app/models/article/Article.php

@@ -72,7 +72,7 @@ class Article extends BaseModel
     public static function cidByArticleList($cid, $page, $limit, $field = 'id,title,image_input,visit,add_time,synopsis,url')
     {
         $model = new self();
-//        if ($cid) $model->where("`cid` LIKE '$cid,%' OR `cid` LIKE '%,$cid,%' OR `cid` LIKE '%,$cid' OR `cid`=$cid ");
+        //        if ($cid) $model->where("`cid` LIKE '$cid,%' OR `cid` LIKE '%,$cid,%' OR `cid` LIKE '%,$cid' OR `cid`=$cid ");
         if ((int)$cid) $model = $model->where("CONCAT(',',cid,',')  LIKE '%,$cid,%'");
         $model = $model->field($field);
         $model = $model->where('status', 1);

app/models/article/ArticleCategory.php

@@ -67,4 +67,4 @@ class ArticleCategory extends BaseModel
         if ($cid) $model->where('cid', $cid);
         return $model->field($field)->where('status', 1)->where('hide', 0)->order('sort DESC,add_time DESC')->limit($first, $limit)->select();
     }
-}
+}

app/models/article/ArticleContent.php

@@ -5,7 +5,6 @@ namespace app\models\article;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
-
 /**
  * 文章详情
  * Class ArticleCategory
@@ -14,4 +13,4 @@ use crmeb\basic\BaseModel;
 class ArticleContent extends BaseModel
 {
     use ModelTrait;
-}
+}

app/models/board/UserBoard.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\models\board;
 
 use crmeb\traits\ModelTrait;
@@ -6,7 +7,8 @@ use crmeb\basic\BaseModel;
 use think\facade\Db;
 use think\facade\Env;
 
-class UserBoard extends BaseModel {
+class UserBoard extends BaseModel
+{
     protected $pk = 'id';
     protected $name = 'store_order_cart_info';
     use ModelTrait;
@@ -22,7 +24,8 @@ class UserBoard extends BaseModel {
     order by value desc, u.uid asc limit 10
 
      */
-    public function getDailyWinMoney() {
+    public function getDailyWinMoney()
+    {
         $start = ts_of_day();
         $prefix = Env::get('database.prefix', 'eb_');
         $tuser = $prefix . 'user';
@@ -37,4 +40,4 @@ class UserBoard extends BaseModel {
         ", $tcart_info, $torder, $tuser, $start, 30);
         return Db::query($sql);
     }
-}
+}

app/models/coin/UserCoinTransfer.php

@@ -1,10 +1,12 @@
 <?php
+
 namespace app\models\coin;
 
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
 
-class UserCoinTransfer extends BaseModel {
+class UserCoinTransfer extends BaseModel
+{
 
     use ModelTrait;
 
@@ -17,7 +19,8 @@ class UserCoinTransfer extends BaseModel {
      * @param $amount
      * @return UserCoinTransfer|\think\Model
      */
-    public static function addMining($uid, $orderId, $symbol, $amount) {
+    public static function addMining($uid, $orderId, $symbol, $amount)
+    {
         $data = [
             'uid' => $uid,
             'order_id' => $orderId,
@@ -36,7 +39,8 @@ class UserCoinTransfer extends BaseModel {
      * @param $symbol
      * @param $amount
      */
-    public static function withdrawal($uid, $symbol, $to, $amount) {
+    public static function withdrawal($uid, $symbol, $to, $amount)
+    {
         return self::create([
             'uid' => $uid,
             'symbol' => $symbol,
@@ -54,8 +58,9 @@ class UserCoinTransfer extends BaseModel {
      * @param $id
      * @return UserCoinTransfer
      */
-    public static function confirmWithdrawal($id) {
-        return self::where('id', $id)->update(['status'=>0]);
+    public static function confirmWithdrawal($id)
+    {
+        return self::where('id', $id)->update(['status' => 0]);
     }
 
     /**
@@ -69,7 +74,8 @@ class UserCoinTransfer extends BaseModel {
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public static function getUserTransferred($uid, $page, $limit=20) {
+    public static function getUserTransferred($uid, $page, $limit = 20)
+    {
         $res = self::where('uid', $uid)->order('ts desc')
             ->alias('t')->join('dict_coin c', 'c.symbol=t.symbol')
             ->field('t.order_id, t.symbol, c.icon, t.from, t.to, t.amount, t.out, t.ts, FROM_UNIXTIME(t.ts,"%Y-%m-%d") as stime')
@@ -89,8 +95,9 @@ class UserCoinTransfer extends BaseModel {
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public static function hasTransferred($uid, $symbol, $addr) {
-        $row = self::where(['uid'=>$uid, 'symbol'=>$symbol, 'to'=>$addr, 'out'=>1])->limit(1)->find();
+    public static function hasTransferred($uid, $symbol, $addr)
+    {
+        $row = self::where(['uid' => $uid, 'symbol' => $symbol, 'to' => $addr, 'out' => 1])->limit(1)->find();
         return $row;
     }
-}
+}

app/models/routine/RoutineCode.php

@@ -43,10 +43,10 @@ class RoutineCode
      */
     public static function getPageCode($page = '', $pramam = "?uid=1&product=1", $width = 280)
     {
-        try{
+        try {
             return MiniProgramService::qrcodeService()->appCodeUnlimit($pramam, $page, $width);
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             return false;
         }
     }
-}
+}

app/models/routine/RoutineFormId.php

@@ -79,4 +79,4 @@ class RoutineFormId extends BaseModel
         $data['stop_time'] = bcadd(time(), bcmul(6, 86400, 0), 0);
         return self::create($data);
     }
-}
+}

app/models/routine/RoutineQrcode.php

@@ -47,7 +47,7 @@ class RoutineQrcode extends BaseModel
         $row = self::where('third_id', $thirdId)->where('third_type', $thirdType)->find();
         if ($row) {
             return $row;
-        } 
+        }
         return self::setRoutineQrcodeForever($thirdId, $thirdType, $page, $qrCodeLink);
     }
 
@@ -110,6 +110,4 @@ class RoutineQrcode extends BaseModel
         if (!$count) return false;
         return self::where('id', $id)->where('status', 1)->field($field)->find();
     }
-
-
-}
+}

app/models/routine/RoutineTemplate.php

@@ -8,7 +8,6 @@ use crmeb\services\template\Template;
 use app\models\store\StoreOrder;
 use app\models\user\WechatUser;
 
-
 /**
  * TODO 小程序模板消息
  * Class RoutineTemplate
@@ -55,14 +54,14 @@ class RoutineTemplate extends BaseModel
             $order['cart_id'] = json_decode($order['cart_id'], true);
         $storeTitle = StoreOrder::getProductTitle($order['cart_id']);
         $storeTitle = StoreOrder::getSubstrUTf8($storeTitle, 20, 'UTF-8', '');
-        if ($isGive) {//快递发货
+        if ($isGive) { //快递发货
             return self::sendOut('ORDER_DELIVER_SUCCESS', $order['uid'], [
                 'character_string2' => $order['delivery_id'],
                 'thing1' => $order['delivery_name'],
                 'time3' => date('Y-m-d H:i:s', time()),
                 'thing5' => $storeTitle,
             ], '/pages/order_details/index?order_id=' . $order['order_id']);
-        } else {//同城配送
+        } else { //同城配送
             return self::sendOut('ORDER_POSTAGE_SUCCESS', $order['uid'], [
                 'thing8' => $storeTitle,
                 'character_string1' => $order['order_id'],
@@ -284,4 +283,4 @@ class RoutineTemplate extends BaseModel
         $template = new Template('subscribe');
         return $template->to($openid)->url($link)->send($tempCode, $data);
     }
-}
+}

app/models/store/StoreBargain.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/18
- */
 
 namespace app\models\store;
 
@@ -188,16 +183,16 @@ class StoreBargain extends BaseModel
      */
     public static function decBargainStock($num, $bargainId, $unique)
     {
-        $product_id = self::where('id',$bargainId)->value('product_id');
+        $product_id = self::where('id', $bargainId)->value('product_id');
         if ($unique) {
             $res = false !== StoreProductAttrValue::decProductAttrStock($bargainId, $unique, $num, 2);
             $res = $res && self::where('id', $bargainId)->dec('stock', $num)->dec('quota', $num)->inc('sales', $num)->update();
-            $sku = StoreProductAttrValue::where('product_id',$bargainId)->where('unique',$unique)->where('type',2)->value('suk');
-            $res = $res && StoreProductAttrValue::where('product_id',$product_id)->where('suk',$sku)->where('type',0)->dec('stock',$num)->inc('sales',$num)->update();
+            $sku = StoreProductAttrValue::where('product_id', $bargainId)->where('unique', $unique)->where('type', 2)->value('suk');
+            $res = $res && StoreProductAttrValue::where('product_id', $product_id)->where('suk', $sku)->where('type', 0)->dec('stock', $num)->inc('sales', $num)->update();
         } else {
             $res = false !== self::where('id', $bargainId)->dec('stock', $num)->inc('sales', $num)->update();
         }
-        $res = $res && StoreProduct::where('id',$product_id)->dec('stock', $num)->inc('sales', $num)->update();
+        $res = $res && StoreProduct::where('id', $product_id)->dec('stock', $num)->inc('sales', $num)->update();
         return $res;
     }
 
@@ -219,12 +214,12 @@ class StoreBargain extends BaseModel
         $res = true;
         if ($unique) {
             $res = false !== StoreProductAttrValueModel::incProductAttrStock($bargainId, $unique, $num, 2);
-            $sku = StoreProductAttrValue::where('product_id',$bargainId)->where('unique',$unique)->where('type',2)->value('suk');
-            $res = $res && StoreProductAttrValue::where('product_id',$bargain['product_id'])->where('suk',$sku)->where('type',0)->inc('stock',$num)->dec('sales',$num)->update();
+            $sku = StoreProductAttrValue::where('product_id', $bargainId)->where('unique', $unique)->where('type', 2)->value('suk');
+            $res = $res && StoreProductAttrValue::where('product_id', $bargain['product_id'])->where('suk', $sku)->where('type', 0)->inc('stock', $num)->dec('sales', $num)->update();
         }
         $bargain->stock = bcadd($bargain->stock, $num, 0);
         $bargain->quota = bcadd($bargain->quota, $num, 0);
-        $res = $res && $bargain->save() && StoreProduct::where('id',$bargain['product_id'])->inc('stock', $num)->dec('sales', $num)->update();
+        $res = $res && $bargain->save() && StoreProduct::where('id', $bargain['product_id'])->inc('stock', $num)->dec('sales', $num)->update();
         return $res;
     }
 

app/models/store/StoreBargainUser.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\models\store;
 
 use app\models\user\User;
@@ -32,27 +33,27 @@ class StoreBargainUser extends BaseModel
      * @param int $limit
      * @return array
      */
-    public static function getUserList($bargain = array(),$limit = 10){
-         if(count($bargain) < 1) return [];
-         foreach ($bargain as $k=>$v){
-             if(is_array($v)){
-                 $uid = self::getUserIdList($v['id']);
-                 if(count($uid) > 0) {
-                     $userInfo = User::where('uid','IN',implode(',',$uid))->limit($limit)->column('avatar','uid');
-                     $bargain[$k]['userInfo'] = $userInfo;
-                     $bargain[$k]['userInfoCount'] = count($userInfo);
-                 }
-                 else {
-                     $bargain[$k]['userInfo'] = [];
-                     $bargain[$k]['userInfoCount'] = 0;
-                 }
-             }else{
-                 $uid = self::getUserIdList($bargain['id']);
-                 if(count($uid) > 0) $bargain['userInfo'] = User::where('uid','IN',implode(',',$uid))->column('avatar','uid');
-                 else $bargain['userInfo'] = [];
-             }
-         }
-         return $bargain;
+    public static function getUserList($bargain = array(), $limit = 10)
+    {
+        if (count($bargain) < 1) return [];
+        foreach ($bargain as $k => $v) {
+            if (is_array($v)) {
+                $uid = self::getUserIdList($v['id']);
+                if (count($uid) > 0) {
+                    $userInfo = User::where('uid', 'IN', implode(',', $uid))->limit($limit)->column('avatar', 'uid');
+                    $bargain[$k]['userInfo'] = $userInfo;
+                    $bargain[$k]['userInfoCount'] = count($userInfo);
+                } else {
+                    $bargain[$k]['userInfo'] = [];
+                    $bargain[$k]['userInfoCount'] = 0;
+                }
+            } else {
+                $uid = self::getUserIdList($bargain['id']);
+                if (count($uid) > 0) $bargain['userInfo'] = User::where('uid', 'IN', implode(',', $uid))->column('avatar', 'uid');
+                else $bargain['userInfo'] = [];
+            }
+        }
+        return $bargain;
     }
 
     /**
@@ -61,9 +62,10 @@ class StoreBargainUser extends BaseModel
      * @param int $status   $status  状态  1 进行中  2 结束失败  3结束成功
      * @return array
      */
-    public static function getUserIdList($bargainId = 0,$status = 1){
-        if(!$bargainId) return [];
-        return self::where('bargain_id',$bargainId)->where('status',$status)->column('uid','id');
+    public static function getUserIdList($bargainId = 0, $status = 1)
+    {
+        if (!$bargainId) return [];
+        return self::where('bargain_id', $bargainId)->where('status', $status)->column('uid', 'id');
     }
 
     /**
@@ -72,12 +74,13 @@ class StoreBargainUser extends BaseModel
      * @param int $bargainUserUid  $bargainUserUid 开启砍价用户编号
      * @return bool|object
      */
-    public static function setBargain($bargainId = 0,$bargainUserUid = 0){
-        if(!$bargainId || !$bargainUserUid || !StoreBargain::validBargain($bargainId) || self::be(['bargain_id'=>$bargainId,'uid'=>$bargainUserUid,'status'=>1,'is_del'=>0])) return false;
+    public static function setBargain($bargainId = 0, $bargainUserUid = 0)
+    {
+        if (!$bargainId || !$bargainUserUid || !StoreBargain::validBargain($bargainId) || self::be(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'status' => 1, 'is_del' => 0])) return false;
         $data['bargain_id'] = $bargainId;
         $data['uid'] = $bargainUserUid;
-        $data['bargain_price_min'] = StoreBargain::where('id',$bargainId)->value('min_price');
-        $data['bargain_price'] = StoreBargain::where('id',$bargainId)->value('price');
+        $data['bargain_price_min'] = StoreBargain::where('id', $bargainId)->value('min_price');
+        $data['bargain_price'] = StoreBargain::where('id', $bargainId)->value('price');
         $data['price'] = 0;
         $data['status'] = 1;
         $data['is_del'] = 0;
@@ -92,9 +95,10 @@ class StoreBargainUser extends BaseModel
      * @return bool|int|string
      * @throws \think\Exception
      */
-    public static function isBargainUser($bargainId = 0,$bargainUserUid = 0){
-        if(!$bargainId || !$bargainUserUid || !StoreBargain::validBargain($bargainId)) return false;
-        return self::where('bargain_id',$bargainId)->where('uid',$bargainUserUid)->where('is_del',0)->count();
+    public static function isBargainUser($bargainId = 0, $bargainUserUid = 0)
+    {
+        if (!$bargainId || !$bargainUserUid || !StoreBargain::validBargain($bargainId)) return false;
+        return self::where('bargain_id', $bargainId)->where('uid', $bargainUserUid)->where('is_del', 0)->count();
     }
 
     /**
@@ -102,8 +106,9 @@ class StoreBargainUser extends BaseModel
      * @param int $id  $id 用户参与砍价表编号
      * @return float
      */
-    public static function getBargainUserPrice($id = 0){
-        return (float)self::where('id',$id)->value('price');
+    public static function getBargainUserPrice($id = 0)
+    {
+        return (float)self::where('id', $id)->value('price');
     }
 
     /**
@@ -111,8 +116,9 @@ class StoreBargainUser extends BaseModel
      * @param int $id  $id 用户参与砍价表编号
      * @return int
      */
-    public static function getBargainUserStatusEnd($id = 0){
-        return (int)self::where('id',$id)->value('status');
+    public static function getBargainUserStatusEnd($id = 0)
+    {
+        return (int)self::where('id', $id)->value('status');
     }
 
     /**
@@ -123,9 +129,10 @@ class StoreBargainUser extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getBargainUserDiffPriceFloat($id){
-        $price = self::where('id',$id)->field('bargain_price,bargain_price_min')->find();
-        return (float)bcsub($price['bargain_price'],$price['bargain_price_min'],2);
+    public static function getBargainUserDiffPriceFloat($id)
+    {
+        $price = self::where('id', $id)->field('bargain_price,bargain_price_min')->find();
+        return (float)bcsub($price['bargain_price'], $price['bargain_price_min'], 2);
     }
 
     /**
@@ -135,8 +142,9 @@ class StoreBargainUser extends BaseModel
      * @param int $status $status  砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
      * @return mixed
      */
-    public static function getBargainUserTableId($bargainId = 0,$bargainUserUid = 0){
-        return self::where('bargain_id',$bargainId)->where('uid',$bargainUserUid)->where('is_del',0)->value('id');
+    public static function getBargainUserTableId($bargainId = 0, $bargainUserUid = 0)
+    {
+        return self::where('bargain_id', $bargainId)->where('uid', $bargainUserUid)->where('is_del', 0)->value('id');
     }
 
     /**
@@ -145,9 +153,10 @@ class StoreBargainUser extends BaseModel
      * @param array $price  砍掉的价格
      * @return bool
      */
-    public static function setBargainUserPrice($id, $price = array()){
-        if(!$id) return false;
-        return self::edit($price,$id,'id');
+    public static function setBargainUserPrice($id, $price = array())
+    {
+        if (!$id) return false;
+        return self::edit($price, $id, 'id');
     }
 
     /**
@@ -157,19 +166,20 @@ class StoreBargainUser extends BaseModel
      * @param int $limit
      * @return array
      */
-    public static function getBargainUserAll($bargainUserUid = 0,$page = 0,$limit = 20){
-       if(!$bargainUserUid) return [];
-       $model = new self;
-       $model = $model->alias('u');
-       $model = $model->field('u.uid,u.is_del,u.bargain_price - u.price as residue_price,u.id,u.bargain_id,u.bargain_price,u.bargain_price_min,u.price,u.status,b.title,b.image,b.stop_time as datatime');
-       $model = $model->join('StoreBargain b','b.id=u.bargain_id');
-       $model = $model->where('u.uid',$bargainUserUid);
-       $model = $model->where('u.is_del',0);
-       $model = $model->order('u.id desc');
-       if($page) $model = $model->page($page,$limit);
-       $list = $model->select();
-       if($list) return $list->toArray();
-       else return [];
+    public static function getBargainUserAll($bargainUserUid = 0, $page = 0, $limit = 20)
+    {
+        if (!$bargainUserUid) return [];
+        $model = new self;
+        $model = $model->alias('u');
+        $model = $model->field('u.uid,u.is_del,u.bargain_price - u.price as residue_price,u.id,u.bargain_id,u.bargain_price,u.bargain_price_min,u.price,u.status,b.title,b.image,b.stop_time as datatime');
+        $model = $model->join('StoreBargain b', 'b.id=u.bargain_id');
+        $model = $model->where('u.uid', $bargainUserUid);
+        $model = $model->where('u.is_del', 0);
+        $model = $model->order('u.id desc');
+        if ($page) $model = $model->page($page, $limit);
+        $list = $model->select();
+        if ($list) return $list->toArray();
+        else return [];
     }
 
     /**
@@ -182,16 +192,17 @@ class StoreBargainUser extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function setBargainUserStatus($bargainId = 0, $bargainUserUid = 0){
-        if(!$bargainId || !$bargainUserUid) return false;
-        $bargainUserTableId = self::getBargainUserTableId($bargainId,$bargainUserUid);//TODO 获取用户参与砍价表编号  下订单
-        if(!$bargainUserTableId) return false;
-        $count = self::where('id',$bargainUserTableId)->where('status',1)->count();
-        if(!$count) return false;
-        $userPrice = (float)self::where('id',$bargainUserTableId)->where('status',1)->value('price');
-        $price = self::getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 用户可以砍掉的金额  下订单
-        if(bcsub($price,$userPrice,2) > 0) return false;
-        return self::where('id',$bargainUserTableId)->where('status',1)->update(['status'=>3]);
+    public static function setBargainUserStatus($bargainId = 0, $bargainUserUid = 0)
+    {
+        if (!$bargainId || !$bargainUserUid) return false;
+        $bargainUserTableId = self::getBargainUserTableId($bargainId, $bargainUserUid); //TODO 获取用户参与砍价表编号  下订单
+        if (!$bargainUserTableId) return false;
+        $count = self::where('id', $bargainUserTableId)->where('status', 1)->count();
+        if (!$count) return false;
+        $userPrice = (float)self::where('id', $bargainUserTableId)->where('status', 1)->value('price');
+        $price = self::getBargainUserDiffPriceFloat($bargainUserTableId); //TODO 用户可以砍掉的金额  下订单
+        if (bcsub($price, $userPrice, 2) > 0) return false;
+        return self::where('id', $bargainUserTableId)->where('status', 1)->update(['status' => 3]);
     }
 
     /**
@@ -203,8 +214,12 @@ class StoreBargainUser extends BaseModel
         $currentBargain = self::getBargainUserCurrent(0); //TODO 获取当前用户正在砍价的产品
         $bargainProduct = StoreBargain::validBargainNumber(); //TODO 获取正在开启的砍价产品编号
         $closeBargain = [];
-        foreach ($currentBargain as $key=>&$item) { if(!in_array($item,$bargainProduct)) { $closeBargain[] = $item; } }// TODO 获取已经结束的砍价产品
-        if(count($closeBargain)) return self::where('status',1)->where('bargain_id','IN',implode(',',$closeBargain))->update(['status'=>2]);
+        foreach ($currentBargain as $key => &$item) {
+            if (!in_array($item, $bargainProduct)) {
+                $closeBargain[] = $item;
+            }
+        } // TODO 获取已经结束的砍价产品
+        if (count($closeBargain)) return self::where('status', 1)->where('bargain_id', 'IN', implode(',', $closeBargain))->update(['status' => 2]);
         return true;
     }
 
@@ -213,12 +228,17 @@ class StoreBargainUser extends BaseModel
      * @param $uid $uid 当前用户编号
      * @return StoreBargainUser|bool
      */
-    public static function editBargainUserStatus($uid){
+    public static function editBargainUserStatus($uid)
+    {
         $currentBargain = self::getBargainUserCurrent($uid); //TODO 获取当前用户正在砍价的产品
         $bargainProduct = StoreBargain::validBargainNumber(); //TODO 获取正在开启的砍价产品编号
         $closeBargain = [];
-        foreach ($currentBargain as $key=>&$item) { if(!in_array($item,$bargainProduct)) { $closeBargain[] = $item; } }// TODO 获取已经结束的砍价产品
-        if(count($closeBargain)) return self::where('uid',$uid)->where('status',1)->where('bargain_id','IN',implode(',',$closeBargain))->update(['status'=>2]);
+        foreach ($currentBargain as $key => &$item) {
+            if (!in_array($item, $bargainProduct)) {
+                $closeBargain[] = $item;
+            }
+        } // TODO 获取已经结束的砍价产品
+        if (count($closeBargain)) return self::where('uid', $uid)->where('status', 1)->where('bargain_id', 'IN', implode(',', $closeBargain))->update(['status' => 2]);
         return true;
     }
 
@@ -227,9 +247,10 @@ class StoreBargainUser extends BaseModel
      * @param $uid  $uid 当前用户编号
      * @return array
      */
-    public static function getBargainUserCurrent($uid){
-        if($uid) return self::where('uid',$uid)->where('is_del',0)->where('status',1)->column('bargain_id');
-        else return self::where('is_del',0)->where('status',1)->column('bargain_id');
+    public static function getBargainUserCurrent($uid)
+    {
+        if ($uid) return self::where('uid', $uid)->where('is_del', 0)->where('status', 1)->column('bargain_id');
+        else return self::where('is_del', 0)->where('status', 1)->column('bargain_id');
     }
 
     /**
@@ -239,15 +260,15 @@ class StoreBargainUser extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getBargainUserStatusSuccess(){
-        $bargainUser = self::where('status',3)->order('id desc')->field('uid,bargain_price_min,bargain_id')->select();
-        if($bargainUser) {
+    public static function getBargainUserStatusSuccess()
+    {
+        $bargainUser = self::where('status', 3)->order('id desc')->field('uid,bargain_price_min,bargain_id')->select();
+        if ($bargainUser) {
             $bargainUser = $bargainUser->toArray();
-            foreach ($bargainUser as $k=>$v){
-                $bargainUser[$k]['info'] = User::where('uid',$v['uid'])->value('nickname').'砍价成功了'.$v['bargain_price_min'].'砍到了'.StoreBargain::where('id',$v['bargain_id'])->value('title');
+            foreach ($bargainUser as $k => $v) {
+                $bargainUser[$k]['info'] = User::where('uid', $v['uid'])->value('nickname') . '砍价成功了' . $v['bargain_price_min'] . '砍到了' . StoreBargain::where('id', $v['bargain_id'])->value('title');
             }
-        }
-        else{
+        } else {
             $bargainUser[]['info'] = '砍价上线了，快邀请您的好友来砍价';
         }
         return $bargainUser;
@@ -259,10 +280,11 @@ class StoreBargainUser extends BaseModel
      * @param int $bargainUserUid  $bargainUserUid  开启砍价用户编号
      * @return bool|mixed
      */
-    public static function getBargainUserStatus($bargainId,$bargainUserUid){
-        if(!$bargainId || !$bargainUserUid) return false;
+    public static function getBargainUserStatus($bargainId, $bargainUserUid)
+    {
+        if (!$bargainId || !$bargainUserUid) return false;
         //TODO status  砍价状态 1参与中 2 活动结束参与失败 3活动结束参与成功
-        return self::where('bargain_id',$bargainId)->where('uid',$bargainUserUid)->order('add_time DESC')->value('status');
+        return self::where('bargain_id', $bargainId)->where('uid', $bargainUserUid)->order('add_time DESC')->value('status');
     }
 
     /**
@@ -272,9 +294,10 @@ class StoreBargainUser extends BaseModel
      * @param int $status
      * @return array|mixed
      */
-    public static function setUserBargain($bargainId = 0,$uid = 0,$status = 1){
-        if(!$bargainId || !$uid) return [];
-        $bargainIdUserTableId = self::where('bargain_id',$bargainId)->where('uid',$uid)->where('status',$status)->value('id');
+    public static function setUserBargain($bargainId = 0, $uid = 0, $status = 1)
+    {
+        if (!$bargainId || !$uid) return [];
+        $bargainIdUserTableId = self::where('bargain_id', $bargainId)->where('uid', $uid)->where('status', $status)->value('id');
         return $bargainIdUserTableId;
     }
-}
+}

app/models/store/StoreBargainUserHelp.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace app\models\store;
 
 use app\models\user\User;
@@ -37,25 +38,26 @@ class StoreBargainUserHelp extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getList($bargainUserTableId,$page = 1,$limit = 15){
-         if(!$bargainUserTableId) return [];
-         if($page) $list = self::where('bargain_user_id',$bargainUserTableId)->order('add_time desc')->page($page,$limit)->column("uid,price,from_unixtime(add_time,'%Y-%m-%d %H:%i:%s') as add_time",'id');
-         else $list = self::where('bargain_user_id',$bargainUserTableId)->order('add_time desc')->column("uid,price,from_unixtime(add_time,'%Y-%m-%d %H:%i:%s') as add_time",'id');
-         if($list){
-             foreach ($list as $key=>&$value){
-                 $userInfo = User::getUserInfo($value['uid'],'nickname,avatar');
-                 if($userInfo){
-                     $value['nickname'] = $userInfo['nickname'];
-                     $value['avatar'] = $userInfo['avatar'];
-                 }else{
-                     $value['nickname'] = '此用户已失效';
-                     $value['avatar'] = '';
-                 }
-                 unset($value['uid']);
-                 unset($value['id']);
-             }
-         }
-         return array_values($list);
+    public static function getList($bargainUserTableId, $page = 1, $limit = 15)
+    {
+        if (!$bargainUserTableId) return [];
+        if ($page) $list = self::where('bargain_user_id', $bargainUserTableId)->order('add_time desc')->page($page, $limit)->column("uid,price,from_unixtime(add_time,'%Y-%m-%d %H:%i:%s') as add_time", 'id');
+        else $list = self::where('bargain_user_id', $bargainUserTableId)->order('add_time desc')->column("uid,price,from_unixtime(add_time,'%Y-%m-%d %H:%i:%s') as add_time", 'id');
+        if ($list) {
+            foreach ($list as $key => &$value) {
+                $userInfo = User::getUserInfo($value['uid'], 'nickname,avatar');
+                if ($userInfo) {
+                    $value['nickname'] = $userInfo['nickname'];
+                    $value['avatar'] = $userInfo['avatar'];
+                } else {
+                    $value['nickname'] = '此用户已失效';
+                    $value['avatar'] = '';
+                }
+                unset($value['uid']);
+                unset($value['id']);
+            }
+        }
+        return array_values($list);
     }
 
     /**
@@ -69,25 +71,26 @@ class StoreBargainUserHelp extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function setBargainUserHelp($bargainId = 0,$bargainUserUid = 0,$uid = 0){
-        if(!$bargainId || !$bargainUserUid || !$uid || !StoreBargain::validBargain($bargainId) || !StoreBargainUser::be(['bargain_id'=>$bargainId,'uid'=>$bargainUserUid,'status'=>1,'is_del'=>0])) return false;
-        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId,$bargainUserUid);//TODO 获取 用户参与砍价表编号
+    public static function setBargainUserHelp($bargainId = 0, $bargainUserUid = 0, $uid = 0)
+    {
+        if (!$bargainId || !$bargainUserUid || !$uid || !StoreBargain::validBargain($bargainId) || !StoreBargainUser::be(['bargain_id' => $bargainId, 'uid' => $bargainUserUid, 'status' => 1, 'is_del' => 0])) return false;
+        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId, $bargainUserUid); //TODO 获取 用户参与砍价表编号
         $priceSection = StoreBargain::getBargainMaxMinPrice($bargainId); //TODO 获取随机砍掉的价格区间
-        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 用户可以砍掉的金额 好友砍价之前获取可以砍价金额
-        $alreadyPrice= StoreBargainUser::getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格
-        $surplusPrice = (float)bcsub($coverPrice,$alreadyPrice,2);//TODO 用户剩余要砍掉的价格
-        if(0.00 === (float)bcsub($surplusPrice,0,2)) return false;
+        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId); //TODO 用户可以砍掉的金额 好友砍价之前获取可以砍价金额
+        $alreadyPrice = StoreBargainUser::getBargainUserPrice($bargainUserTableId); //TODO 用户已经砍掉的价格
+        $surplusPrice = (float)bcsub($coverPrice, $alreadyPrice, 2); //TODO 用户剩余要砍掉的价格
+        if (0.00 === (float)bcsub($surplusPrice, 0, 2)) return false;
         $data['uid'] = $uid;
         $data['bargain_id'] = $bargainId;
         $data['bargain_user_id'] = $bargainUserTableId;
-        $data['price'] = self::randomFloat($priceSection['bargain_min_price'],$priceSection['bargain_max_price']);
+        $data['price'] = self::randomFloat($priceSection['bargain_min_price'], $priceSection['bargain_max_price']);
         $data['add_time'] = time();
-        if(0.00 === (float)$data['price']) $data['price'] = self::randomFloat($priceSection['bargain_min_price'],$priceSection['bargain_max_price']);
-        if($data['price'] > $surplusPrice) $data['price'] = $surplusPrice;
-        $price = bcadd($alreadyPrice,$data['price'],2);
+        if (0.00 === (float)$data['price']) $data['price'] = self::randomFloat($priceSection['bargain_min_price'], $priceSection['bargain_max_price']);
+        if ($data['price'] > $surplusPrice) $data['price'] = $surplusPrice;
+        $price = bcadd($alreadyPrice, $data['price'], 2);
         $bargainUserData['price'] = $price;
         self::beginTrans();
-        $res1 = StoreBargainUser::setBargainUserPrice($bargainUserTableId,$bargainUserData);
+        $res1 = StoreBargainUser::setBargainUserPrice($bargainUserTableId, $bargainUserData);
         $res2 = self::create($data);
         $res = $res1 && $res2;
         self::checkTrans($res);
@@ -100,9 +103,10 @@ class StoreBargainUserHelp extends BaseModel
      * @param int $max $max 最大数
      * @return string
      */
-    public static function randomFloat($min = 0,$max = 1){
+    public static function randomFloat($min = 0, $max = 1)
+    {
         $num = $min + mt_rand() / mt_getrandmax() * ($max - $min);
-        return sprintf("%.2f",$num);
+        return sprintf("%.2f", $num);
     }
 
     /**
@@ -113,11 +117,12 @@ class StoreBargainUserHelp extends BaseModel
      * @return bool
      * @throws \think\Exception
      */
-    public static function isBargainUserHelpCount($bargainId = 0,$bargainUserUid = 0,$bargainUserHelpUid = 0){
-        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId,$bargainUserUid);
-        $bargainNum = StoreBargain::getBargainNum($bargainId);//TODO 获取每个人可以砍价几次
-        $count = self::where('bargain_id',$bargainId)->where('bargain_user_id',$bargainUserTableId)->where('uid',$bargainUserHelpUid)->count();//TODO 获取当前用户砍价了几次
-        if($count < $bargainNum) return true;
+    public static function isBargainUserHelpCount($bargainId = 0, $bargainUserUid = 0, $bargainUserHelpUid = 0)
+    {
+        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId, $bargainUserUid);
+        $bargainNum = StoreBargain::getBargainNum($bargainId); //TODO 获取每个人可以砍价几次
+        $count = self::where('bargain_id', $bargainId)->where('bargain_user_id', $bargainUserTableId)->where('uid', $bargainUserHelpUid)->count(); //TODO 获取当前用户砍价了几次
+        if ($count < $bargainNum) return true;
         else return false;
     }
 
@@ -128,10 +133,11 @@ class StoreBargainUserHelp extends BaseModel
      * @return int|string
      * @throws \think\Exception
      */
-    public static function getBargainUserHelpPeopleCount($bargainId = 0,$bargainUserUid = 0){
-        if(!$bargainId || !$bargainUserUid) return 0;
-        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId,$bargainUserUid);//TODO 获取用户参与砍价表编号
-        if($bargainUserTableId) return self::where('bargain_user_id',$bargainUserTableId)->where('bargain_id',$bargainId)->count();
+    public static function getBargainUserHelpPeopleCount($bargainId = 0, $bargainUserUid = 0)
+    {
+        if (!$bargainId || !$bargainUserUid) return 0;
+        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId, $bargainUserUid); //TODO 获取用户参与砍价表编号
+        if ($bargainUserTableId) return self::where('bargain_user_id', $bargainUserTableId)->where('bargain_id', $bargainId)->count();
         else return 0;
     }
 
@@ -144,11 +150,12 @@ class StoreBargainUserHelp extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getSurplusPrice($bargainId = 0,$bargainUserUid = 0){
-        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId,$bargainUserUid);// TODO 获取用户参与砍价表编号
-        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 获取用户可以砍掉的金额  好友砍价之后获取砍价金额
-        $alreadyPrice= StoreBargainUser::getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
-        $surplusPrice = (float)bcsub($coverPrice,$alreadyPrice,2);//TODO 用户剩余要砍掉的价格
+    public static function getSurplusPrice($bargainId = 0, $bargainUserUid = 0)
+    {
+        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId, $bargainUserUid); // TODO 获取用户参与砍价表编号
+        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId); //TODO 获取用户可以砍掉的金额  好友砍价之后获取砍价金额
+        $alreadyPrice = StoreBargainUser::getBargainUserPrice($bargainUserTableId); //TODO 用户已经砍掉的价格 好友砍价之后获取用户已经砍掉的价格
+        $surplusPrice = (float)bcsub($coverPrice, $alreadyPrice, 2); //TODO 用户剩余要砍掉的价格
         return $surplusPrice;
     }
 
@@ -161,11 +168,12 @@ class StoreBargainUserHelp extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function getSurplusPricePercent($bargainId = 0,$bargainUserUid = 0){
-        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId,$bargainUserUid); // TODO  获取用户参与砍价表编号 计算进度条
-        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId);//TODO 用户可以砍掉的金额 计算进度条
-        $alreadyPrice = StoreBargainUser::getBargainUserPrice($bargainUserTableId);//TODO 用户已经砍掉的价格 计算进度条
-        if($alreadyPrice) return (int)bcmul(bcdiv($alreadyPrice,$coverPrice,2),100,0);
+    public static function getSurplusPricePercent($bargainId = 0, $bargainUserUid = 0)
+    {
+        $bargainUserTableId = StoreBargainUser::getBargainUserTableId($bargainId, $bargainUserUid); // TODO  获取用户参与砍价表编号 计算进度条
+        $coverPrice = StoreBargainUser::getBargainUserDiffPriceFloat($bargainUserTableId); //TODO 用户可以砍掉的金额 计算进度条
+        $alreadyPrice = StoreBargainUser::getBargainUserPrice($bargainUserTableId); //TODO 用户已经砍掉的价格 计算进度条
+        if ($alreadyPrice) return (int)bcmul(bcdiv($alreadyPrice, $coverPrice, 2), 100, 0);
         else return 0;
     }
 
@@ -177,9 +185,10 @@ class StoreBargainUserHelp extends BaseModel
      * @param string $field
      * @return bool|mixed
      */
-    public static function getBargainUserBargainPrice($bargainId = 0,$bargainUserTableId = 0,$uid = 0,$field = 'price'){
-       if(!$bargainId || !$bargainUserTableId || !$uid) return false;
-       return self::where('uid',$uid)->where('bargain_id',$bargainId)->where('bargain_user_id',$bargainUserTableId)->value($field);
+    public static function getBargainUserBargainPrice($bargainId = 0, $bargainUserTableId = 0, $uid = 0, $field = 'price')
+    {
+        if (!$bargainId || !$bargainUserTableId || !$uid) return false;
+        return self::where('uid', $uid)->where('bargain_id', $bargainId)->where('bargain_user_id', $bargainUserTableId)->value($field);
     }
 
     /**
@@ -187,10 +196,10 @@ class StoreBargainUserHelp extends BaseModel
      * @param int $uid
      * @return array
      */
-    public static function getBargainUserHelpUserInfo($uid = 0){
-        if(!$uid) return [];
-        $userInfo = User::where('uid',$uid)->column('nickname,avatar','uid');
+    public static function getBargainUserHelpUserInfo($uid = 0)
+    {
+        if (!$uid) return [];
+        $userInfo = User::where('uid', $uid)->column('nickname,avatar', 'uid');
         return $userInfo;
     }
 }
-

app/models/store/StoreCart.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/18
- */
 
 namespace app\models\store;
 
@@ -53,7 +48,7 @@ class StoreCart extends BaseModel
             } elseif ($bargain_id) {
                 $id = $bargain_id;
                 $activity_type = 2;
-            } elseif ($combination_id) {//拼团
+            } elseif ($combination_id) { //拼团
                 $id = $combination_id;
                 $activity_type = 3;
             }
@@ -62,7 +57,7 @@ class StoreCart extends BaseModel
                 $product_attr_unique = $unique;
             }
         }
-        if(!StoreOrder::checkProductStock($uid, $product_id,$cart_num,$product_attr_unique,$combination_id,$seckill_id,$bargain_id)){
+        if (!StoreOrder::checkProductStock($uid, $product_id, $cart_num, $product_attr_unique, $combination_id, $seckill_id, $bargain_id)) {
             return self::setErrorInfo(StoreOrder::getErrorInfo());
         }
         if ($cart = self::where('type', $type)->where('uid', $uid)->where('product_id', $product_id)->where('product_attr_unique', $product_attr_unique)->where('is_new', $is_new)->where('is_pay', 0)->where('is_del', 0)->where('combination_id', $combination_id)->where('bargain_id', $bargain_id)->where('seckill_id', $seckill_id)->find()) {
@@ -210,7 +205,6 @@ class StoreCart extends BaseModel
                             continue;
                         }
                     }
-
                 }
                 if ($cart['product_attr_unique']) { // 大部分走这个分支
                     // 从 product_attr_value 表中根据 unique 找到 sku 详情
@@ -307,8 +301,8 @@ class StoreCart extends BaseModel
             } else if (!$product['is_show'] || $product['is_del'] || !$product['stock']) {
                 $invalid[] = $cart;
                 //商品属性不对应
-//            }else if(!StoreProductAttr::issetProductUnique($cart['product_id'],$cart['product_attr_unique'])){
-//                $invalid[] = $cart;
+                //            }else if(!StoreProductAttr::issetProductUnique($cart['product_id'],$cart['product_attr_unique'])){
+                //                $invalid[] = $cart;
                 //正常商品
             } else {
                 $cart['truePrice'] = (float)StoreCombination::where('id', $cart['combination_id'])->value('price');
@@ -347,5 +341,4 @@ class StoreCart extends BaseModel
         return self::whereIn('a.id', $cart_id)->alias('a')->order('a.id desc')
             ->join('store_product p', 'p.id = a.product_id')->value('p.image');
     }
-
 }

app/models/store/StoreCategory.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/12
- */
 
 namespace app\models\store;
 
@@ -74,9 +69,9 @@ class StoreCategory extends BaseModel
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function byIndexList($limit = 4,bool $bool = true, $field = 'id,cate_name,pid,pic')
+    public static function byIndexList($limit = 4, bool $bool = true, $field = 'id,cate_name,pid,pic')
     {
-        if(!$limit && !$bool) return [];
+        if (!$limit && !$bool) return [];
         return self::where('pid', '>', 0)->where('is_show', 1)->field($field)->order('sort DESC')->limit($limit)->select();
     }
 
@@ -86,7 +81,6 @@ class StoreCategory extends BaseModel
      */
     public function children()
     {
-        return $this->hasMany(self::class, 'pid','id')->where('is_show',1)->order('sort DESC,id DESC');
+        return $this->hasMany(self::class, 'pid', 'id')->where('is_show', 1)->order('sort DESC,id DESC');
     }
-
-}
+}

app/models/store/StoreCombination.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/11/11
- */
 
 namespace app\models\store;
 
@@ -249,5 +244,4 @@ class StoreCombination extends BaseModel
         $browse = bcadd($browse, 1, 0);
         self::edit(['browse' => $browse], $id);
     }
-
 }

app/models/store/StoreCoupon.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/22
- */
 
 namespace app\models\store;
 
@@ -31,4 +26,4 @@ class StoreCoupon extends BaseModel
     protected $name = 'store_coupon';
 
     use ModelTrait;
-}
+}

app/models/store/StoreCouponIssue.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/18
- */
 
 namespace app\models\store;
 
@@ -179,6 +174,4 @@ class StoreCouponIssue extends BaseModel
         $cid = self::where('id', $id)->value('cid');
         return StoreCoupon::where('id', $cid)->value('title');
     }
-
-
-}
+}

app/models/store/StoreCouponIssueUser.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2018/01/22
- */
 
 namespace app\models\store;
 
@@ -26,9 +21,9 @@ class StoreCouponIssueUser extends BaseModel
 
     use ModelTrait;
 
-    public static function addUserIssue($uid,$issue_coupon_id)
+    public static function addUserIssue($uid, $issue_coupon_id)
     {
         $add_time = time();
-        return self::create(compact('uid','issue_coupon_id','add_time'));
+        return self::create(compact('uid', 'issue_coupon_id', 'add_time'));
     }
-}
+}

app/models/store/StoreCouponUser.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/20
- */
 
 namespace app\models\store;
 
@@ -111,7 +106,7 @@ class StoreCouponUser extends BaseModel
             if (!isset($catePrice[$value['cate_id']])) $catePrice[$value['cate_id']] = 0;
             $catePrice[$value['cate_id']] = bcadd(bcmul($value['truePrice'], $value['cart_num'], 2), $catePrice[$value['cate_id']], 2);
         }
-//        var_dump($cartGroup['valid']);die;
+        //        var_dump($cartGroup['valid']);die;
         foreach ($cartGroup['valid'] as $value) {
             $lst1[] = $model->alias('a')
                 ->join('store_coupon b', 'b.id=a.cid')
@@ -289,6 +284,4 @@ class StoreCouponUser extends BaseModel
         $data['type'] = $type;
         return self::create($data);
     }
-
-
-}
+}

app/models/store/StoreOrder.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/20
- */
 
 namespace app\models\store;
 
@@ -16,13 +11,22 @@ use crmeb\traits\ModelTrait;
 use app\models\system\SystemStore;
 use app\models\routine\RoutineTemplate;
 use app\models\user\{
-    User, UserAddress, UserBill, WechatUser
+    User,
+    UserAddress,
+    UserBill,
+    WechatUser
 };
 use crmeb\services\{
-    SystemConfigService, WechatTemplateService, workerman\ChannelService
+    SystemConfigService,
+    WechatTemplateService,
+    workerman\ChannelService
 };
 use crmeb\repositories\{
-    GoodsRepository, PaymentRepositories, OrderRepository, ShortLetterRepositories, UserRepository
+    GoodsRepository,
+    PaymentRepositories,
+    OrderRepository,
+    ShortLetterRepositories,
+    UserRepository
 };
 use app\admin\model\system\ShippingTemplates;
 
@@ -74,10 +78,10 @@ class StoreOrder extends BaseModel
      */
     public static function getOrderPriceGroup($cartInfo, $addr)
     {
-        $storeFreePostage = floatval(sys_config('store_free_postage')) ?: 0;//满额包邮
-        $totalPrice = self::getOrderSumPrice($cartInfo, 'truePrice');//获取订单总金额
-        $costPrice = self::getOrderSumPrice($cartInfo, 'costPrice');//获取订单成本价
-        $vipPrice = self::getOrderSumPrice($cartInfo, 'vip_truePrice');//获取订单会员优惠金额
+        $storeFreePostage = floatval(sys_config('store_free_postage')) ?: 0; //满额包邮
+        $totalPrice = self::getOrderSumPrice($cartInfo, 'truePrice'); //获取订单总金额
+        $costPrice = self::getOrderSumPrice($cartInfo, 'costPrice'); //获取订单成本价
+        $vipPrice = self::getOrderSumPrice($cartInfo, 'vip_truePrice'); //获取订单会员优惠金额
         //如果满额包邮等于0
         if (!$storeFreePostage) {
             $storePostage = 0;
@@ -146,7 +150,7 @@ class StoreOrder extends BaseModel
             } else {
                 $storePostage = 0;
             }
-            if ($storeFreePostage <= $totalPrice) $storePostage = 0;//如果总价大于等于满额包邮 邮费等于0
+            if ($storeFreePostage <= $totalPrice) $storePostage = 0; //如果总价大于等于满额包邮 邮费等于0
         }
         return compact('storePostage', 'storeFreePostage', 'totalPrice', 'costPrice', 'vipPrice');
     }
@@ -274,10 +278,25 @@ class StoreOrder extends BaseModel
      * @throws \think\exception\DbException
      */
 
-    public static function cacheKeyCreateOrder($uid, $key, $addressId, $payType, $useIntegral = false, $couponId = 0, 
-        $mark = '', $combinationId = 0, $pinkId = 0, $seckill_id = 0, $bargain_id = 0, $test = false, $isChannel = 0, 
-        $shipping_type = 1, $real_name = '', $phone = '', $storeId = 0)
-    {
+    public static function cacheKeyCreateOrder(
+        $uid,
+        $key,
+        $addressId,
+        $payType,
+        $useIntegral = false,
+        $couponId = 0,
+        $mark = '',
+        $combinationId = 0,
+        $pinkId = 0,
+        $seckill_id = 0,
+        $bargain_id = 0,
+        $test = false,
+        $isChannel = 0,
+        $shipping_type = 1,
+        $real_name = '',
+        $phone = '',
+        $storeId = 0
+    ) {
         self::beginTrans();
         try {
             $shipping_type = (int)$shipping_type;
@@ -319,7 +338,7 @@ class StoreOrder extends BaseModel
             $cartIds = [];
             $totalNum = 0;
             $gainIntegral = 0;
-            foreach ($cartInfo as $cart){
+            foreach ($cartInfo as $cart) {
                 if (!$test && !self::checkProductStock($uid, $cart['product_id'], $cart['cart_num'], $cart['product_attr_unique'], $cart['combination_id'], $cart['seckill_id'], $cart['bargain_id'])) {
                     return false;
                 }
@@ -556,7 +575,7 @@ class StoreOrder extends BaseModel
     {
         //$order = self::where('order_id', $order_id)->where('uid', $uid)->find();
         //comment 20201027 暂定不可取消已付款订单, 取消已付款订单意味着什么?^M
-        $order = self::where('order_id', $order_id)->where('uid', $uid)->where('paid',0)->find();
+        $order = self::where('order_id', $order_id)->where('uid', $uid)->where('paid', 0)->find();
         if (!$order) return self::setErrorInfo('没有查到此订单');
         self::beginTrans();
         try {
@@ -636,7 +655,7 @@ class StoreOrder extends BaseModel
     public static function getStoreCode()
     {
         list($msec, $sec) = explode(' ', microtime());
-        $num = bcadd(time(), mt_rand(10, 999999), 0) . '' . substr($msec, 2, 3);//生成随机数
+        $num = bcadd(time(), mt_rand(10, 999999), 0) . '' . substr($msec, 2, 3); //生成随机数
         if (strlen($num) < 12)
             $num = str_pad((string)$num, 12, 0, STR_PAD_RIGHT);
         else
@@ -661,7 +680,7 @@ class StoreOrder extends BaseModel
         $orderInfo = self::where('uid', $uid)->where('order_id', $order_id)->where('is_del', 0)->find();
         if (!$orderInfo) return self::setErrorInfo('订单不存在!');
         if ($orderInfo['paid']) return self::setErrorInfo('该订单已支付!');
-//        if($orderInfo['pay_type'] != 'yue') return self::setErrorInfo('该订单不能使用余额支付!');
+        //        if($orderInfo['pay_type'] != 'yue') return self::setErrorInfo('该订单不能使用余额支付!');
         $userInfo = User::getUserInfo($uid);
         if ($userInfo['now_money'] < $orderInfo['pay_price'])
             return self::setErrorInfo(['status' => 'pay_deficiency', 'msg' => '余额不足' . floatval($orderInfo['pay_price'])]);
@@ -669,7 +688,7 @@ class StoreOrder extends BaseModel
 
         $res1 = false !== User::bcDec($uid, 'now_money', $orderInfo['pay_price'], 'uid');
         $res2 = UserBill::expend('购买商品', $uid, 'now_money', 'pay_product', $orderInfo['pay_price'], $orderInfo['id'], $userInfo['now_money'], '余额支付' . floatval($orderInfo['pay_price']) . '元购买商品');
-        $res3 = self::paySuccess($order_id, 'yue', $formId);//余额支付成功
+        $res3 = self::paySuccess($order_id, 'yue', $formId); //余额支付成功
         try {
             PaymentRepositories::yuePayProduct($userInfo, $orderInfo);
         } catch (\Exception $e) {
@@ -700,7 +719,7 @@ class StoreOrder extends BaseModel
         $userInfo = User::getUserInfo($uid);
         self::beginTrans();
         $res1 = UserBill::expend('购买商品', $uid, 'now_money', 'pay_product', $orderInfo['pay_price'], $orderInfo['id'], $userInfo['now_money'], '微信支付' . floatval($orderInfo['pay_price']) . '元购买商品');
-        $res2 = self::paySuccess($order_id, 'weixin', $formId);//微信支付为0时
+        $res2 = self::paySuccess($order_id, 'weixin', $formId); //微信支付为0时
         $res = $res1 && $res2;
         self::checkTrans($res);
         return $res;
@@ -765,8 +784,8 @@ class StoreOrder extends BaseModel
     {
         $order = self::where('order_id', $orderId)->find();
         $resPink = true;
-        $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time()]);//订单改为支付
-        if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order);//创建拼团
+        $res1 = self::where('order_id', $orderId)->update(['paid' => 1, 'pay_type' => $paytype, 'pay_time' => time()]); //订单改为支付
+        if ($order->combination_id && $res1 && !$order->refund_status) $resPink = StorePink::createPink($order); //创建拼团
         $oid = self::where('order_id', $orderId)->value('id');
         StoreOrderStatus::status($oid, 'pay_success', '用户付款成功');
         $now_money = User::where('uid', $order['uid'])->value('now_money');
@@ -786,20 +805,20 @@ class StoreOrder extends BaseModel
     {
 
         //$goodsName = StoreOrderCartInfo::getProductNameList($order['id']);
-//        RoutineTemplateService::sendTemplate(WechatUser::getOpenId($order['uid']),RoutineTemplateService::ORDER_CREATE, [
-//            'first'=>'亲，您购买的商品已支付成功',
-//            'keyword1'=>date('Y/m/d H:i',$order['add_time']),
-//            'keyword2'=>implode(',',$goodsName),
-//            'keyword3'=>$order['order_id'],
-//            'remark'=>'点击查看订单详情'
-//        ],Url::build('/wap/My/order',['uni'=>$order['order_id']],true,true));
-//        RoutineTemplateService::sendAdminNoticeTemplate([
-//            'first'=>"亲,您有一个新订单 \n订单号:{$order['order_id']}",
-//            'keyword1'=>'新订单',
-//            'keyword2'=>'线下支付',
-//            'keyword3'=>date('Y/m/d H:i',time()),
-//            'remark'=>'请及时处理'
-//        ]);
+        //        RoutineTemplateService::sendTemplate(WechatUser::getOpenId($order['uid']),RoutineTemplateService::ORDER_CREATE, [
+        //            'first'=>'亲，您购买的商品已支付成功',
+        //            'keyword1'=>date('Y/m/d H:i',$order['add_time']),
+        //            'keyword2'=>implode(',',$goodsName),
+        //            'keyword3'=>$order['order_id'],
+        //            'remark'=>'点击查看订单详情'
+        //        ],Url::build('/wap/My/order',['uni'=>$order['order_id']],true,true));
+        //        RoutineTemplateService::sendAdminNoticeTemplate([
+        //            'first'=>"亲,您有一个新订单 \n订单号:{$order['order_id']}",
+        //            'keyword1'=>'新订单',
+        //            'keyword2'=>'线下支付',
+        //            'keyword3'=>date('Y/m/d H:i',time()),
+        //            'remark'=>'请及时处理'
+        //        ]);
     }
 
     /**
@@ -825,9 +844,9 @@ class StoreOrder extends BaseModel
     public static function orderPostageAfter($postageData, $oid)
     {
         $order = self::where('id', $oid)->find();
-        if ($postageData['delivery_type'] == 'send') {//送货
+        if ($postageData['delivery_type'] == 'send') { //送货
             RoutineTemplate::sendOrderPostage($order);
-        } else if ($postageData['delivery_type'] == 'express') {//发货
+        } else if ($postageData['delivery_type'] == 'express') { //发货
             RoutineTemplate::sendOrderPostage($order, 1);
         }
     }
@@ -838,7 +857,7 @@ class StoreOrder extends BaseModel
     public static function orderTakeAfter($order)
     {
         $title = self::getProductTitle($order['cart_id']);
-        if ($order['is_channel'] == 1) {//小程序
+        if ($order['is_channel'] == 1) { //小程序
             RoutineTemplate::sendOrderTakeOver($order, $title);
         } else {
             $openid = WechatUser::where('uid', $order['uid'])->value('openid');
@@ -890,8 +909,10 @@ class StoreOrder extends BaseModel
         $order = self::tidyOrder($order);
         if ($order['_status']['_type'] != 2) return self::setErrorInfo('订单状态错误!');
         self::beginTrans();
-        if (false !== self::edit(['status' => 2], $order['id'], 'id') &&
-            false !== StoreOrderStatus::status($order['id'], 'user_take_delivery', '用户已收货')) {
+        if (
+            false !== self::edit(['status' => 2], $order['id'], 'id') &&
+            false !== StoreOrderStatus::status($order['id'], 'user_take_delivery', '用户已收货')
+        ) {
             try {
                 OrderRepository::storeProductOrderUserTakeDelivery($order, $uid);
                 UserBill::where('uid', $order['uid'])->where('link_id', $order['id'])->where('type', 'pay_money')->update(['take' => 1]);
@@ -1010,12 +1031,12 @@ class StoreOrder extends BaseModel
                 }
             }
         } else if ($order['status'] == 1) {
-            if ($order['delivery_type'] == 'send') {//TODO 送货
+            if ($order['delivery_type'] == 'send') { //TODO 送货
                 $status['_type'] = 2;
                 $status['_title'] = '待收货';
                 $status['_msg'] = date('m月d日H时i分', StoreOrderStatus::getTime($order['id'], 'delivery')) . '服务商已送货';
                 $status['_class'] = 'state-ysh';
-            } else {//TODO  发货
+            } else { //TODO  发货
                 $status['_type'] = 2;
                 $status['_title'] = '待收货';
                 if ($order['delivery_type'] == 'fictitious')
@@ -1067,29 +1088,29 @@ class StoreOrder extends BaseModel
      */
     public static function statusByWhere($status, $uid = 0, $model = null)
     {
-//        $orderId = StorePink::where('uid',$uid)->where('status',1)->column('order_id','id');//获取正在拼团的订单编号
+        //        $orderId = StorePink::where('uid',$uid)->where('status',1)->column('order_id','id');//获取正在拼团的订单编号
         if ($model == null) $model = new self;
         if ('' === $status)
             return $model;
-        else if ($status == 0)//未支付
+        else if ($status == 0) //未支付
             return $model->where('paid', 0)->where('status', 0)->where('refund_status', 0);
-        else if ($status == 1)//待发货
+        else if ($status == 1) //待发货
             return $model->where('paid', 1)->where('status', 0)->where('refund_status', 0);
-        else if ($status == 2)//待收货
+        else if ($status == 2) //待收货
             return $model->where('paid', 1)->where('status', 1)->where('refund_status', 0);
-        else if ($status == 3)//待评价
+        else if ($status == 3) //待评价
             return $model->where('paid', 1)->where('status', 2)->where('refund_status', 0);
-        else if ($status == 4)//已完成
+        else if ($status == 4) //已完成
             return $model->where('paid', 1)->where('status', 3)->where('refund_status', 0);
-        else if ($status == -1)//退款中
+        else if ($status == -1) //退款中
             return $model->where('paid', 1)->where('refund_status', 1);
-        else if ($status == -2)//已退款
+        else if ($status == -2) //已退款
             return $model->where('paid', 1)->where('refund_status', 2);
-        else if ($status == -3)//退款
+        else if ($status == -3) //退款
             return $model->where('paid', 1)->where('refund_status', 'IN', '1,2');
-//        else if($status == 11){
-//            return $model->where('order_id','IN',implode(',',$orderId));
-//        }
+        //        else if($status == 11){
+        //            return $model->where('order_id','IN',implode(',',$orderId));
+        //        }
         else
             return $model;
     }
@@ -1149,7 +1170,6 @@ class StoreOrder extends BaseModel
             return false;
         else
             return self::tidyOrder($order->toArray(), true);
-
     }
 
     /**
@@ -1322,11 +1342,11 @@ class StoreOrder extends BaseModel
      */
     public static function getOrderTimeData()
     {
-        $to_day = strtotime(date('Y-m-d'));//今日
-        $pre_day = strtotime(date('Y-m-d', strtotime('-1 day')));//昨日
-        $now_month = strtotime(date('Y-m'));//本月
+        $to_day = strtotime(date('Y-m-d')); //今日
+        $pre_day = strtotime(date('Y-m-d', strtotime('-1 day'))); //昨日
+        $now_month = strtotime(date('Y-m')); //本月
         //今日成交额
-//        $data['todayPrice'] = (float)number_format(self::where('is_del', 0)->where('pay_time', '>=', $to_day)->where('paid', 1)->where('refund_status', 0)->value('sum(pay_price)'), 2) ?? 0;
+        //        $data['todayPrice'] = (float)number_format(self::where('is_del', 0)->where('pay_time', '>=', $to_day)->where('paid', 1)->where('refund_status', 0)->value('sum(pay_price)'), 2) ?? 0;
         $data['todayPrice'] = number_format(self::where('is_del', 0)->where('pay_time', '>=', $to_day)->where('paid', 1)->where('refund_status', 0)->value('sum(pay_price)'), 2) ?? 0;
         //今日订单数
         $data['todayCount'] = self::where('is_del', 0)->where('pay_time', '>=', $to_day)->where('paid', 1)->where('refund_status', 0)->count();
@@ -1462,7 +1482,6 @@ class StoreOrder extends BaseModel
             errlog('未支付自动取消时发生系统错误，错误原因为：' . $e->getMessage());
             throw new \Exception($e->getMessage());
         }
-
     }
 
 
@@ -1540,7 +1559,6 @@ class StoreOrder extends BaseModel
 
     public static function yueRefundAfter($order)
     {
-
     }
 
     /**
@@ -1606,7 +1624,6 @@ class StoreOrder extends BaseModel
         if (!$res) {
             throw new \Exception('');
         }
-
     }
 
     /**
@@ -1693,62 +1710,62 @@ class StoreOrder extends BaseModel
             }
             $item['_info'] = $_info;
             $item['add_time'] = date('Y-m-d H:i:s', $item['add_time']);
-//            if($item['pink_id'] || $item['combination_id']){
-//                $pinkStatus = StorePink::where('order_id_key',$item['id'])->value('status');
-//                switch ($pinkStatus){
-//                    case 1:
-//                        $item['pink_name'] = '[拼团订单]正在进行中';
-//                        $item['color'] = '#f00';
-//                        break;
-//                    case 2:
-//                        $item['pink_name'] = '[拼团订单]已完成';
-//                        $item['color'] = '#00f';
-//                        break;
-//                    case 3:
-//                        $item['pink_name'] = '[拼团订单]未完成';
-//                        $item['color'] = '#f0f';
-//                        break;
-//                    default:
-//                        $item['pink_name'] = '[拼团订单]历史订单';
-//                        $item['color'] = '#457856';
-//                        break;
-//                }
-//            }elseif ($item['seckill_id']){
-//                $item['pink_name'] = '[秒杀订单]';
-//                $item['color'] = '#32c5e9';
-//            }elseif ($item['bargain_id']){
-//                $item['pink_name'] = '[砍价订单]';
-//                $item['color'] = '#12c5e9';
-//            }else{
-//                $item['pink_name'] = '[普通订单]';
-//                $item['color'] = '#895612';
-//            }
-//            if($item['paid']==1){
-//                switch ($item['pay_type']){
-//                    case 'weixin':
-//                        $item['pay_type_name']='微信支付';
-//                        break;
-//                    case 'yue':
-//                        $item['pay_type_name']='余额支付';
-//                        break;
-//                    case 'offline':
-//                        $item['pay_type_name']='线下支付';
-//                        break;
-//                    default:
-//                        $item['pay_type_name']='其他支付';
-//                        break;
-//                }
-//            }else{
-//                switch ($item['pay_type']){
-//                    default:
-//                        $item['pay_type_name']='未支付';
-//                        break;
-//                    case 'offline':
-//                        $item['pay_type_name']='线下支付';
-//                        $item['pay_type_info']=1;
-//                        break;
-//                }
-//            }
+            //            if($item['pink_id'] || $item['combination_id']){
+            //                $pinkStatus = StorePink::where('order_id_key',$item['id'])->value('status');
+            //                switch ($pinkStatus){
+            //                    case 1:
+            //                        $item['pink_name'] = '[拼团订单]正在进行中';
+            //                        $item['color'] = '#f00';
+            //                        break;
+            //                    case 2:
+            //                        $item['pink_name'] = '[拼团订单]已完成';
+            //                        $item['color'] = '#00f';
+            //                        break;
+            //                    case 3:
+            //                        $item['pink_name'] = '[拼团订单]未完成';
+            //                        $item['color'] = '#f0f';
+            //                        break;
+            //                    default:
+            //                        $item['pink_name'] = '[拼团订单]历史订单';
+            //                        $item['color'] = '#457856';
+            //                        break;
+            //                }
+            //            }elseif ($item['seckill_id']){
+            //                $item['pink_name'] = '[秒杀订单]';
+            //                $item['color'] = '#32c5e9';
+            //            }elseif ($item['bargain_id']){
+            //                $item['pink_name'] = '[砍价订单]';
+            //                $item['color'] = '#12c5e9';
+            //            }else{
+            //                $item['pink_name'] = '[普通订单]';
+            //                $item['color'] = '#895612';
+            //            }
+            //            if($item['paid']==1){
+            //                switch ($item['pay_type']){
+            //                    case 'weixin':
+            //                        $item['pay_type_name']='微信支付';
+            //                        break;
+            //                    case 'yue':
+            //                        $item['pay_type_name']='余额支付';
+            //                        break;
+            //                    case 'offline':
+            //                        $item['pay_type_name']='线下支付';
+            //                        break;
+            //                    default:
+            //                        $item['pay_type_name']='其他支付';
+            //                        break;
+            //                }
+            //            }else{
+            //                switch ($item['pay_type']){
+            //                    default:
+            //                        $item['pay_type_name']='未支付';
+            //                        break;
+            //                    case 'offline':
+            //                        $item['pay_type_name']='线下支付';
+            //                        $item['pay_type_info']=1;
+            //                        break;
+            //                }
+            //            }
 
             if ($status) {
                 $status = [];
@@ -1813,12 +1830,12 @@ class StoreOrder extends BaseModel
                         $status['_class'] = 'state-nfh';
                     }
                 } else if ($item['status'] == 1) {
-                    if ($item['delivery_type'] == 'send') {//TODO 送货
+                    if ($item['delivery_type'] == 'send') { //TODO 送货
                         $status['_type'] = 2;
                         $status['_title'] = '待收货';
                         $status['_msg'] = date('m月d日H时i分', StoreOrderStatus::getTime($item['id'], 'delivery')) . '服务商已送货';
                         $status['_class'] = 'state-ysh';
-                    } else {//TODO  发货
+                    } else { //TODO  发货
                         $status['_type'] = 2;
                         $status['_title'] = '待收货';
                         $status['_msg'] = date('m月d日H时i分', StoreOrderStatus::getTime($item['id'], 'delivery_goods')) . '服务商已发货';
@@ -1853,30 +1870,30 @@ class StoreOrder extends BaseModel
                     $item['status_name'] = '已完成';
                 }
             }
-//            unset($item['refund_status']);
-//            else if($item['paid']==1 && $item['refund_status']==1){
-//                $item['status_name']=<<<HTML
-//<b style="color:#f124c7">申请退款</b><br/>
-//<span>退款原因：{$item['refund_reason_wap']}</span>
-//HTML;
-//            }else if($item['paid']==1 && $item['refund_status']==2){
-//                $item['status_name']='已退款';
-//            }
-//            if($item['paid']==0 && $item['status']==0 && $item['refund_status']==0){
-//                $item['_status']=1;
-//            }else if($item['paid']==1 && $item['status']==0 && $item['refund_status']==0){
-//                $item['_status']=2;
-//            }else if($item['paid']==1 && $item['refund_status']==1){
-//                $item['_status']=3;
-//            }else if($item['paid']==1 && $item['status']==1 && $item['refund_status']==0){
-//                $item['_status']=4;
-//            }else if($item['paid']==1 && $item['status']==2 && $item['refund_status']==0){
-//                $item['_status']=5;
-//            }else if($item['paid']==1 && $item['status']==3 && $item['refund_status']==0){
-//                $item['_status']=6;
-//            }else if($item['paid']==1 && $item['refund_status']==2){
-//                $item['_status']=7;
-//            }
+            //            unset($item['refund_status']);
+            //            else if($item['paid']==1 && $item['refund_status']==1){
+            //                $item['status_name']=<<<HTML
+            //<b style="color:#f124c7">申请退款</b><br/>
+            //<span>退款原因：{$item['refund_reason_wap']}</span>
+            //HTML;
+            //            }else if($item['paid']==1 && $item['refund_status']==2){
+            //                $item['status_name']='已退款';
+            //            }
+            //            if($item['paid']==0 && $item['status']==0 && $item['refund_status']==0){
+            //                $item['_status']=1;
+            //            }else if($item['paid']==1 && $item['status']==0 && $item['refund_status']==0){
+            //                $item['_status']=2;
+            //            }else if($item['paid']==1 && $item['refund_status']==1){
+            //                $item['_status']=3;
+            //            }else if($item['paid']==1 && $item['status']==1 && $item['refund_status']==0){
+            //                $item['_status']=4;
+            //            }else if($item['paid']==1 && $item['status']==2 && $item['refund_status']==0){
+            //                $item['_status']=5;
+            //            }else if($item['paid']==1 && $item['status']==3 && $item['refund_status']==0){
+            //                $item['_status']=6;
+            //            }else if($item['paid']==1 && $item['refund_status']==2){
+            //                $item['_status']=7;
+            //            }
         }
         return $data;
     }
@@ -1943,21 +1960,21 @@ class StoreOrder extends BaseModel
         if ($model == null) $model = new self;
         if ('' === $status)
             return $model;
-        else if ($status == 0)//未支付
+        else if ($status == 0) //未支付
             return $model->where($alert . 'paid', 0)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
-        else if ($status == 1)//已支付 未发货
+        else if ($status == 1) //已支付 未发货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 0)->where($alert . 'refund_status', 0);
-        else if ($status == 2)//已支付  待收货
+        else if ($status == 2) //已支付  待收货
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 1)->where($alert . 'refund_status', 0);
-        else if ($status == 3)// 已支付  已收货  待评价
+        else if ($status == 3) // 已支付  已收货  待评价
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 2)->where($alert . 'refund_status', 0);
-        else if ($status == 4)// 交易完成
+        else if ($status == 4) // 交易完成
             return $model->where($alert . 'paid', 1)->where($alert . 'status', 3)->where($alert . 'refund_status', 0);
-        else if ($status == -1)//退款中
+        else if ($status == -1) //退款中
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 1);
-        else if ($status == -2)//已退款
+        else if ($status == -2) //已退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 2);
-        else if ($status == -3)//退款
+        else if ($status == -3) //退款
             return $model->where($alert . 'paid', 1)->where($alert . 'refund_status', 'in', '1,2');
         else
             return $model;
@@ -2070,7 +2087,7 @@ class StoreOrder extends BaseModel
     public static function sendTen()
     {
         $switch = sys_config('unpaid_order_switch') ? true : false;
-        if($switch){
+        if ($switch) {
             $list = self::where('paid', 0)
                 ->where('is_del', 0)
                 ->where('is_system_del', 0)
@@ -2112,7 +2129,6 @@ class StoreOrder extends BaseModel
             $query->where("{$alias}is_del", 0);
         });
         return $model;
-
     }
 
     public static function getOrderProductReplyList($where)
@@ -2186,7 +2202,7 @@ class StoreOrder extends BaseModel
             $product_stock = StoreProductAttrValue::where('product_id', $StoreBargainInfo['product_id'])->where('suk', $res['suk'])->where('type', 0)->value('stock');
             if ($product_stock < $cart_num)
                 return self::setErrorInfo('该产品库存不足' . $cart_num);
-        } elseif ($combination_id) {//拼团
+        } elseif ($combination_id) { //拼团
             $StoreCombinationInfo = StoreCombination::getCombinationOne($combination_id);
             if (!$StoreCombinationInfo)
                 return self::setErrorInfo('该产品已下架或删除');
@@ -2209,5 +2225,4 @@ class StoreOrder extends BaseModel
         }
         return true;
     }
-
 }

app/models/store/StoreOrderBatch.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/20
- */
 
 namespace app\models\store;
 
@@ -12,10 +7,17 @@ use think\facade\Cache;
 use crmeb\traits\ModelTrait;
 use app\models\system\SystemStore;
 use app\models\user\{
-    User, UserAddress, UserBill, WechatUser
+    User,
+    UserAddress,
+    UserBill,
+    WechatUser
 };
 use crmeb\repositories\{
-    GoodsRepository, PaymentRepositories, OrderRepository, ShortLetterRepositories, UserRepository
+    GoodsRepository,
+    PaymentRepositories,
+    OrderRepository,
+    ShortLetterRepositories,
+    UserRepository
 };
 use EasyWeChat\Store\Store;
 
@@ -34,7 +36,8 @@ use EasyWeChat\Store\Store;
  *  支付接口按大訂單號走，發貨等訂單管理按子訂單走。
  *  這樣有一個問題：子訂單退貨沒法執行三方支付退款(暫定)
  */
-class StoreOrderBatch extends BaseModel {
+class StoreOrderBatch extends BaseModel
+{
     /**
      * 数据表主键
      * @var string
@@ -110,11 +113,11 @@ class StoreOrderBatch extends BaseModel {
      * 获取所有子订单
      * @param string $porderId: porder_id
      */
-    public static function getAllSubOrders(string $porderId): Array
+    public static function getAllSubOrders(string $porderId): array
     {
         $subOrders = self::alias('b')->join('StoreOrder o', 'o.id=b.oid')
             ->where('b.porder_id', $porderId)->select()->toArray();
-        foreach($subOrders as &$subOrder) {
+        foreach ($subOrders as &$subOrder) {
             $subOrder['cart_id'] = json_decode($subOrder['cart_id'], true);
         }
         return $subOrders;
@@ -126,11 +129,11 @@ class StoreOrderBatch extends BaseModel {
      * @param Array $field_name_list
      * @return Array
      */
-    public static function sumFields(Array $marr, Array $field_name_list): Array
+    public static function sumFields(array $marr, array $field_name_list): array
     {
         $sums = [];
-        foreach($marr as $row) {
-            foreach($field_name_list as $fname) {
+        foreach ($marr as $row) {
+            foreach ($field_name_list as $fname) {
                 $fv = $row[$fname] ?? 0;    // field value
                 $sums[$fname] = (float)bcadd($sums[$fname] ?? 0, $fv, 2);
             }
@@ -138,7 +141,7 @@ class StoreOrderBatch extends BaseModel {
         return $sums;
     }
 
-     /**
+    /**
      * 微信支付 为 0元时
      * @param $order_id
      * @param $uid
@@ -158,9 +161,9 @@ class StoreOrderBatch extends BaseModel {
         $userInfo = User::getUserInfo($uid);
         self::beginTrans();
         $res1 = $res2 = true;
-        foreach($subOrders as $orderInfo) {
+        foreach ($subOrders as $orderInfo) {
             $res1 = $res1 && UserBill::expend('购买商品', $uid, 'now_money', 'pay_product', $orderInfo['pay_price'], $orderInfo['id'], $userInfo['now_money'], '微信支付' . floatval($orderInfo['pay_price']) . '元购买商品');
-            $res2 = $res2 && StoreOrder::paySuccess($orderInfo['order_id'], 'weixin', $formId);//微信支付为0时
+            $res2 = $res2 && StoreOrder::paySuccess($orderInfo['order_id'], 'weixin', $formId); //微信支付为0时
         }
         $res = $res1 && $res2;
         self::checkTrans($res);
@@ -176,7 +179,7 @@ class StoreOrderBatch extends BaseModel {
     {
         $title = '';
         $cartId = [];
-        foreach($subOrders as $order) {
+        foreach ($subOrders as $order) {
             $cartId = array_merge($cartId, $order['cart_id']);
         }
         try {
@@ -232,10 +235,10 @@ class StoreOrderBatch extends BaseModel {
 
         self::beginTrans();
         $res1 = $res2 = $res3 = true;
-        foreach($subOrders as $orderInfo) {
+        foreach ($subOrders as $orderInfo) {
             $res1 = $res1 && (false !== User::bcDec($uid, 'now_money', $orderInfo['pay_price'], 'uid'));
             $res2 = $res2 && UserBill::expend('购买商品', $uid, 'now_money', 'pay_product', $orderInfo['pay_price'], $orderInfo['id'], $userInfo['now_money'], '余额支付' . floatval($orderInfo['pay_price']) . '元购买商品');
-            $res3 = $res3 && StoreOrder::paySuccess($orderInfo['order_id'], 'yue', $formId);//余额支付成功
+            $res3 = $res3 && StoreOrder::paySuccess($orderInfo['order_id'], 'yue', $formId); //余额支付成功
             try {
                 PaymentRepositories::yuePayProduct($userInfo, $orderInfo);
             } catch (\Exception $e) {
@@ -243,7 +246,7 @@ class StoreOrderBatch extends BaseModel {
                 return self::setErrorInfo($e->getMessage());
             }
         }
-       
+
         $res = $res1 && $res2 && $res3;
         self::checkTrans($res);
         return $res;
@@ -253,7 +256,7 @@ class StoreOrderBatch extends BaseModel {
     {
         $subOrders = self::getAllSubOrders($porderId);
         $res = true;
-        foreach($subOrders as $order) {
+        foreach ($subOrders as $order) {
             $res = $res && StoreOrder::paySuccess($order['order_id'], $paytype, $formId);
         }
         return $res;
@@ -284,10 +287,25 @@ class StoreOrderBatch extends BaseModel {
      * @throws \think\db\exception\ModelNotFoundException
      * @throws \think\exception\DbException
      */
-    public static function cacheKeyCreateOrderBatch($uid, $key, $addressId, $payType, $useIntegral = false, $couponId = 0, 
-        $mark = '', $combinationId = 0, $pinkId = 0, $seckill_id = 0, $bargain_id = 0, $test = false, $isChannel = 0, 
-        $shipping_type = 1, $real_name = '', $phone = '', $storeId = 0)
-    {
+    public static function cacheKeyCreateOrderBatch(
+        $uid,
+        $key,
+        $addressId,
+        $payType,
+        $useIntegral = false,
+        $couponId = 0,
+        $mark = '',
+        $combinationId = 0,
+        $pinkId = 0,
+        $seckill_id = 0,
+        $bargain_id = 0,
+        $test = false,
+        $isChannel = 0,
+        $shipping_type = 1,
+        $real_name = '',
+        $phone = '',
+        $storeId = 0
+    ) {
         StoreOrder::beginTrans();
         try {
             $shipping_type = (int)$shipping_type;
@@ -354,7 +372,7 @@ class StoreOrderBatch extends BaseModel {
 
                 // 一个订单的购物车
                 $subOrderCart = [$ci];
-                
+
                 $subOrderId = StoreOrder::getNewOrderId();
                 $subPriceGroup = StoreOrder::getOrderPriceGroup($subOrderCart, $addr);
                 if (!$subPriceGroup) {
@@ -366,7 +384,7 @@ class StoreOrderBatch extends BaseModel {
                 $cartIds = [];      // 子订单购物车ID
                 $totalNum = 0;      // 总数量
                 $gainIntegral = 0;  // 总可得积分
-                foreach ($subOrderCart as $cart){
+                foreach ($subOrderCart as $cart) {
                     // sql-6 x n
                     if (!$test && !StoreOrder::checkProductStock($uid, $cart['product_id'], $cart['cart_num'], $cart['product_attr_unique'], $cart['combination_id'], $cart['seckill_id'], $cart['bargain_id'])) {
                         return false;
@@ -381,7 +399,7 @@ class StoreOrderBatch extends BaseModel {
                     // 汇总
                     $gainIntegral = bcadd($gainIntegral, $cartInfoGainIntegral, 2);
                 } // foreach
-                
+
                 // 活动
                 $deduction = $seckill_id || $bargain_id || $combinationId;
                 if ($deduction) {
@@ -391,9 +409,9 @@ class StoreOrderBatch extends BaseModel {
                         unset(StoreOrder::$payType['offline']);
                         if (!array_key_exists($payType, StoreOrder::$payType)) {
                             return self::setErrorInfo('营销产品不能使用线下支付!', true);
-                        } 
+                        }
                     }
-                }// 
+                } // 
 
                 //使用优惠劵
                 $res1 = true;
@@ -473,7 +491,7 @@ class StoreOrderBatch extends BaseModel {
                 if ($userInfo['integral'] < 0) {
                     $userInfo['integral'] = 0;
                 }
-                
+
                 $totalDeductionPrice = (float)bcadd($totalDeductionPrice, $deductionPrice, 2);
                 $totalPayPrice = (float)bcadd($totalPayPrice, $payPrice, 2);
 
@@ -481,7 +499,7 @@ class StoreOrderBatch extends BaseModel {
                     continue;
                 }
 
-                $unique = mb_substr($key, 0, mb_strlen($key)-3) . $counter;
+                $unique = mb_substr($key, 0, mb_strlen($key) - 3) . $counter;
                 // 增加子订单
                 $orderInfo = [
                     'uid' => $uid,
@@ -545,7 +563,7 @@ class StoreOrderBatch extends BaseModel {
                 StoreOrderStatus::status($order['id'], 'cache_key_create_order', '订单生成');
                 $subOrders[] = $order;
             } // foreach 
-            
+
             if ($totalPayPrice <= 0) $totalPayPrice = 0;
 
             if ($test) {
@@ -561,7 +579,7 @@ class StoreOrderBatch extends BaseModel {
             }
 
             $pOrderId = self::getNewPOrderId();
-            foreach($subOrders as $subOrder) {
+            foreach ($subOrders as $subOrder) {
                 $porderInfo = [
                     'porder_id' => $pOrderId,
                     'oid' => $subOrder['id'],
@@ -570,7 +588,7 @@ class StoreOrderBatch extends BaseModel {
                     'uid' => $uid,
                 ];
                 $porder = self::create($porderInfo);
-                if(!$porder) {
+                if (!$porder) {
                     return self::setErrorInfo('订单生成失败!', true);
                 }
             }
@@ -589,4 +607,4 @@ class StoreOrderBatch extends BaseModel {
             return self::setErrorInfo('生成订单时系统错误错误原因：' . $e->getMessage());
         }
     }
-}
+}

app/models/store/StoreOrderCartInfo.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/26
- */
 
 namespace app\models\store;
 
@@ -25,16 +20,16 @@ class StoreOrderCartInfo extends BaseModel
 
     use ModelTrait;
 
-    public static function setCartInfo($oid,array $cartInfo)
+    public static function setCartInfo($oid, array $cartInfo)
     {
         $group = [];
-        foreach ($cartInfo as $cart){
+        foreach ($cartInfo as $cart) {
             $group[] = [
-                'oid'=>$oid,
-                'cart_id'=>$cart['id'],
-                'product_id'=>$cart['productInfo']['id'],
-                'cart_info'=>json_encode($cart),
-                'unique'=>md5($cart['id'].''.$oid)
+                'oid' => $oid,
+                'cart_id' => $cart['id'],
+                'product_id' => $cart['productInfo']['id'],
+                'cart_info' => json_encode($cart),
+                'unique' => md5($cart['id'] . '' . $oid)
             ];
         }
         return self::setAll($group);
@@ -46,7 +41,8 @@ class StoreOrderCartInfo extends BaseModel
      * @param $uid
      * @return mixed
      */
-    public static function getMiningOrderId($uid) {
+    public static function getMiningOrderId($uid)
+    {
         $row = self::where('so.uid', $uid)
             ->where('so.paid', 1)
             ->where('so.status', '>=', 0)
@@ -64,7 +60,8 @@ class StoreOrderCartInfo extends BaseModel
      * @param $orderId
      * @return StoreOrderCartInfo
      */
-    public static function setMining($orderId, $mine=1) {
-        return self::where('oid', $orderId)->update(['mine'=>$mine]);
+    public static function setMining($orderId, $mine = 1)
+    {
+        return self::where('oid', $orderId)->update(['mine' => $mine]);
     }
-}
+}

app/models/store/StoreOrderStatus.php

@@ -1,9 +1,4 @@
 <?php
-/**
- *
- * @author: xaboy<365615158@qq.com>
- * @day: 2017/12/28
- */
 
 namespace app\models\store;
 
@@ -25,15 +20,14 @@ class StoreOrderStatus extends BaseModel
 
     use ModelTrait;
 
-    public static function status($oid,$change_type,$change_message,$change_time = null)
+    public static function status($oid, $change_type, $change_message, $change_time = null)
     {
-        if($change_time == null) $change_time = time();
-        return self::create(compact('oid','change_type','change_message','change_time'));
+        if ($change_time == null) $change_time = time();
+        return self::create(compact('oid', 'change_type', 'change_message', 'change_time'));
     }
 
-    public static function getTime($oid,$change_type)
+    public static function getTime($oid, $change_type)
     {
-        return self::where('oid',$oid)->where('change_type',$change_type)->value('change_time');
+        return self::where('oid', $oid)->where('change_type', $change_type)->value('change_time');
     }
-
-}
+}