更新价格
This commit is contained in:
parent
398893e2c5
commit
64bb636a9c
@ -504,9 +504,6 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
|||||||
$item['describe']='仅限平台指定商家商品可使用';
|
$item['describe']='仅限平台指定商家商品可使用';
|
||||||
return $item;
|
return $item;
|
||||||
});
|
});
|
||||||
// if(count($platformConsumption)>1){
|
|
||||||
// $consumption=$platformConsumption[0];
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
// }
|
// }
|
||||||
|
|
||||||
@ -636,7 +633,7 @@ class StoreOrderCreateRepository extends StoreOrderRepository
|
|||||||
$status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress';
|
$status = ($address || $order_model || $allow_no_address) ? ($noDeliver ? 'noDeliver' : 'finish') : 'noAddress';
|
||||||
$order = $merchantCartList;
|
$order = $merchantCartList;
|
||||||
$consumption_money = $this->consumption_money;
|
$consumption_money = $this->consumption_money;
|
||||||
$total_price = $order_total_price;
|
$total_price = bcsub($order_total_price,$consumption_money,2);
|
||||||
$openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
|
$openIntegral = $merIntegralFlag && !$order_type && $sysIntegralConfig['integral_status'] && $sysIntegralConfig['integral_money'] > 0;
|
||||||
$total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
|
$total_coupon = bcadd($order_svip_discount, bcadd(bcadd($total_platform_coupon_price, $order_coupon_price, 2), $order_total_integral_price, 2), 2);
|
||||||
$is_self_pickup=true;
|
$is_self_pickup=true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user