Merge branch 'master-new-wgg' of wugg/phpstock into master-new

app/admin/controller/Consult.php

@@ -1613,8 +1613,13 @@ class Consult extends Base
             $info->tax_status=$params['status'];
             $info->out_tax_id=$params['out_tax_id'];
             $info->out_tax=$params['out_tax'];
-            $info->remark=$params['remark'];
+          //  $info->remark = $params['remark']??"";
+            $info->tax_exam_uid = $this->uid;
+            $info->tax_exam_uname = $this->uname;
+            $info->tax_exam_time=date("Y-m-d H:i:s");
+            $info->tax_exam_remark = $params['remark']??"";
             $save=$info->save();
+
             if($save){
                 ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
                     'order_code' =>$params['bidNo'],//咨询单详情编号
@@ -1643,7 +1648,7 @@ class Consult extends Base
             return error_show(1004,$valid->getError());
         }
         $temp=[];
-        $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,tax_status,tax,tax_id,is_combind","bidNo");
+        $bids = ConsultBids::whereIn('bidNo',$list['list'])->column("id,infoNo,bidNo,status,remark,tax_status,tax,tax_id,is_combind","bidNo");
         foreach ($list['list'] as $k=>$v){
             if (!isset($bids[$v])) return error_show(1004,"{$v}的反馈单不存在");
             if($bids[$v]['tax_status']!=0) return error_show(1004,"{$v}的反馈单状态不正确");
@@ -1659,7 +1664,8 @@ class Consult extends Base
                 "out_tax_id"=>$bids[$v]['tax_id'],
                 "out_tax"=>$bids[$v]['tax'],
                 "tax_exam_uid"=>$this->uid,
-                'tax_exam_uname'=>$this->uname
+                'tax_exam_uname'=>$this->uname,
+                "tax_exam_time"=>date('Y-m-d H:i:s')
                 ];
         }
         try{
@@ -2061,7 +2067,12 @@ class Consult extends Base
         if($platform_id!=="") $where[]=['b.platform_code','=',$platform_id];
         $skuOrName = isset($this->post['skuOrName'])&& $this->post['skuOrName']!=='' ? trim($this->post['skuOrName']):'';
         if($skuOrName!=="") $where[]=['a.good_name|a.spuCode','like','%'.$skuOrName.'%'];
-        
+        $tax_exam_time_start=isset($this->post['tax_exam_time_start'])&& $this->post['tax_exam_time_start']!=='' ? startTime($this->post['tax_exam_time_start']):'';
+        $tax_exam_time_end=isset($this->post['tax_exam_time_end'])&& $this->post['tax_exam_time_end']!=='' ? endTime($this->post['tax_exam_time_end']):'';
+
+           if($tax_exam_time_start !=="") $where[]=['a.tax_exam_time','>=',$tax_exam_time_start];
+           if($tax_exam_time_end !=="") $where[]=['a.tax_exam_time','<=',$tax_exam_time_end];
+
         $count = Db::name('consult_bids')->alias("a")
         ->leftJoin('consult_info c','a.infoNo=c.infoNo')
         ->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->count();

app/admin/controller/Goodup.php

@@ -500,9 +500,6 @@ class Goodup extends Base
 	        }
        
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']):"";
-        if($good_size==''){
-            return error_show(1004,"参数good_size不能为空");
-        }
        $proof_type = isset($this->post['proof_type'])&&$this->post['proof_type']!=""? trim($this->post['proof_type']):"";
        $proof_url = isset($this->post['proof_url'])&&$this->post['proof_url']!=""? trim($this->post['proof_url']):"";
 
@@ -521,39 +518,25 @@ class Goodup extends Base
         $auth_img = isset($this->post['auth_img'])&&$this->post['auth_img']!=""? trim($this->post['auth_img']):"";
 
         $after_sales = isset($this->post['after_sales'])&&$this->post['after_sales']!=""? trim($this->post['after_sales']):"";
-        if($after_sales==""){
-            return error_show(1004,"参数after_sales不能为空");
-        }
+        
         $craft_desc = isset($this->post['craft_desc'])&&$this->post['craft_desc']!=""? trim($this->post['craft_desc']):"";
 
         $good_remark = isset($this->post['good_remark'])&&$this->post['good_remark']!=""? trim($this->post['good_remark']):"";
