销售订单优化凭证相关

app/admin/controller/Sale.php

@@ -184,6 +184,7 @@ class Sale extends Base
             return error_show(1004,"发货数量超出订单总数量");
         }
         $remark =isset($this->post['remark']) && $this->post['remark'] !=="" ?trim($this->post['remark']):"";
+        $proof_id =isset($this->post['proof_id']) && $this->post['proof_id'] !=="" ?intval($this->post['proof_id']):0;
 
         $apply_id =GetUserInfo($token);
         if(empty($apply_id)||$apply_id['code']!=0){
@@ -231,6 +232,7 @@ class Sale extends Base
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
                 'total_price'=>round($sale_price*$good_num,2),
+                'proof_id'=>$proof_id
             ];
            $paytime==""?"": $data['paytime'] = $paytime;
             $datainfo = Db::name('sale')->insert($data,true);
@@ -2168,8 +2170,23 @@ class Sale extends Base
         $einfo['good_num']-=$einfo['th_num'];
         $einfo['send_num']-=$einfo['th_num'];
         $einfo['total_price']=round($einfo['total_price']-$einfo['th_fee'],2);
-        $einfo['proof_type']=isset($goon['proof_type'])?$goon['proof_type']:'';
-        $einfo['proof_url']=isset($goon['proof_url'])?$goon['proof_url']:'';
+
+        //处理凭证
+        if ($einfo['order_type'] == 1 || $einfo['order_type'] == 2) {
+            $proof = Db::name('good_proof')
+                ->field('id,proof_type,proof_url')
+                ->where(['id' => $einfo['proof_id'], 'is_del' => 0])
+                ->find();
+            $einfo['proof_type'] = isset($proof['proof_type']) ? $proof['proof_type'] : '';
+            $einfo['proof_url'] = isset($proof['proof_url']) ? $proof['proof_url'] : '';
+        } elseif ($einfo['order_type'] == 3) {
+            $einfo['proof_type'] = isset($goon['proof_type']) ? $goon['proof_type'] : '';
+            $einfo['proof_url'] = isset($goon['proof_url']) ? $goon['proof_url'] : '';
+        } else {
+            $einfo['proof_type'] = '';
+            $einfo['proof_url'] = '';
+        }
+
 
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");