commit

app/admin/view/store/store_category/index.php

@@ -60,6 +60,7 @@
                         <a class="layui-btn layui-btn-sm" href="{:Url('index')}">分类首页</a>
                         <button type="button" class="layui-btn layui-btn-sm" onclick="$eb.createModalFrame(this.innerText,'{:Url('create')}')">添加分类</button>
                     </div>
+
                     <table class="layui-hide" id="List" lay-filter="List"></table>
                     <script type="text/html" id="pic">
                         {{# if(d.pic){ }}
@@ -78,9 +79,11 @@
                         <button class="layui-btn layui-btn-xs" onclick="$eb.createModalFrame('编辑','{:Url('edit')}?id={{d.id}}')">
                             <i class="fa fa-edit"></i> 编辑
                         </button>
+                        {{# if(d.id > 4){ }}
                         <button class="layui-btn btn-danger layui-btn-xs" lay-event='delstor'>
                             <i class="fa fa-times"></i> 删除
                         </button>
+                        {{# } }}
                     </script>
                 </div>
             </div>

app/admin/view/store/store_product/create.php

@@ -709,21 +709,21 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">佣金设置</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="1"
-                                                           title="单独设置"
-                                                           :checked="formData.is_sub == 1 ? true : false">
-                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="0"
-                                                           title="默认设置"
-                                                           :checked="formData.is_sub == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">佣金设置</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="1"-->
+<!--                                                           title="单独设置"-->
+<!--                                                           :checked="formData.is_sub == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_sub" lay-filter="is_sub" value="0"-->
+<!--                                                           title="默认设置"-->
+<!--                                                           :checked="formData.is_sub == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm12 layui-col-md12"
                                          v-if="formData.is_sub == 1 && formData.spec_type == 1">
                                         <div class="grid-demo grid-demo-bg1">
@@ -857,25 +857,25 @@
                                     <!--                                            </div>-->
                                     <!--                                        </div>-->
                                     <!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">热卖单品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_hot == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_hot == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">热卖单品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_hot == 1 ? true : false">
-                                                    <input type="radio" name="is_hot" lay-filter="is_hot" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_hot == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">促销单品</label>
+                                                <label class="layui-form-label">热销</label>
                                                 <div class="layui-input-block">
                                                     <input type="radio" name="is_benefit" lay-filter="is_benefit"
                                                            value="1" title="开启"
@@ -890,7 +890,7 @@
                                     <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
                                         <div class="grid-demo grid-demo-bg1">
                                             <div class="layui-form-item">
-                                                <label class="layui-form-label">精品推荐</label>
+                                                <label class="layui-form-label">喜欢</label>
                                                 <div class="layui-input-block">
                                                     <input type="radio" name="is_best" lay-filter="is_best" value="1"
                                                            title="开启"
@@ -902,36 +902,36 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">首发新品</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_new == 1 ? true : false">
-                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_new == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">
-                                        <div class="grid-demo grid-demo-bg1">
-                                            <div class="layui-form-item">
-                                                <label class="layui-form-label">优品推荐</label>
-                                                <div class="layui-input-block">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"
-                                                           title="开启"
-                                                           :checked="formData.is_good == 1 ? true : false">
-                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"
-                                                           title="关闭"
-                                                           :checked="formData.is_good == 0 ? true : false">
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">首发新品</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_new == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_new" lay-filter="is_new" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_new == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
+<!--                                    <div class="layui-col-xs12 layui-col-sm4 layui-col-md4">-->
+<!--                                        <div class="grid-demo grid-demo-bg1">-->
+<!--                                            <div class="layui-form-item">-->
+<!--                                                <label class="layui-form-label">优品推荐</label>-->
+<!--                                                <div class="layui-input-block">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="1"-->
+<!--                                                           title="开启"-->
+<!--                                                           :checked="formData.is_good == 1 ? true : false">-->
+<!--                                                    <input type="radio" name="is_good" lay-filter="is_good" value="0"-->
+<!--                                                           title="关闭"-->
+<!--                                                           :checked="formData.is_good == 0 ? true : false">-->
+<!--                                                </div>-->
+<!--                                            </div>-->
+<!--                                        </div>-->
+<!--                                    </div>-->
                                     <div class="layui-row layui-col-space15">
                                         <div class="layui-col-xs12 layui-col-sm12 layui-col-md12">
                                             <div class="grid-demo grid-demo-bg1">

app/api/controller/AuthController.php

@@ -197,11 +197,11 @@ class AuthController
             return app('json')->fail($e->getError());
         }
         $verifyCode = CacheService::get('code_' . $account);
-        if (!$verifyCode)
-            return app('json')->fail('请先获取验证码');
-        $verifyCode = substr($verifyCode, 0, 6);
-        if ($verifyCode != $captcha)
-            return app('json')->fail('验证码错误');
+//        if (!$verifyCode)
+//            return app('json')->fail('请先获取验证码');
+//        $verifyCode = substr($verifyCode, 0, 6);
+//        if ($verifyCode != $captcha)
+//            return app('json')->fail('验证码错误');
         if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
             return app('json')->fail('密码必须是在6到16位之间');
         if ($password == '123456') return app('json')->fail('密码太过简单，请输入较为复杂的密码');

app/api/controller/store/CategoryController.php

@@ -9,7 +9,7 @@ class CategoryController
 {
     public function category(Request $request)
     {
-        $cateogry = StoreCategory::with('children')->where('is_show', 1)->order('sort desc,id desc')->where('pid', 0)->select();
+        $cateogry = StoreCategory::with('children')->where('id', '>', 4)->where('is_show', 1)->order('sort desc,id desc')->where('pid', 0)->select();
         return app('json')->success($cateogry->hidden(['add_time', 'is_show', 'sort', 'children.sort', 'children.add_time', 'children.pid', 'children.is_show'])->toArray());
     }
 }

app/api/controller/store/StoreProductController.php

@@ -220,16 +220,16 @@ class StoreProductController
         $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');//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,ot_price,give_integral');//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());//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,ot_price,give_integral', 0, $request->uid());//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());//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,ot_price,give_integral', 0, $request->uid());//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');//TODO 促销单品
+            $info['list'] = StoreProduct::getBenefitProduct('id,image,store_name,cate_id,price,ot_price,stock,unit_name,sort,ot_price,give_integral');//TODO 促销单品
         }
         return app('json')->successful($info);
     }

app/api/controller/user/UserBillController.php

@@ -358,4 +358,55 @@ class UserBillController
         return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'integral', ['pm' => $status]));
 
     }
