ad

app/admin/controller/Activity.php

@@ -160,6 +160,8 @@ class Activity extends Base
             $value["brand_name"]=isset($brand['brand_name'])?$brand['brand_name']:"";
             $unit = Db::name("unit")->where(["id"=>$value['good_unit']])->find();
             $value['unit'] =isset($unit['unit'])?$unit['unit']:"";
+            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
+            $value['company'] = isset($company['company'])?$company['company']:"";
 //            $company = Db::name("business")->where(["companyNo"=>$value['companyNo']])->find();
 //            $value['company'] = isset($company['company'])?$company['company']:"";
             $value['stock_total'] = Db::name("good_stock")->where(['spuCode'=>$value['spuCode'],"is_del"=>0])->sum("usable_stock");

app/admin/controller/Sale.php

@@ -895,6 +895,7 @@ class Sale extends Base
                         "supply_area"=>$zxinfo['supply_area'],
                         "pay_way"=>$zxinfo['pay_way'],
                         "send_way"=>$zxinfo['send_way'],
+                        "companyNo"=>$zxorder['companyNo'],
                         "status"=>1,
                         "is_del"=>0,
                         "createrid"=>$zxinfo['createrid'],
@@ -1747,6 +1748,9 @@ class Sale extends Base
             }else{
                 $value['use_order']='';
             }
+            $value['good_num']-=$value['th_num'];
+            $value['send_num']-=$value['th_num'];
+            $value['total_price']=round($value['total_price']-$value['th_fee'],2);
             $data[] = $value;
         }
         return app_show(0, "获取成功", ['list' => $data, 'count' => $count]);
@@ -2009,6 +2013,9 @@ class Sale extends Base
         $einfo['addrs'] = $addrs;
         $einfo['can'] = $int;
         $einfo['goodinfo'] = $goon;
+        $einfo['good_num']-=$einfo['th_num'];
+        $einfo['send_num']-=$einfo['th_num'];
+        $einfo['total_price']=round($einfo['total_price']-$einfo['th_fee'],2);
         if (empty($einfo)) {
             return error_show(1002, "未找到销售订单数据");
         } else {
@@ -3405,6 +3412,8 @@ class Sale extends Base
         $order['supplier_name'] = isset($supplier['name']) ? $supplier['name']:"";
         $palt =Db::name("platform")->where(["id"=>$order['platform_id']])->find();
         $order['platform_name']=isset($palt['platform_name']) ? $palt['platform_name']:"";
+        $company = Db::name("business")->where(["companyNo"=>$order['companyNo']])->find();
+        $order['company'] = isset($company['company'])?$company['company']:"";
         $order["gold_price"] = isset($price['price'])?$price['price']:0;
         $order["noble_weight"] = isset($order['weight'])?$order['weight']:0;
         return app_show(0,"获取成功",$order);