Merge branch 'master' of ssh://119.23.72.7:22611/q578953158/php_frq_api

app/Model/QuoteModel.php

@@ -175,14 +175,14 @@ class QuoteModel extends Model
         } else {
             $list = $list->paginate($limit, ['*'], 'page', $page)->toArray();
 
-            $list['data'] = $this->handleData($list['data']);
+            $list['data'] = $this->handleData($list['data'], $type);
 
             return [0, '获取成功', $list['data'], $list['total']];
         }
     }
 
     // 处理数据
-    public function handleData($data)
+    public function handleData($data, $type)
     {
         if (empty($data)) return $data;
 
@@ -192,6 +192,14 @@ class QuoteModel extends Model
             $v['currency_val']  = $v['currency'] == 1 ? 'RMB' : 'USD';
             $v['price']         = $v['currency'] == 1 ? $currency_sign.$v['price_rmb'] : $currency_sign.$v['price_origin'];
             $v['status_val']    = array_get(Config('quote.quote_status'), $v['status'], '');
+
+            if ($type == 3) { // 报价草稿
+                if ($v['delivery_time'] > 6) {
+                    $v['delivery_time'] = intval($v['delivery_time'] / 7).'周';
+                } else {
+                    $v['delivery_time'] = $v['delivery_time'].'天';
+                }
+            }
         }
 
         return $data;
@@ -330,7 +338,7 @@ class QuoteModel extends Model
             $InquiryModel = new InquiryModel;
             $inquiry_uid = $InquiryModel->where('id', $inquiry_id)->value('create_uid'); // 询价人
 
-            $contents = '系统自动报价，请及时查看！';
+            $contents = '您有新报价，请及时查看！';
             $CommonModel->send_msg($inquiry_uid, $contents);
 
             return [0,"新增成功"];
@@ -377,9 +385,11 @@ class QuoteModel extends Model
                 $quote_info['class_id2_name'] = $classInfo['class_id2_name'];
             }
 
-            $quote_info['status']      = 1; // 已报价
-            $quote_info['create_uid']  = $input['user_id'];
-            $quote_info['create_name'] = $input['user_name'];
+            $quote_info['status']        = 1; // 已报价
+            $quote_info['create_uid']    = $input['user_id'];
+            $quote_info['create_name']   = $input['user_name'];
+            $quote_info['delivery_time'] = $quote_info['delivery_time_unit'] == '天' ? $quote_info['delivery_time'] : $quote_info['delivery_time'] * 7;
+            unset($quote_info['delivery_time_unit']);
 
             $res = $this->create($quote_info);
             if ($res === false) return [2, '新增报价失败'];
@@ -474,6 +484,13 @@ class QuoteModel extends Model
                     $v['price_rmb'] = $rate ? number_format($v['price_origin'] * $rate, 6) : 0;
                 }
 
+                if (strpos($v['delivery_time'], "周") !== false) {
+                    $delivery_time_week = intval(str_replace("周", "", $v['delivery_time']));
+                    $v['delivery_time'] = $delivery_time_week * 7;
+                } else {
+                    $v['delivery_time'] = intval(str_replace("天", "", $v['delivery_time']));
+                }
+
                 $v['quote_sn']         = $ApiController->createSn($this, 'quote_sn', 'B');
                 $v['inquiry_id']       = $input['inquiry_id'];
                 $v['inquiry_sn']       = $input['inquiry_sn'];
@@ -566,6 +583,23 @@ class QuoteModel extends Model
                     return;
                 }
 
+                if (strpos($val['delivery_time'], "天") === false && strpos($val['delivery_time'], "周") === false) {
+                    $err[] = '第'.($key+1).'行，交期输入有误，请以天或周结尾';
+                    return;
+                }
+
+                $delivery_time_day = intval(str_replace("天", "", $val['delivery_time']));
+                if ($delivery_time_day > 6) {
+                    $err[] = '第'.($key+1).'行，交期输入有误，单位为天时，不能大于6，请按周计数';
+                    return;
+                }
+
+                $delivery_time_week = intval(str_replace("周", "", $val['delivery_time']));
+                if ($delivery_time_week > 108) {
+                    $err[] = '第'.($key+1).'行，交期输入有误，单位为周时，不能大于108周';
+                    return;
+                }
+
                 foreach ($val as $k=>$v) {
                     if (in_array($k, $required_keys)) {
                         if (empty($v)) { // 若必填项值为空，返回提示信息
@@ -733,6 +767,9 @@ class QuoteModel extends Model
                 $quote_info['class_id2_name'] = $classInfo['class_id2_name'];
             }  
 
+            $quote_info['delivery_time'] = $quote_info['delivery_time_unit'] == '天' ? $quote_info['delivery_time'] : $quote_info['delivery_time'] * 7;
+            unset($quote_info['delivery_time_unit']);
+
             $this->where('id', $input['quote_id'])->update($quote_info);
 
             if ($quote_info['currency'] == 1) {