-        if($good_remark===""){
-            return error_show(1004,"参数good_remark不能为空");
-        }
+        
         $weight = isset($this->post['weight'])&&$this->post['weight']!==""? floatval($this->post['weight']):"";
         if($weight===""){
             return error_show(1004,"参数weight不能为空");
         }
         $packing_way = isset($this->post['packing_way'])&&$this->post['packing_way']!==""? trim($this->post['packing_way']):"";
-        if($packing_way===""){
-            return error_show(1004,"参数packing_way不能为空");
-        }
+        
         $packing_size = isset($this->post['packing_size'])&&$this->post['packing_size']!==""? trim($this->post['packing_size']):"";
-        if($packing_size===""){
-            return error_show(1004,"参数packing_size不能为空");
-        }
+        
         $packing_spec = isset($this->post['packing_spec'])&&$this->post['packing_spec']!==""? trim($this->post['packing_spec']):"";
-        if($packing_spec===""){
-            return error_show(1004,"参数packing_spec不能为空");
-        }
+        
         $packing_weight = isset($this->post['packing_weight'])&&$this->post['packing_weight']!==""? floatval($this->post['packing_weight']):"";
-        if($packing_weight===""){
-            return error_show(1004,"参数packing_weight不能为空");
-        }
+        
         $packing_list = isset($this->post['packing_list'])&&$this->post['packing_list']!==""? trim($this->post['packing_list']):"";
-        if($packing_list===""){
-            return error_show(1004,"参数packing_list不能为空");
-        }
+        
         $good_bar = isset($this->post['good_bar'])&&$this->post['good_bar']!==""? trim($this->post['good_bar']):"";
         $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         if($supply_area===""){
@@ -564,9 +547,7 @@ class Goodup extends Base
             return error_show(1004,"参数delivery_place不能为空");
         }
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!==""? trim($this->post['origin_place']):"";
-        if($origin_place===""){
-            return error_show(1004,"参数origin_place不能为空");
-        }
+        
         $delivery_day = isset($this->post['delivery_day'])&&$this->post['delivery_day']!==""? intval($this->post['delivery_day']):"";
         if($delivery_day===""){
             return error_show(1004,"参数delivery_day不能为空");
@@ -928,9 +909,7 @@ class Goodup extends Base
 	            if (isset($supplier_account[$data['supplierNo']])) return json_show(1004, '原供应商已开通账号，不允许操作');
 	        }
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
-        if($good_size==''){
-            return error_show(1004,"参数good_size不能为空");
-        }
+
         $company_id = isset($this->post['company_id'])&&$this->post['company_id']!=""? trim($this->post['company_id']) :"";
         if($company_id==''){
             return error_show(1004,"参数company_id不能为空");
@@ -945,39 +924,25 @@ class Goodup extends Base
         }
         $auth_img = isset($this->post['auth_img'])&&$this->post['auth_img']!=""? trim($this->post['auth_img']):"";
         $after_sales = isset($this->post['after_sales'])&&$this->post['after_sales']!=""? trim($this->post['after_sales']):"";
-        if($after_sales==""){
-            return error_show(1004,"参数after_sales不能为空");
-        }
+        
         $craft_desc = isset($this->post['craft_desc'])&&$this->post['craft_desc']!=""? trim($this->post['craft_desc']):"";
 
         $good_remark = isset($this->post['good_remark'])&&$this->post['good_remark']!=""? trim($this->post['good_remark']):"";
-        if($good_remark===""){
-            return error_show(1004,"参数good_remark不能为空");
-        }
+        
         $weight = isset($this->post['weight'])&&$this->post['weight']!==""? floatval($this->post['weight']):"";
         if($weight===""){
             return error_show(1004,"参数weight不能为空");
         }
         $packing_way = isset($this->post['packing_way'])&&$this->post['packing_way']!==""? trim($this->post['packing_way']):"";
-        if($packing_way===""){
-            return error_show(1004,"参数packing_way不能为空");
-        }
+        
         $packing_size = isset($this->post['packing_size'])&&$this->post['packing_size']!==""? trim($this->post['packing_size']):"";
-        if($packing_size===""){
-            return error_show(1004,"参数packing_size不能为空");
-        }
+        
         $packing_spec = isset($this->post['packing_spec'])&&$this->post['packing_spec']!==""? trim($this->post['packing_spec']):"";
