ad

app/admin/controller/Consult.php

@@ -1614,6 +1614,8 @@ class Consult extends Base
             $info->out_tax_id=$params['out_tax_id'];
             $info->out_tax=$params['out_tax'];
             $info->remark=$params['remark'];
+            $info->tax_exam_uid=$this->uid;
+            $info->tax_exam_uname=$this->uname;
             $save=$info->save();
             if($save){
                 ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], [
@@ -1657,7 +1659,9 @@ class Consult extends Base
                 "id"=>$bids[$v]['id'],
                 "tax_status"=>1,
                 "out_tax_id"=>$bids[$v]['tax_id'],
-                "out_tax"=>$bids[$v]['tax']
+                "out_tax"=>$bids[$v]['tax'],
+                "tax_exam_uid"=>$this->uid,
+                'tax_exam_uname'=>$this->uname
                 ];
         }
         try{
@@ -2034,7 +2038,7 @@ class Consult extends Base
         }
         $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
         if($is_own==1){
-            $rm= $this->uid;//isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
+            $rm= $this->uid; //isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
             $where[]=['a.createrid',"=",$rm];
         }
         $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
@@ -2085,6 +2089,7 @@ class Consult extends Base
             $value['supplierName'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]['name']:"";
             $value['supplier_legaler_type'] = isset($supplier[$value['supplierNo']])?$supplier[$value['supplierNo']]['legaler_type']:"";
             $value['company_legaler_type'] = isset($company[$value['companyNo']])?$company[$value['companyNo']]:'';
+            $value['platform_name'] = \app\admin\model\Platform::where("id",$value['platform_code'])->value("platform_name","");
             if($value['brand_id']!=0){
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
                 $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";

app/command/handleYzOrderData.php

@@ -107,10 +107,12 @@ class handleYzOrderData extends Command
 
 				$is_activity = 0;
                 $sale_price = $c_data['discount_price'];
-	            if (isset($c_data['coupon']) && is_discount($c_data['coupon'])) {
+                $actCode='';
+	            if (isset($c_data['coupon']['actCode']) && $c_data['coupon']['actCode']!="") {
 		            //如果是泰行销的单子，要取原始价格(即优惠前的价格)
 		            $is_activity=2;//txx活动标识
-		            $sale_price = $c_data['price'];
+                    $actCode=$c_data['coupon']['actCode'];
+		            $sale_price = $c_data['coupon']['cent_value']/100;
 	            }
 
 
@@ -176,7 +178,7 @@ class handleYzOrderData extends Command
                     "remark" => $remark,
                     "is_stock" => $is_stock,
                     "is_activity" => $is_activity,
-                    'activity_code' => $is_activity==1 ? $act['activity_code'] : ($is_activity==2?"txx":""),
+                    'activity_code' => $is_activity==1 ? $act['activity_code'] : ($is_activity==2?$actCode:""),
                     "order_type" => $order_type,
                     "order_source" => $order_source,
                     'open_type'=>$goodinfo['open_type'],