shish пре 5 година
родитељ
комит
d499bd4e43
1 измењених фајлова са 4 додато и 3 уклоњено
  1. 4 3
      biz-ghs/order/classes/OrderClass.php

+ 4 - 3
biz-ghs/order/classes/OrderClass.php

@@ -141,9 +141,10 @@ class OrderClass extends BaseClass
         $data['actPrice'] = $currentPrice;
         $data['actPrice'] = $currentPrice;
         $data['realPrice'] = $currentPrice;
         $data['realPrice'] = $currentPrice;
 
 
-        //如果有平台补贴
-        if (isset($data['discountType']) && $data['discountType'] == dict::getDict('discountType', 'usePtCoupon')) {
+        //客户采购时打折
+        if (isset($data['discountAmount']) && $data['discountAmount'] > 0) {
             $discountAmount = $data['discountAmount'] ?? 0;
             $discountAmount = $data['discountAmount'] ?? 0;
+            $data['actPrice'] = bcsub($currentPrice, $discountAmount, 2);
             $data['realPrice'] = bcsub($currentPrice, $discountAmount, 2);
             $data['realPrice'] = bcsub($currentPrice, $discountAmount, 2);
         }
         }
 
 
@@ -540,7 +541,7 @@ class OrderClass extends BaseClass
             $getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
             $getOriginalItem2 = Yii::$app->request->post('getOriginalItem', 0);
             if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
             if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
                 $showItem = self::getOriginalShowItem($showItem, $val);
                 $showItem = self::getOriginalShowItem($showItem, $val);
-            }else{
+            } else {
                 $showItem = self::getShowItem($showItem, $val);
                 $showItem = self::getShowItem($showItem, $val);
             }
             }