wugg 11 months ago
parent
commit
c096156cd2

+ 1 - 1
app/admin/controller/CompanyCgd.php

@@ -102,7 +102,7 @@ class CompanyCgd extends Base
     			'supplierNo'=>$info->supplierNo,
     			'supplier_name'=>$info->supplier_name,
     			'good_price'=>$info->good_price,
-    			'total_fee'=>$info->total_fee,
+    			'total_fee'=>$info->origin_total,
     			"cgder_id"=>$info->cgder_id,
     			"cgder"=>$info->cgder,
     			'good_createrid'=>$info->good_createrid,

+ 3 - 0
app/admin/controller/Filing.php

@@ -749,6 +749,7 @@ class Filing extends Base
                 'good_num' => $send_num,
                 'good_price' => $filing['cgd_charge'],
                 'total_fee' => round(bcmul($filing['cgd_charge'], $filing['num']), 2),
+                'origin_total' =>round(bcmul($filing['cgd_charge'], $filing['num']), 2),
                 'pakge_fee' => $filing['pakge_fee'],
                 'cert_fee' => $filing['cert_fee'],
                 'open_fee' => $filing['open_fee'],
@@ -1071,6 +1072,7 @@ class Filing extends Base
             "good_num" => $param['goodNum'],
             "good_price" => $cgdprice,
             "total_fee" => $param['cgd_total'],
+            "origin_total" => $param['cgd_total'],
             "supplierNo" => $param['supplierNo'],
             "supplier_name" =>$tmp['data'][$param['supplierNo']],
             "companyNo" => $param['companyNo'],
@@ -1295,6 +1297,7 @@ class Filing extends Base
             'cgder' => $person['person'],
             "good_price" => $cgdPrice,
             "total_fee" => $param['cgd_total'],
+            'origin_total' => $param['cgd_total'],
             "supplierNo" => $param['supplierNo'],
             "supplier_name" => $supplierinfo['data']['name'],
 //			"companyNo"=>$param['companyNo'],

+ 1 - 0
app/admin/controller/Resign.php

@@ -928,6 +928,7 @@ class Resign extends Base
             "good_num"=>$info['good_num'],
             "good_price"=>$sale_price,
             "total_fee"=>$total_price,
+            "origin_total"=>$total_price,
             "pakge_fee"=>isset($goodnake['package_fee'])? $goodnake['package_fee']:0,
             "cert_fee"=>isset($goodnake['cert_fee'])? $goodnake['cert_fee']:0,
             "open_fee"=>$good['open_fee'],

+ 1 - 0
app/admin/controller/Sale.php

@@ -532,6 +532,7 @@ class Sale extends Base
             "good_num" => $data['good_num'],
             "good_price" => $data['sale_price'],
             "total_fee" => round($data['sale_price'] * $data['good_num'], 2),
+            "origin_total" => round($data['sale_price'] * $data['good_num'], 2),
             "pakge_fee" => $data['pakge_fee'],
             "cert_fee" => $data['cert_fee'],
             "open_fee" => $data['open_fee'],

+ 1 - 0
app/command/ImportOrderFromCHandleData.php

@@ -192,6 +192,7 @@ class ImportOrderFromCHandleData extends Command
                     "good_name" => $ct['good_name'],
                     "sale_price" => $origin_price,
                     "total_fee" => $origin_price * $good_num,
+                    'origin_total' => $origin_price * $good_num,
                     "pakge_fee" => isset($origin['package_fee']) ? $origin['package_fee'] : 0,
                     "cert_fee" => isset($origin['cert_fee']) ? $origin['cert_fee'] : 0,
                     "open_fee" => $ct['open_fee'],

+ 1 - 0
app/command/InterMakeOrder.php

@@ -133,6 +133,7 @@ class InterMakeOrder extends Command
             "good_num" => $param['good_num'],
             "good_price" => $param['cgd_price'],
             "total_fee" => $param['cgd_total'] ,
+            "origin_total" => $param['cgd_total'] ,
             "supplierNo" => $param['supplierNo'],
             "supplier_name" =>$param['supplierName'],
             "companyNo" => $param['companyNo'],

+ 1 - 0
app/command/SplitSale.php

@@ -321,6 +321,7 @@ class SplitSale extends Command
         $tmp_cgd = [
             'good_price' => round($good_price, 8),
             'total_fee' => $cgd_total,
+            'origin_total' => $cgd_total,
             'pakage_fee' => $cgd['pakge_fee'] ?? 0,
             'open_fee' => $cgd['open_fee'] ?? 0,
             'cert_fee' => $cgd['cert_fee'] ?? 0,

+ 1 - 0
app/command/handleYzOrderData.php

@@ -244,6 +244,7 @@ class handleYzOrderData extends Command
                             "good_name" => $ct['good_name'],
                             "sale_price" => $origin_price,
                             "total_fee" => $origin_price * $good_num,
+                            "origin_total" => $origin_price * $good_num,
                             "pakge_fee" => isset($origin['package_fee']) ? $origin['package_fee'] : 0,
                             "cert_fee" => isset($origin['cert_fee']) ? $origin['cert_fee'] : 0,
                             "open_fee" => $ct['open_fee'],