数值校验

app/Service/ConstructionService.php

@@ -298,12 +298,12 @@ class ConstructionService extends Service
 
             if(empty($value['price'])) return [false,'产品单价不能为空'];
             $res = $this->checkNumber($value['price']);
-            if(! $res) return [false,'产品单价请输入不超过两位小数的数值'];
+            if(! $res) return [false,'产品单价请输入不超过两位小数并且大于0的数值'];
         }
         if(empty($data['construction_contact'])) return [false,'联系方式不能为空'];
         if(! empty($data['construction_fee'])){
             $res = $this->checkNumber($data['construction_fee']);
-            if(! $res) return [false,'施工费用请输入不超过两位小数的数值'];
+            if(! $res) return [false,'施工费用请输入不超过两位小数并且大于0的数值'];
         }
         if($data['model_type'] == Construction::Model_type_one){
             if(empty($data['install_method'])) return [false,'安装方式不能为空'];

app/Service/ProductService.php

@@ -453,13 +453,13 @@ class ProductService extends Service
         if(empty($data['code'])) return [false,'产品编码不能为空'];
         if(empty($data['cost'])) return [false,'成本不能为空'];
         $res = $this->checkNumber($data['cost']);
-        if(! $res) return [false,'成本请输入不超过两位小数的数值'];
+        if(! $res) return [false,'成本请输入不超过两位小数并且大于0的数值'];
         if(empty($data['depart_price'])) return [false,'分社价格不能为空'];
         $res = $this->checkNumber($data['depart_price']);
-        if(! $res) return [false,'分社价格请输入不超过两位小数的数值'];
+        if(! $res) return [false,'分社价格请输入不超过两位小数并且大于0的数值'];
         if(empty($data['retail_price'])) return [false,'零售价不能为空'];
         $res = $this->checkNumber($data['retail_price']);
-        if(! $res) return [false,'零售价格请输入不超过两位小数的数值'];
+        if(! $res) return [false,'零售价格请输入不超过两位小数并且大于0的数值'];
 
         if($is_add){
             $bool = Product::whereRaw("(binary code = '{$data['code']}' OR title = '{$data['title']}')")

app/Service/SalesOrderService.php

@@ -107,7 +107,7 @@ class SalesOrderService extends Service
                         'product_id' => $value['product_id'],
                         'price' => $value['retail_price'],
                         'number' => $value['number'],
-                        'mark' => $value['mark'],
+                        'mark' => $value['mark'] ?? '',
                         'crt_time' => $time,
                     ];
                 }
@@ -212,7 +212,7 @@ class SalesOrderService extends Service
                         'product_id' => $value['product_id'],
                         'price' => $value['retail_price'],
                         'number' => $value['number'],
-                        'mark' => $value['mark'],
+                        'mark' => $value['mark'] ?? '',
                         'crt_time' => $time,
                     ];
                 }
@@ -332,6 +332,19 @@ class SalesOrderService extends Service
 
         if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
         if(! empty($data['model_type'])) $model->where('model_type',$data['model_type']);
+        if(! empty($data['time_type'])) {
+            if($data['time_type'] == 1) {
+                $start = strtotime('today');
+                $end = strtotime('tomorrow') - 1;
+            }elseif ($data['time_type'] == 2){
+                $start = strtotime('this week',strtotime('today'));
+                $end = strtotime('this week +6 days 23:59:59', strtotime('today'));
+            }
+            if(! empty($start) && ! empty($end)) {
+                $model->where('crt_time','>=',$start);
+                $model->where('crt_time','<=',$end);
+            }
+        }
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list);
@@ -358,23 +371,23 @@ class SalesOrderService extends Service
 
             if(empty($value['retail_price'])) return [false,'产品零售价不能为空'];
             $res = $this->checkNumber($value['retail_price']);
-            if(! $res) return [false,'产品零售价请输入不超过两位小数的数值'];
+            if(! $res) return [false,'产品零售价请输入不超过两位小数并且大于0的数值'];
         }
         if(empty($data['contract_fee'])) return [false,'合同金额不能为空'];
         $res = $this->checkNumber($data['contract_fee']);
-        if(! $res) return [false, '合同金额请输入不超过两位小数的数值'];
+        if(! $res) return [false, '合同金额请输入不超过两位小数并且大于0的数值'];
 
         if(! empty($data['rate'])){
             $res = $this->checkNumber($data['rate']);
-            if(! $res) return [false, '整单扣除率请输入不超过两位小数的数值'];
+            if(! $res) return [false, '整单扣除率请输入不超过两位小数并且大于0的数值'];
         }
         if(! empty($data['other_fee'])){
             $res = $this->checkNumber($data['other_fee']);
-            if(! $res) return [false, '其它费用请输入不超过两位小数的数值'];
+            if(! $res) return [false, '其它费用请输入不超过两位小数并且大于0的数值'];
         }
         if(! empty($data['discount_fee'])){
             $res = $this->checkNumber($data['discount_fee']);
-            if(! $res) return [false, '优惠金额请输入不超过两位小数的数值'];
+            if(! $res) return [false, '优惠金额请输入不超过两位小数并且大于0的数值'];
         }
 
         if($data['model_type'] == SalesOrder::Model_type_one){
@@ -420,7 +433,7 @@ class SalesOrderService extends Service
     public function fillData($data){
         if(empty($data['data'])) return $data;
 
-        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'send_state')));
+        $array = array_unique(array_merge_recursive(array_column($data['data'],'order_type'),array_column($data['data'],'deal_type'),array_column($data['data'],'contract_state'),array_column($data['data'],'car_type'),array_column($data['data'],'pay_way'),array_column($data['data'],'logistics_company'),array_column($data['data'],'send_state'),array_column($data['data'],'contract_type')));
         $basic_map = BasicType::whereIn('id',$array)
             ->pluck('title','id')
             ->toArray();
@@ -435,6 +448,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['order_type_title'] = $basic_map[$value['order_type']] ?? '';
             $data['data'][$key]['deal_type_title'] = $basic_map[$value['deal_type']] ?? '';
             $data['data'][$key]['contract_state_title'] = $basic_map[$value['contract_state']] ?? '';
+            $data['data'][$key]['contract_type_title'] = $basic_map[$value['contract_type']] ?? '';
             $data['data'][$key]['car_type_title'] = $basic_map[$value['car_type']] ?? '';
             $data['data'][$key]['pay_way_title'] = $basic_map[$value['pay_way']] ?? '';
             $data['data'][$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';