-        if($packing_spec===""){
-            return error_show(1004,"参数packing_spec不能为空");
-        }
+        
         $packing_weight = isset($this->post['packing_weight'])&&$this->post['packing_weight']!==""? floatval($this->post['packing_weight']):"";
-        if($packing_weight===""){
-            return error_show(1004,"参数packing_weight不能为空");
-        }
+        
         $packing_list = isset($this->post['packing_list'])&&$this->post['packing_list']!==""? trim($this->post['packing_list']):"";
-        if($packing_list===""){
-            return error_show(1004,"参数packing_list不能为空");
-        }
+        
         $good_bar = isset($this->post['good_bar'])&&$this->post['good_bar']!==""? trim($this->post['good_bar']):"";
         $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         if($supply_area===""){
@@ -988,9 +953,7 @@ class Goodup extends Base
             return error_show(1004,"参数delivery_place不能为空");
         }
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!==""? $this->post['origin_place']:"";
-        if($origin_place===""){
-            return error_show(1004,"参数origin_place不能为空");
-        }
+        
         $delivery_day = isset($this->post['delivery_day'])&&$this->post['delivery_day']!==""? intval($this->post['delivery_day']):"";
         if($delivery_day===""){
             return error_show(1004,"参数delivery_day不能为空");
@@ -2415,9 +2378,6 @@ class Goodup extends Base
 	       
 
         $good_size = isset($this->post['good_size'])&&$this->post['good_size']!=""? trim($this->post['good_size']) :"";
-        if($good_size==''){
-            return error_show(1004,"参数good_size不能为空");
-        }
     
         $is_auth = isset($this->post['is_auth'])&&$this->post['is_auth']!==""? intval($this->post['is_auth']):"";
         if($is_auth===''){
@@ -2428,39 +2388,25 @@ class Goodup extends Base
 //            return error_show(1004,"商品不能为空");
 //        }
         $after_sales = isset($this->post['after_sales'])&&$this->post['after_sales']!=""? trim($this->post['after_sales']):"";
-        if($after_sales==""){
-            return error_show(1004,"参数after_sales不能为空");
-        }
+        
         $craft_desc = isset($this->post['craft_desc'])&&$this->post['craft_desc']!=""? trim($this->post['craft_desc']):"";
 
         $good_remark = isset($this->post['good_remark'])&&$this->post['good_remark']!=""? trim($this->post['good_remark']):"";
-        if($good_remark===""){
-            return error_show(1004,"参数good_remark不能为空");
-        }
+        
         $weight = isset($this->post['weight'])&&$this->post['weight']!==""? floatval($this->post['weight']):"";
         if($weight===""){
             return error_show(1004,"参数weight不能为空");
         }
         $packing_way = isset($this->post['packing_way'])&&$this->post['packing_way']!==""? trim($this->post['packing_way']):"";
-        if($packing_way===""){
-            return error_show(1004,"参数packing_way不能为空");
-        }
+        
         $packing_size = isset($this->post['packing_size'])&&$this->post['packing_size']!==""? trim($this->post['packing_size']):"";
-        if($packing_size===""){
-            return error_show(1004,"参数packing_size不能为空");
-        }
+        
         $packing_spec = isset($this->post['packing_spec'])&&$this->post['packing_spec']!==""? trim($this->post['packing_spec']):"";
-        if($packing_spec===""){
-            return error_show(1004,"参数packing_spec不能为空");
-        }
+        
         $packing_weight = isset($this->post['packing_weight'])&&$this->post['packing_weight']!==""? floatval($this->post['packing_weight']):"";
-        if($packing_weight===""){
-            return error_show(1004,"参数packing_weight不能为空");
-        }
+        
         $packing_list = isset($this->post['packing_list'])&&$this->post['packing_list']!==""? trim($this->post['packing_list']):"";
-        if($packing_list===""){
-            return error_show(1004,"参数packing_list不能为空");
-        }
+        
         $good_bar = isset($this->post['good_bar'])&&$this->post['good_bar']!==""? trim($this->post['good_bar']):"";
         $supply_area = isset($this->post['supply_area'])&&$this->post['supply_area']!==""? intval($this->post['supply_area']):"";
         if($supply_area===""){
@@ -2471,9 +2417,7 @@ class Goodup extends Base
             return error_show(1004,"参数delivery_place不能为空");
         }
         $origin_place = isset($this->post['origin_place'])&&$this->post['origin_place']!==""? $this->post['origin_place']:"";
-        if($origin_place===""){
-            return error_show(1004,"参数origin_place不能为空");
-        }
+        
         $delivery_day = isset($this->post['delivery_day'])&&$this->post['delivery_day']!==""? intval($this->post['delivery_day']):"";
         if($delivery_day===""){
             return error_show(1004,"参数delivery_day不能为空");

app/admin/model/ConsultTemp.php

@@ -106,7 +106,7 @@ class ConsultTemp extends Model
                 }
 
             }
-            if(empty($addGood)==false)(new GoodZixun())->strict(false)->saveAll($addGood);
+            if(empty($addGood)==false)(new GoodZixun())->saveAll($addGood);
             if(empty($combind)==false)(new GoodCombind())->saveAll($combind);
             if(empty($goodTax)==false)(new GoodTax())->saveAll($goodTax);
       }

