Merge remote-tracking branch 'origin/master'

app/Console/Commands/SyncOrderToMj.php

@@ -8,6 +8,7 @@ use App\OrderScript;
 use App\FxOrder;
 use App\GoodsSkus;
 use App\OrderGoodsSkus;
+use App\FxOrderGoodsSkus;
 use App\Goods;
 
 class SyncOrderToMj extends Command {
@@ -81,12 +82,20 @@ class SyncOrderToMj extends Command {
                 if($mjOrder['status'] == '已取消'){
                     $res = $this->updateFxOrderToMj($id);
                     echo "\n订单ID:".$id." 卖家取消订单重新更新";
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 }
             }else{
                 $res = $this->syncFxOrderToMj($id);
                 if(!$res){
                     echo "\n订单ID:".$id." 同步失败";
                 }else{
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                     echo "\n订单ID:".$id." 同步成功";
                 }
             }

app/GoodsSkus.php

@@ -18,7 +18,8 @@ class GoodsSkus extends Model
     	//计算实际库存 -还未到卖家云的量
     	$sku_quantity = GoodsSkus::where('id', $sku_id)->pluck('quantity');
         $w_num = OrderGoodsSkus::where('sku_id', $sku_id)->where('is_del',0)->where('mj_status',0)->sum('num');
-        $quantity = $sku_quantity - $w_num;
+        $fx_num = FxOrderGoodsSkus::where('sku_id', $sku_id)->where('is_del',0)->where('mj_status',0)->sum('num');
+        $quantity = $sku_quantity - $w_num - $fx_num;
         return $quantity;
     }
    

app/Http/Controllers/Admin/FxOrderController.php

@@ -765,10 +765,17 @@ class FxOrderController extends Controller
 
         $skus = array_keys($order_skus);
         if(!empty($skus)){
-            $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->whereIn('gs.id', $skus)->orderBy('goods.id', 'desc')->get();
+            $goods = Goods::select('gs.id as sku_id', 'goods.id as goods_id', 'goods.name', 'gs.propsName as props_name', 'gs.price', 'gs.is_weigh', 'gs.is_white', 'gs.quantity')->leftJoin('goods_skus as gs', 'gs.goodsCode', '=', 'goods.id')->whereIn('gs.id', $skus)->orderBy('goods.id', 'desc')->get();
             $goods = json_decode(json_encode($goods),true);
             foreach($goods as $k=>&$v){
                 $v['num'] = $order_skus[$v['sku_id']];
+                //计算实际库存 -还未到卖家云的量
+                $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
+                $v['quantity'] = $v['quantity'] + $v['num'];
+                $v['quantity_str'] = $v['quantity'];
+                if($v['is_white'] == 1){
+                    $v['quantity_str'] = '虚拟库存';
+                }
             }
             $order['goods'] = $goods;
         }
@@ -1120,6 +1127,11 @@ class FxOrderController extends Controller
                     CustomerInfo::where('phone', $consum->phone)->update(['balance'=>$balance]);
                 }
 
+                #更新order_goods_skus状态
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1174,6 +1186,12 @@ class FxOrderController extends Controller
                         throw new Exception("订单同步到卖家云失败");
                     }
                 }
+
+                #更新order_goods_skus状态,退回库存
+                $mj_status = array();
+                $mj_status['mj_status'] = 2;
+                FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
+
                 #记录操作日志
                 $self_id = session('admin_id');
                 $self_name = session('real_name');            
@@ -1257,6 +1275,11 @@ class FxOrderController extends Controller
                     if( $syncMj == false ){
                         throw new Exception("订单同步到卖家云失败");
                     }
+
+                    #同步到卖家云，更新order_goods_skus状态
+                    $mj_status = array();
+                    $mj_status['mj_status'] = 1;
+                    FxOrderGoodsSkus::where('order_id', $id)->where('is_del', 0)->update($mj_status);
                 }
             }
 

app/Http/Controllers/Admin/GoodsController.php

