ed

app/admin/controller/After.php

@@ -41,9 +41,9 @@ class After extends \app\BaseController
             return error_show(1004,"参数 num 不能为空或零");
         }
         $order_type =isset($this->post['order_type']) &&$this->post['order_type']!=''?intval($this->post['order_type']) :"";
-        if($order_type==""){
-            return error_show(1004,"参数 order_type 不能为空或零");
-        }
+//        if($order_type==""){
+//            return error_show(1004,"参数 order_type 不能为空或零");
+//        }
         $remark =isset($this->post['remark']) &&$this->post['remark']!=''?trim($this->post['remark']) :"";
         $except_code =isset($this->post['except_code']) &&$this->post['except_code']!=''?trim($this->post['except_code']) :"";
         $img = isset($this->post['img']) &&$this->post['img']!=''?trim($this->post['img']) :"";
@@ -77,7 +77,7 @@ class After extends \app\BaseController
                 "error_remark"=>$remark,
                 "remark"=>'',
                 "except_code"=>$except_code,
-                "order_type"=>$order_type,
+                "order_type"=>$order['order_type'],
                 "status"=>0,
                 "is_del"=>0,
                 "addtime"=>date("Y-m-d H:i:s"),

app/admin/controller/Sale.php

@@ -551,6 +551,7 @@ public function out(){
             "wsm_code"=>$wsm_code,
             "orderCode"=>$orderCode,
             "outCode"=>$outCode,
+            "order_type"=>$der['order_type'],
             "apply_id"=>$rm,
             "apply_name"=>$ri,
             "addrid"=>$dr['id'],

app/admin/controller/Salezx.php

@@ -65,7 +65,7 @@ class Salezx extends \app\BaseController
                 "good_num"=>$good_num,
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
-                "origin_price"=>$zxinfo['sale_price'],
+                "origin_price"=>$zxinfo['sale_fee'],
                 "sale_price"=>$zxinfo['sale_fee'],
                 "post_fee"=>$zxinfo['delivery_fee'],
                 "status"=>0,
@@ -79,7 +79,7 @@ class Salezx extends \app\BaseController
                 "order_type"=>2,
                 "addtime"=>date("Y-m-d H:i:s"),
                 "updatetime"=>date("Y-m-d H:i:s"),
-                'total_price'=>$zxinfo['total_fee'],
+                'total_price'=>round($zxinfo['total_fee']*$good_num,2),
             ];
             $datainfo = Db::name('sale')->insert($data,true);
             $vat=[];