panlumeng 3 years ago
parent
commit
2dbdeca9ba
2 changed files with 13 additions and 6 deletions
  1. 7 0
      app/admin/controller/Customer.php
  2. 6 6
      app/admin/controller/Sale.php

+ 7 - 0
app/admin/controller/Customer.php

@@ -66,6 +66,13 @@ class Customer extends BaseController
             $inm['name']=$vat['companyName'];
             $inm['id']=$vat['id'];
             $inm['code']=$vat['companyNo'];
+            $inm['companyName']=$vat['companyName'];
+            $inm['invoice_bank']=$vat['invoice_bank'];
+            $inm['invoice_bankNo']=$vat['invoice_bankNo'];
+            $inm['invoice_code']=$vat['invoice_code'];
+            $inm['invoice_people']=$vat['invoice_people'];
+            $inm['invoice_mobile']=$vat['invoice_mobile'];
+            $inm['invoice_addr']=$vat['invoice_addr'];
             $inm['kh']=1;
             $var[]=$inm;
         }

+ 6 - 6
app/admin/controller/Sale.php

@@ -38,9 +38,9 @@ public function create(){
     $total_price=isset($this->post['total_price']) && $this->post['total_price'] !=="" ? trim($this->post['total_price']) :"";
     $post_fee=isset($this->post['post_fee']) && $this->post['post_fee'] !=="" ? trim($this->post['post_fee']) :"";
     $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']) :"";
-    $send_num = isset($this->post['send_num']) && $this->post['send_num'] !=="" ? intval($this->post['send_num']) :"";
-    $wsend_num = isset($this->post['wsend_num']) && $this->post['wsend_num'] !=="" ? intval($this->post['wsend_num']) :"";
-    $send_status = isset($this->post['send_status']) && $this->post['send_status'] !=="" ? intval($this->post['send_status']) :"";
+//    $send_num = isset($this->post['send_num']) && $this->post['send_num'] !=="" ? intval($this->post['send_num']) :"";
+//    $wsend_num = isset($this->post['wsend_num']) && $this->post['wsend_num'] !=="" ? intval($this->post['wsend_num']) :"";
+//    $send_status = isset($this->post['send_status']) && $this->post['send_status'] !=="" ? intval($this->post['send_status']) :"";
     $va= isset($this->post['order_addr']) && $this->post['order_addr'] !=="" ?  $this->post['order_addr']:"";
     if($va==""){
         return error_show(1002,"参数order_addr不能为空");
@@ -64,9 +64,9 @@ public function create(){
             "total_price"=>$total_price,
             "post_fee"=>$post_fee,
             "status"=>$status,
-            "send_num"=>$send_num,
-            "wsend_num"=>$wsend_num,
-            "send_status"=>$send_status,
+            "send_num"=>0,
+            "wsend_num"=>$good_num,
+            "send_status"=>1,
             "is_del"=>0,
             "addtime"=>date("Y-m-d H:i:s"),
             "updatetime"=>date("Y-m-d H:i:s")