|
|
@@ -141,9 +141,10 @@ class OrderClass extends BaseClass
|
|
|
$data['actPrice'] = $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;
|
|
|
+ $data['actPrice'] = 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);
|
|
|
if ($getOriginalItem == 1 || $getOriginalItem2 == 1) {
|
|
|
$showItem = self::getOriginalShowItem($showItem, $val);
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
$showItem = self::getShowItem($showItem, $val);
|
|
|
}
|
|
|
|