app/admin/model/GoodZixun.php

@@ -14,4 +14,62 @@ class GoodZixun extends Model
 
     protected  $createTime='addtime';
     protected $updateTime='updatetime';
+      protected $schema = [
+        'id'       =>'bigint',//
+        'spuCode'       =>'varchar',//商品spuCode
+        'good_code'       =>'varchar',//商品code
+        'good_name'       =>'varchar',//商品名称
+        'brand_id'       =>'bigint',//商品品牌id
+        'cat_id'       =>'int',//分类id
+        'good_unit'       =>'varchar',//商品单位
+        'good_type'       =>'tinyint',//商品类型 1 定制2常规
+        'moq'       =>'int',//起订量
+        'customized'       =>'int',//定制工期
+        'tax'       =>'varchar',//税点
+        'platform_id'       =>'int',//平台id
+        'supplierNo'       =>'varchar',//供应商code
+        'supplierName'       =>'varchar',//
+        'is_auth'       =>'tinyint',//是否有销售权限
+        'auth_img'       =>'varchar',//销售授权图片
+        'craft_desc'       =>'text',//工艺说明
+        'good_remark'       =>'varchar',//商品备注
+        'good_img'       =>'text',//商品详情主图
+        'good_thumb_img'       =>'varchar',//商品缩略图
+        'good_info_img'       =>'varchar',//商品详情图
+        'status'       =>'tinyint',//状态,1默认，2添加到商品库
+        'createrid'       =>'int',//创建人id
+        'creater'       =>'varchar',//创建人
+        'is_del'       =>'tinyint',//是否删除
+        'addtime'       =>'datetime',//
+        'updatetime'       =>'datetime',//
+        'supplier_origin_price'       =>'decimal',//供应商采购成本
+        'cgd_supplier_code'       =>'varchar',//采购供应商编号
+        'cgd_supplier_name'       =>'varchar',//采购供应商名称
+        'cgd_apply_id'       =>'int',//竞单人
+        'cgd_apply_name'       =>'varchar',//竞单人
+        'specinfo'       =>'text',//规格配置
+        'work_day'       =>'int',//工期
+        'noble_metal'       =>'tinyint',//贵金属材质 118k 2 24k 3 白银
+        'is_gold_price'       =>'tinyint',//是否使用实时金价
+        'good_weight'       =>'decimal',//
+        'config'       =>'varchar',//配置要求
+        'other_config'       =>'varchar',//其他配置
+        'weight'       =>'double',//商品重量
+        'supply_area'       =>'tinyint',//
+        'is_diff'       =>'tinyint',//是否有工差
+        'is_combind'       =>'tinyint',//是否组合商品
+        'pay_way'       =>'tinyint',//付款方式
+        'send_way'       =>'tinyint',//
+        'companyNo'       =>'varchar',//业务公司编号
+        'companyName'       =>'varchar',//
+        'proof_type'       =>'tinyint',//凭证类型
+        'proof_url'       =>'varchar',//凭证文件
+        'usable_stock'       =>'bigint',//仓库可用库存
+        'isChild'       =>'tinyint',//是否子商品
+        'order_source'       =>'tinyint',//
+        'order_type'       =>'tinyint',//商品类型
+        'order_createrid'       =>'int',//订单创建人
+        'order_creater'       =>'varchar',//订单创建人
+        'open_type'=>'tinyint'
+    ];
 }