@@ -387,8 +387,7 @@ class GoodsController extends Controller
         $result = json_decode(json_encode($result), true);
         foreach($result as $k=>&$v){
             //计算实际库存 -还未到卖家云的量
-            $w_num = DB::table('order_goods_skus')->where('sku_id', $v['sku_id'])->where('is_del',0)->where('mj_status',0)->sum('num');
-            $v['quantity'] = $v['quantity'] - $w_num;
+            $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
         }
 
         if(empty($result)) exit('0');
@@ -401,6 +400,9 @@ class GoodsController extends Controller
     public function skuList(Request $request){
         $goods_id = $request->input('goods_id');
         $result = GoodsSkus::where('goodsCode', $goods_id)->orderBy('id', 'desc')->get();
+        foreach($result as $k=>&$item){           
+            $item->quantity = GoodsSkus::actualQuantity($item->id);
+        }
         return view('/goods/skulist', ['result'=>$result, 'goods_id' => $goods_id]);
     }
 

app/Http/Controllers/Admin/OrderController.php

@@ -116,18 +116,21 @@ class OrderController extends Controller
         );
 
         foreach($result as $k=>&$v){
-            
+            //毛利 40%下
+            $v['pre_cost_flag'] = 0;
             //获取商品信息
             $v['goods'] = '';
             $goods = DB::table('order_goods_skus')->where('order_id', $v['id'])->where('is_del', 0)->get();
             if(!empty($goods)){
+                $v['pre_cost'] = 0;
                 foreach($goods as $item){
                     $goods_name = Goods::where('id', $item->goods_id)->pluck('name');
-                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh')->where('id', $item->sku_id)->first();
+                    $goods_sku_info = GoodsSkus::select('propsName', 'is_weigh', 'referenceCost')->where('id', $item->sku_id)->first();
                     if(!empty($goods_sku_info)){
                         $props_name = $goods_sku_info->propsName;
                         $is_weigh = $goods_sku_info->is_weigh;
                         $weigh_note = $is_weigh==1 ? '重量(斤)':'数量';
+                        $v['pre_cost'] += $goods_sku_info->referenceCost * $item->num;
                     }else{
                         $props_name = '';
                         $weigh_note = '数量';
@@ -135,6 +138,11 @@ class OrderController extends Controller
                     
                     $v['goods'][] = $goods_name.'('.$props_name.')  '.$weigh_note.':'.$item->num.'';
                 }
+                $v['pre_cost'] = round($v['pre_cost'], 2);
+
+                if( ($v['receivedAmount'] - $v['pre_cost']) / $v['receivedAmount'] < 0.4){
+                    $v['pre_cost_flag'] = 1;
+                }
             }
             
             #加粉时间
@@ -170,7 +178,10 @@ class OrderController extends Controller
                 $v['payment_type'] = '充值卡支付';
             }else{
                 $v['payment_type'] = '';
-            }  
+            } 
+
+            //计算毛利率
+
         }
 
         $yestoday = date('Y-m-d', strtotime('-1 day'));
