wugg 2 years ago
parent
commit
6a10f4f9e5
2 changed files with 9 additions and 7 deletions
  1. 2 0
      app/admin/controller/Purchin.php
  2. 7 7
      app/admin/controller/Sale.php

+ 2 - 0
app/admin/controller/Purchin.php

@@ -912,6 +912,8 @@ class Purchin extends BaseController
                     }
                     $cgdinfo['wsend_num']+=$return['reissue_num'];
                     $cgdinfo['send_num']-=$return['return_num'];
+                    $cgdinfo['good_num']-=$return['return_num']-$return['reissue_num'];
+                    $cgdinfo['total_fee']=round($cgdinfo['good_num']*$cgdinfo['good_price'],2);
                     $cgdinfo['send_status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['status']=$cgdinfo['wsend_num']==0 ? 3:($cgdinfo['send_num']==0 ?1:2);
                     $cgdinfo['updatetime']=date("Y-m-d H:i:s");

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

@@ -730,8 +730,8 @@ class Sale extends Base
             "skuCode"=>$skuCode,
             "orderCode"=>$orderCode,
             "good_name"=>$zxinfo['good_name'],
-            "sale_price"=>$zxinfo['origin_price'],
-            "total_fee"=>$zxinfo['total_fee'],
+            "sale_price"=>$zxinfo['total_fee'],
+            "total_fee"=>round($zxinfo['total_fee']* $good_num, 2),
             "pakge_fee"=>$zxinfo['pakge_fee'],
             "cert_fee"=>$zxinfo['cert_fee'],
             "open_fee"=>$zxinfo['open_fee'],
@@ -785,7 +785,7 @@ class Sale extends Base
                 "cat_id"=>$zxinfo['cat_id'],
                 "apply_id"=>$rm,
                 "apply_name"=>$ri,
-                "origin_price"=>$zxinfo['nake_fee'],
+                "origin_price"=>$zxinfo['total_fee'],
                 "sale_price" => $sale_price,//销售单价支持修改
                 "post_fee"=>0,
                 "status"=>0,
@@ -806,7 +806,7 @@ class Sale extends Base
                 "proof_id"=>0,
                 "order_type"=>3,
                 'good_weight'=>$zxinfo['good_weight'],
-                'gold_price'=>$zxinfo['sale_price'],
+                'gold_price'=>$zxinfo['total_fee'],
                 'cost_price'=>$zxinfo['sale_cost_fee'],
                 'diff_weight'=>0,
                 'diff_fee'=>0,
@@ -1184,8 +1184,8 @@ class Sale extends Base
             "skuCode"=>"",
             "orderCode"=>$orderCode,
             "good_name"=>$goodinfo['good_name'],
-            "sale_price"=>$data['origin_price'],
-            "total_fee"=>$data['origin_price']*$data['good_num'],
+            "sale_price"=>$goodinfo['total_fee'],
+            "total_fee"=>round($goodinfo['total_fee']*$data['good_num'],2),
             "pakge_fee"=>$goodinfo['pakge_fee'],
             "cert_fee"=>$goodinfo['cert_fee'],
             "open_fee"=>$goodinfo['open_fee'],
@@ -1210,7 +1210,7 @@ class Sale extends Base
             "cat_id"=>$goodinfo['cat_id'],
             "apply_id"=>$data['rm'],
             "apply_name"=>$data['ri'],
-            "origin_price"=>$goodinfo['nake_fee'],
+            "origin_price"=>$goodinfo['total_fee'],
             "sale_price"=>$data['sale_price'],
             "post_fee"=>0,
             "status"=>0,