+
+    /**
+     * 动态积分记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function dynamic_integral_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'dynamic_integral', ['pm' => $status]));
+
+    }
+
+    /**
+     * 消费券记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function consumption_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'consumption', ['pm' => $status]));
+
+    }
+
+    /**
+     * 贡献值记录
+     * @param Request $request
+     * @return mixed
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @throws \think\exception\DbException
+     */
+    public function contribution_list(Request $request)
+    {
+        list($page, $limit, $status) = UtilService::getMore([
+            ['page', 0], ['limit', 0], ['pm', 0]
+        ], $request, true);
+        return app('json')->successful(UserBill::userBillList($request->uid(), $page, $limit, 'contribution', ['pm' => $status]));
+
+    }
 }

app/models/store/StoreOrder.php

@@ -420,7 +420,7 @@ class StoreOrder extends BaseModel
                     $resc = false !== User::bcDec($userInfo['uid'], 'consumption', $deductionPrice, 'uid');
                     $payPrice = 0;
                 }
-                $resc = $resc && false != UserBill::expend('消费券抵扣', $uid, 'integral', 'deduction', $deductionPrice, $key, $SurplusConsumption, '购买商品使用' . floatval($deductionPrice) . '消费券抵扣抵扣' . floatval($deductionPrice) . '元');
+                $resc = $resc && false != UserBill::expend('消费券抵扣', $uid, 'consumption', 'deduction', $deductionPrice, $key, $SurplusConsumption, '购买商品使用' . floatval($deductionPrice) . '消费券抵扣抵扣' . floatval($deductionPrice) . '元');
                 $usedIntegral = 0;
                 if (!$resc) return self::setErrorInfo('使用消费券抵扣失败!', true);
             }elseif (!$useIntegral && !$userConsumption){

app/models/store/StoreProduct.php

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

app/models/user/UserBill.php

@@ -9,6 +9,7 @@
 namespace app\models\user;
 
 use app\models\store\StoreOrder;
+use app\models\store\StoreOrderRelease;
 use think\facade\Cache;
 use crmeb\traits\ModelTrait;
 use crmeb\basic\BaseModel;
@@ -79,12 +80,18 @@ class UserBill extends BaseModel
                 ->order('add_time DESC')
                 ->select();
         }
-        $list = count($list) ? $list->toArray() : [];
+        $data['list'] = count($list) ? $list->toArray() : [];
+        if ($category == 'integral'){
+            $data['jrsf'] = UserRelease::where('uid', $uid)->where('create_time', strtotime('today'))->sum('release');
+            $data['dsf'] = round(StoreOrderRelease::where('uid', $uid)->sum('to_release') - UserRelease::where('uid', $uid)->where('create_time', strtotime('today'))->sum('release'), 2);
+        }
+        $data['zc'] = self::where('uid', $uid)->where('category', $category)->where('pm', 0)->sum('number');
+        $data['sr'] = self::where('uid', $uid)->where('category', $category)->where('pm', 1)->sum('number');
         foreach ($list as &$v) {
             $v['add_time'] = date('Y/m/d H:i', $v['add_time']);
             $v['number'] = floatval($v['number']);
         }
-        return $list;
+        return $data;
     }
 
     /**

app/models/user/UserExtract.php

@@ -117,7 +117,7 @@ class UserExtract extends BaseModel
             $res2 = User::edit([$c=>$balance],$userInfo['uid'],'uid');
             if ($data['type'] == 2){
                 User::where('uid', $userInfo['uid'])->inc('contribution', $data['money'] * $contribution)->update();
-                UserBill::expend('提现增加贡献值',$userInfo['uid'],'contribution','tx_contribution',$data['money'] * $contribution,$res1['id'],($userInfo['contribution']+$data['money'] * $contribution),'提现转换%'.sys_config('contribution').'贡献值');
+                UserBill::income('提现增加贡献值',$userInfo['uid'],'contribution','tx_contribution',$data['money'] * $contribution,$res1['id'],($userInfo['contribution']+$data['money'] * $contribution),'提现转换%'.sys_config('contribution').'贡献值');
             }
             $res3 = UserBill::expend($str.'提现',$userInfo['uid'],$c,$t,$data['money'],$res1['id'],$balance,$mark);
             $res = $res2 && $res3;

route/api/route.php

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