'商家加入店铺类型，属性管理加入可以输入的，之前都是选择'

application/admin/controller/ShopUser.php

@@ -105,6 +105,11 @@ class ShopUser extends Backend
                             $params['status']='5';
                         }
                     }
+                    if ($params['cate_id']=='15'){
+                        $params['cate_top_id']='15';
+                    }else{
+                        $params['cate_top_id']='14';
+                    }
 
                     if ($params['status']=='5'){
                         $get_old=ShopUserOld::where('suser_id',$ids)->order('id','desc')->find();

application/admin/view/attribute/add.html

@@ -6,12 +6,18 @@
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('类型')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            {:build_radios('row[type]', ['0'=>__('商家选择'), '1'=>__('商家填写')])}-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('类型')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[type]', ['0'=>__('商家选择'), '1'=>__('商家填写(不可作为筛选条件)')])}
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('是否支持筛选')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[is_search]', ['0'=>__('不支持'), '1'=>__('支持')])}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/attribute/edit.html

@@ -6,12 +6,18 @@
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
-<!--    <div class="form-group">-->
-<!--        <label class="control-label col-xs-12 col-sm-2">{:__('类型')}:</label>-->
-<!--        <div class="col-xs-12 col-sm-8">-->
-<!--            {:build_radios('row[type]', ['0'=>__('商家选择'), '1'=>__('商家填写')], $row['type'])}-->
-<!--        </div>-->
-<!--    </div>-->
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('类型')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[type]', ['0'=>__('商家选择'), '1'=>__('商家填写(不可作为筛选条件)')], $row['type'])}
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('是否支持筛选')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            {:build_radios('row[is_search]', ['0'=>__('不支持'), '1'=>__('支持')], $row['is_search'])}
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/shop_user/edit.html

@@ -20,16 +20,25 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('商品分类')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('经营范围')}:</label>
         <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first">
-
-            <select class="first form-control" disabled="disabled"  data-rule="required"  data-value="{$row.cate_id}" name="no[cate_id]"  style="width:99%;" name="first" data-url="ajax/category?type=default&pid=0">
-
+            <select id="c-cate_id" data-rule="required" class="form-control" name="row[cate_id]">
+                <option value="17"  {if $row.cate_id =="17"}selected{/if}>新车</option>
+                <option value="18"  {if $row.cate_id =="18"}selected{/if}>二手车</option>
+                <option value="15"  {if $row.cate_id =="15"}selected{/if}>汽车用品</option>
+            </select>
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('店铺类型')}:</label>
+        <div class="col-xs-12 col-sm-8"  data-toggle="cxselect" data-selects="first">
+            <select id="c-type_id" data-rule="required" class="form-control" name="row[type_id]">
+                <option value="1"  {if $row.type_id =="1"}selected{/if}>个人</option>
+                <option value="2"  {if $row.type_id =="2"}selected{/if}>车商</option>
+                <option value="3"  {if $row.type_id =="3"}selected{/if}>4S店</option>
             </select>
-
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
         <div class="col-xs-12 col-sm-8">

application/api/controller/Order.php