@@ -189,8 +200,9 @@ class OrderController extends Controller
         //$saler_ids = DB::table('admin_role')->where('role_name', '销售')->lists('user_id');
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id){
             if($team_id>0) $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
+
         return view('order/orderlist', ['result' =>$result,
             'page'              =>$page,
             'count'             =>$count,
@@ -314,7 +326,7 @@ class OrderController extends Controller
             $overtime['count'] = count($order_overtime);           
         }
                 
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('is_use', 1)->where('id','>', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
         return view('order/warehouselist', ['result' =>$result,
             'page'              =>$page,
@@ -450,7 +462,7 @@ class OrderController extends Controller
         //$saler_ids = DB::table('admin_role')->where('role_name', '销售')->lists('user_id');
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id){
             if($team_id>0) $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
         return view('order/predictorderlist', ['result' =>$result,
             'page'              =>$page,
@@ -478,7 +490,7 @@ class OrderController extends Controller
     public function ordercreate(Request $request)
     {
         $catelist =  DB::table('goods_category')->select(DB::raw('distinct goods_category_name'))->lists('goods_category_name');
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('is_use', 1)->where('id','>', 1)->get();
         $teamList = DB::table('teams')->select('id', 'name')->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);
         $adminList = json_decode(json_encode($adminList), true);
@@ -850,7 +862,7 @@ class OrderController extends Controller
 
         $self_role = session('role_name');
         //$catelist =  DB::table('goods_category')->select(DB::raw('distinct goods_category_name'))->lists('goods_category_name');
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->where('is_use', 1)->get();
         $teamList = DB::table('teams')->select('id', 'name')->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);
         $adminList = json_decode(json_encode($adminList), true);
@@ -870,6 +882,11 @@ class OrderController extends Controller
                 $v['num'] = $order_skus[$v['sku_id']];
                 //计算实际库存 -还未到卖家云的量
                 $v['quantity'] = GoodsSkus::actualQuantity($v['sku_id']);
+                $v['quantity'] = $v['quantity'] + $v['num'];
+                $v['quantity_str'] = $v['quantity'];
+                if($v['is_white'] == 1){
+                    $v['quantity_str'] = '虚拟库存';
+                }
             }
             $order['goods'] = $goods;
         }
@@ -938,10 +955,9 @@ class OrderController extends Controller
                 }
                           
                 //判断生日礼
-                $birth_stime = date('m-d', strtotime($customer_info->birthday.' -3 day'));               
-                $birth_etime = date('m-d', strtotime($customer_info->birthday.' +3 day'));      
-                $today = date('m-d'); 
-                if($today>=$birth_stime && $today<=$birth_etime){
+                $birth_time = date('m', strtotime($customer_info->birthday));               
+                $tom = date('m');       
+                if($tom==$birth_time){
                     //生日期内，判断是否已领
                     $if_b_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 1)->where('dtime', '>=', $mtime)->first();
                     if(empty($if_b_gift)){
@@ -2294,11 +2310,10 @@ class OrderController extends Controller
                 }
                           
                 //判断生日礼
-                $birth_stime = date('m-d', strtotime($customer_info->birthday.' -3 day'));               
-                $birth_etime = date('m-d', strtotime($customer_info->birthday.' +3 day'));      
-                $today = date('m-d'); 
+                $birth_time = date('m', strtotime($customer_info->birthday));               
+                $tom = date('m'); 
                 $customer_info->if_b_gift = 0;
-                if($today>=$birth_stime && $today<=$birth_etime){
+                if($tom == $birth_time){
                     //生日期内，判断是否已领
                     $if_b_gift = DB::table('customer_gift_receives')->where('phone', $phone)->where('is_del',0)->where('gift_type', 1)->where('dtime', '>=', $mtime)->first();
                     if(empty($if_b_gift)){

app/Http/Controllers/Admin/StatisticsController.php

@@ -136,7 +136,7 @@ class StatisticsController extends Controller
             if($team_id>0 && $self_role != '超级管理员' && $self_role != '售后管理员' && $self_role != '财务') $query->where('id', $team_id);
         })->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->where(function($query) use($self_role, $team_id){
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->where('is_use', 1)->where(function($query) use($self_role, $team_id){
             if($team_id>0 && $self_role != '超级管理员' && $self_role != '售后管理员' && $self_role != '财务') $query->where('team_id', $team_id);
         })->get();
         $adminList = json_decode(json_encode($adminList), true);
@@ -872,7 +872,7 @@ class StatisticsController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('statistics/fanDaySaler', ['result' =>$result,
@@ -1180,7 +1180,7 @@ class StatisticsController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('statistics/orderDaySaler', ['result' =>$result,
@@ -3436,7 +3436,7 @@ class StatisticsController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('statistics/salerBonus', ['result'=>$result,
@@ -3781,7 +3781,7 @@ class StatisticsController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('statistics/salerTargetProgress', ['result'=>$result,
@@ -3803,7 +3803,7 @@ class StatisticsController extends Controller
      */
     public function salerTargetCreate()
     {
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
         $teamList = DB::table('teams')->select('id', 'name')->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);
@@ -4583,7 +4583,7 @@ class StatisticsController extends Controller
 
         $teamList = DB::table('teams')->select('id', 'name')->where('type', 1)->get();
         $teamList = json_decode(json_encode($teamList), true);
-        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->get();
+        $adminList = DB::table('admin')->select('id', 'realname', 'username')->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('statistics/salerOrderFugou', ['result' =>$result,
@@ -5141,7 +5141,7 @@ class StatisticsController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
         return view('statistics/dayGrandSalerTotal', ['result' =>$result,
             'page'              =>$page,

app/Http/Controllers/Admin/TemplateController.php

@@ -350,7 +350,7 @@ class TemplateController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('template/templateLogReport', ['result'=>$result,
@@ -811,7 +811,7 @@ class TemplateController extends Controller
 
         $adminList = DB::table('admin')->select('id', 'realname', 'username')->where(function($query) use($team_id, $self_role){
             if($self_role == '管理员') $query->where('team_id', $team_id);
-        })->where('id','>', 1)->get();
+        })->where('id','>', 1)->where('is_use', 1)->get();
         $adminList = json_decode(json_encode($adminList), true);
 
         return view('template/templateLogMonthReport', ['result'=>$result,

app/Http/Controllers/Api/OrderController.php

@@ -343,7 +343,7 @@ class OrderController extends Controller {
             return self::returnValue([],2000);
         }
 
-        $result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
+        $result = DB::table('customers')->select('receiverState', 'receiverCity', 'receiverDistrict', 'receiverAddress', 'fanTime')->where('phone', $phone)->first();
         $result = json_decode(json_encode($result), true);
         return self::returnValue(['data'=>$result]);
     }

resources/views/order/ordercreate.blade.php

@@ -214,7 +214,7 @@
 
             <div id='b_gift_div' class="row cl" style="display: none">
                 <label class="form-label col-xs-4 col-sm-2">
-                    <font color='red'> </font>是否使用生日赠品</label>
+                    <font color='red'> </font>是否使用生日套餐</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <input type="radio" name="use_b_gift"  value="0" checked disabled >
                     <label for="status-0" style="margin-right: 27px;">否</label>
@@ -618,8 +618,9 @@
                 return false;
             }
             $.ajax({
-                    'url': '/admin/goods/searchSkus?name='+name,
+                    'url': '/admin/goods/searchSkus',
                     'type': 'get',
+                    'data':{name:name},
                     'dateType': 'json',
                     success:function(data){
                         if(data != '0'){
@@ -676,8 +677,9 @@
                 return false;
             }
             $.ajax({
-                'url': '/admin/goods/searchSkus?name='+name,
+                'url': '/admin/goods/searchSkus',
                 'type': 'get',
+                'data':{name:name},
                 'dateType': 'json',
                 success:function(data){
                     if(data != '0'){

resources/views/order/orderlist.blade.php

@@ -255,7 +255,7 @@
                                             <a id="verify_refuse2" style="text-decoration:none" onClick='refuse_reason2("{{$a['id']}}")' href="javascript:;" title="反审"><span class="btn btn-danger radius">反审</span></a>
                                             @endif
                                         @else
-                                            <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
+                                            <a id="verify" style="text-decoration:none" onClick='order_verify("{{$a['id']}}", "{{$item['status']}}", "{{$item['name']}}", "{{$a['pre_cost_flag']}}")' href="javascript:;" title="{{$item['name']}}"><span class="btn btn-primary radius">{{$item['name']}}</span></a>
                                         @endif
                                     @endforeach
                                 @endif
@@ -774,8 +774,13 @@
             });
         }
 
-        function order_verify(id, status, name){
-            if( !confirm('确认'+name) ){
+        function order_verify(id, status, name, pre_cost_flag){
+            if( status == 2 && pre_cost_flag==1){
+                if( !confirm('该订单毛利低于<40%, 是否确定订单价格合理？') ){
+                    return false;
+                }
+            }
+            else if( !confirm('确认'+name) ){
                 return false;
             }
             var admin_id = $('#admin_id').val();