@@ -20,7 +20,7 @@ use app\api\model\Member;
 class Order extends Api
 {
     //无需登录的接口
-    protected $noNeedLogin = ['order_notify_url','express_list'];//都需要登录
+    protected $noNeedLogin = ['order_notify_url','express_list','order_cancel_all'];//都需要登录
     /**
      * 提交订单
      *
@@ -107,7 +107,6 @@ class Order extends Api
 
         if (!empty($address_id)){
             $get_address=Address::where('id',$address_id)->find();
-
             $insert['address_name']=$get_address['name'];//姓名
             $insert['address_phone']=$get_address['mobile'];//电话
             $insert['address_address']=$get_address['province']. ' '.$get_address['city'].' '.$get_address['city'].' '.$get_address['address'];//详细地址
@@ -154,6 +153,10 @@ class Order extends Api
                 if (!empty($is_seckill)){//如果是秒杀商品
                     StoreSeckill::where('id',$seckill['id'])->setDec('stock',$total_num);
                     StoreSeckill::where('id',$seckill['id'])->setInc('sales',$total_num);
+                }else{
+                    //-库存
+                        StoreProduct::where('id',$store_id)->setDec('stock',$total_num);
+                        StoreProduct::where('id',$store_id)->setInc('sales',$total_num);
                 }
                 $this->result('下单成功',['prepay_id'=>$arr['prepay_id'],'order_id'=>$bid],1);
             }else{
@@ -416,11 +419,20 @@ class Order extends Api
         $where['is_system_del']=0;
         $where['status']=['in',['-2','0','3','4','9']];
         $get_order=StoreOrder::where($where)
-            ->field('id')
+            ->field('id,status,is_seckill,total_num,store_product_id')
             ->find();
         if (empty($get_order)){
             $this->result('此订单不能进行删除操作');
         }
+        if ($get_order['status']=='0'){
+            if (!empty($get_order['is_seckill'])){
+                StoreSeckill::where('id',$get_order['is_seckill'])->setDec('sales',$get_order['total_num']);
+                StoreSeckill::where('id',$get_order['is_seckill'])->setInc('stock',$get_order['total_num']);
+            }else{
+                StoreProduct::where('id',$get_order['store_product_id'])->setInc('stock',$get_order['total_num']);
+                StoreProduct::where('id',$get_order['store_product_id'])->setDec('sales',$get_order['total_num']);
+            }
+        }
         $update_status=StoreOrder::where('id',$id)->update(['is_del'=>1]);
         $this->result('success',$get_order,1);
     }
@@ -443,7 +455,7 @@ class Order extends Api
         $where['is_system_del']=0;
         $where['status']=['in',['0']];
         $get_order=StoreOrder::where($where)
-            ->field('id,is_seckill,total_num')
+            ->field('id,is_seckill,total_num,store_product_id')
             ->find();
         if (empty($get_order)){
             $this->result('此订单不能取消');
@@ -451,11 +463,51 @@ class Order extends Api
         if (!empty($get_order['is_seckill'])){
                 StoreSeckill::where('id',$get_order['is_seckill'])->setDec('sales',$get_order['total_num']);
                 StoreSeckill::where('id',$get_order['is_seckill'])->setInc('stock',$get_order['total_num']);
+        }else{
+            StoreProduct::where('id',$get_order['store_product_id'])->setInc('stock',$get_order['total_num']);
+            StoreProduct::where('id',$get_order['store_product_id'])->setDec('sales',$get_order['total_num']);
         }
         $update_status=StoreOrder::where('id',$id)->update(['status'=>9]);
         $this->result('success',$get_order,1);
     }
     /**
+     * 订单取消定时任务
+     * @ApiTitle    (订单取消定时)
+     * @ApiSummary  (订单取消定时)
+     * @ApiMethod   (POST)
+     * @ApiHeaders  (name="user-token", type="string", required=true, description="请求的Token")
+     * @ApiRoute    (/api/order/order_cancel)
+     * @ApiParams   (name="user_id", type="int", required=true, description="用户user_id")
+     * @ApiParams   (name="order_id", type="int", required=true, description="订单编号 id")
+     */
+    public function  order_cancel_all(){
+
+        $where['is_del']=0;
+        $where['is_system_del']=0;
+
+        $time=time()-15*60;
+
+        $where['add_time']=['LT',$time];
+        $where['status']=['in',['0']];
+        $get_order=StoreOrder::where($where)
+            ->field('id,is_seckill,total_num,store_product_id')
+            ->select();
+
+        if (!empty($get_order)){
+            foreach ($get_order as $k=>$v){
+                if (!empty($v['is_seckill'])){
+                    StoreSeckill::where('id',$v['is_seckill'])->setDec('sales',$v['total_num']);
+                    StoreSeckill::where('id',$v['is_seckill'])->setInc('stock',$v['total_num']);
+                }else{
+                    StoreProduct::where('id',$v['store_product_id'])->setInc('stock',$v['total_num']);
+                    StoreProduct::where('id',$v['store_product_id'])->setDec('sales',$v['total_num']);
+                }
+                $update_status=StoreOrder::where('id',$v['id'])->update(['status'=>9]);
+            }
+        }
+        $this->result('success',1,1);
+    }
+    /**
      * 订单确认收货
      * @ApiTitle    (订单确认收货)
      * @ApiSummary  (订单确认收货)
@@ -501,38 +553,39 @@ class Order extends Api
 
                 }
             }
-        }
-
-        $pay_price=$pay_price-$one_commission-$two_commission;
-        if ($get_order['total_price']>($one_commission+$two_commission)){
-            if (!empty($one_commission)){
-                Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
-                Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
-                $insert_m['mid']=$get_user['spread_mid'];
-                $insert_m['link_id']=$id;
-                $insert_m['pm']='1';
-                $insert_m['title']='佣金';
-                $insert_m['type']='2';
-                $insert_m['number']=$one_commission;
-                $insert_m['add_time']=time();
-                $insert_m['status']='1';
-                MemberBill::insert($insert_m);
-            }
-            if (!empty($two_commission)){
-                Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
-                Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
-                $insert_m['mid']=$get_user2['spread_mid'];
-                $insert_m['link_id']=$id;
-                $insert_m['pm']='1';
-                $insert_m['title']='佣金';
-                $insert_m['type']='2';
-                $insert_m['number']=$two_commission;
-                $insert_m['add_time']=time();
-                $insert_m['status']='1';
-                MemberBill::insert($insert_m);
+            $pay_price=$pay_price-$one_commission-$two_commission;
+            if ($get_order['total_price']>($one_commission+$two_commission)){
+                if (!empty($one_commission)){
+                    Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
+                    Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
+                    $insert_m['mid']=$get_user['spread_mid'];
+                    $insert_m['link_id']=$id;
+                    $insert_m['pm']='1';
+                    $insert_m['title']='佣金';
+                    $insert_m['type']='2';
+                    $insert_m['number']=$one_commission;
+                    $insert_m['add_time']=time();
+                    $insert_m['status']='1';
+                    MemberBill::insert($insert_m);
+                }
+                if (!empty($two_commission)){
+                    Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
+                    Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
+                    $insert_m['mid']=$get_user2['spread_mid'];
+                    $insert_m['link_id']=$id;
+                    $insert_m['pm']='1';
+                    $insert_m['title']='佣金';
+                    $insert_m['type']='2';
+                    $insert_m['number']=$two_commission;
+                    $insert_m['add_time']=time();
+                    $insert_m['status']='1';
+                    MemberBill::insert($insert_m);
+                }
             }
         }
 
+
+
         ShopUser::where('id',$get_order['suser_id'])->setInc('order_price',$pay_price);
         ShopUser::where('id',$get_order['suser_id'])->setInc('balance',$pay_price);
 //        ShopUser::where('id',$get_order['suser_id'])->setInc('order_num');
@@ -743,45 +796,42 @@ class Order extends Api
                                 if (!empty($get_product['one_commission'])){
                                     $one_commission=floor($get_product['one_commission']*$get_order['total_price']);
                                     $one_commission=$one_commission/100;
-
                                 }
                                 if (!empty($get_product['two_commission'])){
                                     $get_user2=Member::where('mid',$get_user['spread_mid'])->field('spread_mid,mid')->find();
                                     if (!empty($get_user2['spread_mid'])){
                                         $two_commission=floor($get_product['two_commission']*$get_order['total_price']);
                                         $two_commission=$two_commission/100;
-
                                     }
                                 }
-                            }
-
-                            $pay_price=$pay_price-$one_commission-$two_commission;
-                            if ($get_order['total_price']>($one_commission+$two_commission)){
-                                if (!empty($one_commission)){
-                                    Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
-                                    Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
-                                    $insert_m['mid']=$get_user['spread_mid'];
-                                    $insert_m['link_id']=$get_order['id'];
-                                    $insert_m['pm']='1';
-                                    $insert_m['title']='佣金';
-                                    $insert_m['type']='2';
-                                    $insert_m['number']=$one_commission;
-                                    $insert_m['add_time']=time();
-                                    $insert_m['status']='1';
-                                    MemberBill::insert($insert_m);
-                                }
-                                if (!empty($two_commission)){
-                                    Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
-                                    Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
-                                    $insert_m['mid']=$get_user2['spread_mid'];
-                                    $insert_m['link_id']=$get_order['id'];
-                                    $insert_m['pm']='1';
-                                    $insert_m['title']='佣金';
-                                    $insert_m['type']='2';
-                                    $insert_m['number']=$two_commission;
-                                    $insert_m['add_time']=time();
-                                    $insert_m['status']='1';
-                                    MemberBill::insert($insert_m);
+                                if ($get_order['total_price']>($one_commission+$two_commission)){
+                                    if (!empty($one_commission)){
+                                        Member::where('mid',$get_user['spread_mid'])->setInc('brokerage_price',$one_commission);
+                                        Member::where('mid',$get_user['spread_mid'])->setInc('now_money',$one_commission);
+                                        $insert_m['mid']=$get_user['spread_mid'];
+                                        $insert_m['link_id']=$get_order['id'];
+                                        $insert_m['pm']='1';
+                                        $insert_m['title']='佣金';
+                                        $insert_m['type']='2';
+                                        $insert_m['number']=$one_commission;
+                                        $insert_m['add_time']=time();
+                                        $insert_m['status']='1';
+                                        MemberBill::insert($insert_m);
+                                    }
+                                    if (!empty($two_commission)){
+                                        Member::where('mid',$get_user2['spread_mid'])->setInc('brokerage_price',$two_commission);
+                                        Member::where('mid',$get_user2['spread_mid'])->setInc('now_money',$two_commission);
+                                        $insert_m['mid']=$get_user2['spread_mid'];
+                                        $insert_m['link_id']=$get_order['id'];
+                                        $insert_m['pm']='1';
+                                        $insert_m['title']='佣金';
+                                        $insert_m['type']='2';
+                                        $insert_m['number']=$two_commission;
+                                        $insert_m['add_time']=time();
+                                        $insert_m['status']='1';
+                                        MemberBill::insert($insert_m);
+                                    }
+                                    $pay_price=$pay_price-$one_commission-$two_commission;
                                 }
                             }
 
@@ -793,17 +843,13 @@ class Order extends Api
                             $status=1;
                             StoreOrder::where('order_id',$out_trade_no)->update(['status'=>$status,'pay_time'=>time()]);
                         }
-
                         ShopUser::where('id',$get_order['suser_id'])->setInc('order_num');
-                        if (empty($get_order['is_seckill'])){
-                            StoreProduct::where('id',$get_order['store_product_id'])->setDec('stock',$get_order['total_num']);
-                            StoreProduct::where('id',$get_order['store_product_id'])->setInc('sales',$get_order['total_num']);
-                        }
 //                    StoreProduct::where(['id'=>$get_order['store_product_id']])->setInc('sales'); // 原数值加一
 //                    StoreProduct::where(['id'=>$get_order['store_product_id']])->setDec('stock'); // 原数值减一\
                         ShopUser::commit();
                         StoreOrder::commit();
-                        StoreProduct::commit();
+                        MemberBill::commit();
+                  //      StoreProduct::commit();
                         echo '<xml>
 						<return_code><![CDATA[SUCCESS]]></return_code>
 						<return_msg><![CDATA[OK]]></return_msg>
@@ -814,8 +860,11 @@ class Order extends Api
 
                         dump($e->getMessage());
                         // 回滚事务
+
+                        ShopUser::rollback();
                         StoreOrder::rollback();
-                        StoreProduct::rollback();
+                        MemberBill::rollback();
+                    //    StoreProduct::rollback();
                     }
                 }else{
                     echo '<xml>

application/api/controller/Shop.php

@@ -50,7 +50,13 @@ class Shop extends Api
         $effect_city=$post_array['effect_city'];//管理省市
         $city=$post_array['city'];//商家所在省市区
         $address=$post_array['address'];
+
         $cate_id=$post_array['cate_id'];//分类id
+        $cate_top_id=$post_array['cate_top_id'];//分类id
+        $type_id=$post_array['type_id'];//商店类型1个人，2车商，3  4s店
+
+
+
         $image=str_replace(config('site.siteUrl'),'',$post_array['image']);
         $images=str_replace(config('site.siteUrl'),'',$post_array['images']);
         if (empty($name) || empty($phone) || empty($effect_city) || empty($city)|| empty($address) || empty($cate_id) ){
@@ -63,6 +69,8 @@ class Shop extends Api
             'name'=>$name,
             'phone'=>$phone,
             'cate_id'=>$cate_id,
+            'cate_top_id'=>$cate_top_id,
+            'type_id'=>$type_id,
             'effect_city'=>$effect_city,
             'city'=>$city,
             'address'=>$address,
@@ -190,10 +198,8 @@ class Shop extends Api
     public function store_list(){
         $userId = $this->request->post('user_id');
         $suser_id= $this->request->post('suser_id');
-
         $where['suser_id']=$suser_id;
         $where['is_del']=array('eq',0);
-
         $list=StoreProduct::where($where)->field('id,slider_image,image,store_name,deposit_price,price,false as shop_show,cate_top_id ')->select();
         foreach ($list as $k=>$v){
             $v['shop_show']=false;
@@ -215,7 +221,6 @@ class Shop extends Api
      * @ApiParams   (name="store_id", type="int", required=true, description="商品id")
      */
     public function  store_add(){
-
         $userId = $this->request->post('user_id');
         $type = $this->request->post('type');
         $store_id = $this->request->post('store_id');
@@ -238,17 +243,17 @@ class Shop extends Api
                 $insert['store_name']=$post['store_name'];//商品名称
                 $insert['store_info']=$post['store_info'];//商品简介
 
-                if ($post['cate_top_id']=='14') {
-                    $insert['car_info'] = $post['car_info'];//车况
-                }
+//                if ($post['cate_top_id']=='14') {
+//                    $insert['car_info'] = $post['car_info'];//车况
+//                }
                 $image=str_replace(config('site.siteUrl').'/',"/",$post['image']);//商品图片
                 $slider_image=str_replace(config('site.siteUrl').'/',"/",$post['slider_image']);//商品图片
                 $insert['image']=str_replace(config('site.siteUrl'),"/",$image);//商品图片
                 $insert['slider_image']=str_replace(config('site.siteUrl'),"/",$slider_image);//商品图片
                 $insert['cate_id']=$post['cate_id'];//商品分类
                 $insert['cate_top_id']=$post['cate_top_id'];//商品上级分类
-                $insert['one_commission']=empty($post['one_commission'])?'0':$post['one_commission'];;//商品上级分类
-                $insert['two_commission']=empty($post['two_commission'])?'0':$post['two_commission'];;//商品上级分类
+                $insert['one_commission']=empty($post['one_commission'])?'0':$post['one_commission'];;//商品一级分销比例
+                $insert['two_commission']=empty($post['two_commission'])?'0':$post['two_commission'];;//商品二级分销比例
 
                 if (($insert['one_commission']+  $insert['two_commission'])>=100){
                     $this->result('佣金比例最高100');

application/api/controller/Store.php

@@ -206,6 +206,7 @@ class Store extends Api
 
         $whereArr['pid'] = array('eq',0);
         $whereArr['id'] = array('neq',4);
+        $whereArr['is_search'] = array('eq',1);
         $list = Attribute::where('status',1)
             ->where($whereArr)
             ->with('attlist')

public/assets/js/backend/attribute.js

@@ -32,7 +32,15 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'name', title: __('Name')},
-                        // {field: 'type', title: __('类型'),searchList: {"0":__('商家选择'),"1":__('商家填写')}, formatter: Table.api.formatter.normal,operate: false},
+                         {field: 'type', title: __('类型'),searchList: {"0":__('商家选择'),"1":__('商家填写')}, formatter: Table.api.formatter.normal,operate: false},
+
+                        {
+                            field: 'is_search',
+                            title: __('是否支持筛选'),
+                            formatter:Table.api.formatter.toggle,
+                            yes: '1',
+                            no: '0'
+                        },
 
                         {
                             field: 'status', title: __('状态'),

public/assets/js/backend/shop_user.js

@@ -42,10 +42,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
                         {field: 'order_num', title: __('Order_num')},
                         {field: 'effect_city', title: __('管理城市')},
+                        {field: 'cate_id', title: __('经营范围'), searchList: {"17":__('新车'),"18":__('二手车'),"15":__('汽车用品')}, formatter: Table.api.formatter.normal},
+                        {field: 'type_id', title: __('店铺类型'), searchList: {"1":__('个人'),"2":__('车商'),"3":__('4S店')}, formatter: Table.api.formatter.normal},
                         {field: 'is_recommend', title: __('是否推荐'), searchList: {"1":__('Yes'),"0":__('No')}, formatter: Table.api.formatter.toggle},
 
                         {field: 'status', title: __('状态'), searchList: {"0":__('Status 0'),"1":__('Status 1'),"2":__('Status 2'),"4":__('资料修改'),"5":__('修改驳回')}, formatter: Table.api.formatter.normal},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
+                      //  {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
                         {
                             field: 'operate', title: __('Operate'), table: table,