|
|
@@ -522,7 +522,6 @@ class OrderClass extends BaseClass
|
|
|
|
|
|
$data['prePrice'] = $currentPrice;
|
|
|
$actPrice = $currentPrice;
|
|
|
- $realPrice = $currentPrice;
|
|
|
|
|
|
//商家自己开单时
|
|
|
if (isset($data['modifyPrice'])) {
|
|
|
@@ -540,10 +539,37 @@ class OrderClass extends BaseClass
|
|
|
$data['discountType'] = dict::getDict('discountType', 'discount');
|
|
|
}
|
|
|
$actPrice = $modifyPrice;
|
|
|
- $realPrice = $modifyPrice;
|
|
|
if ($book == 1) {
|
|
|
$actPrice = 0;
|
|
|
- $realPrice = 0;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ //整单满减
|
|
|
+ if ($book == 0) {
|
|
|
+ $meetNum = $shop->meetNum ?? 0;
|
|
|
+ $meetAmount = $shop->meetAmount ?? 0;
|
|
|
+ $cutAmount = $shop->cutAmount ?? 0;
|
|
|
+ if ($meetNum > 0) {
|
|
|
+ if (isset($data['bigNum']) && $data['bigNum'] >= $meetNum) {
|
|
|
+ if ($cutAmount > $actPrice) {
|
|
|
+ util::fail('整单满减为负');
|
|
|
+ }
|
|
|
+ $actPrice = bcsub($actPrice, $cutAmount, 2);
|
|
|
+ if (isset($data['reachDiscountPrice'])) {
|
|
|
+ $data['reachDiscountPrice'] = bcadd($data['reachDiscountPrice'], $cutAmount, 2);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ($meetAmount > 0) {
|
|
|
+ if (isset($data['itemPrice']) && $data['itemPrice'] >= $meetAmount) {
|
|
|
+ if ($cutAmount > $actPrice) {
|
|
|
+ util::fail('整单满减为负');
|
|
|
+ }
|
|
|
+ $actPrice = bcsub($actPrice, $cutAmount, 2);
|
|
|
+ if (isset($data['reachDiscountPrice'])) {
|
|
|
+ $data['reachDiscountPrice'] = bcadd($data['reachDiscountPrice'], $cutAmount, 2);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -552,13 +578,12 @@ class OrderClass extends BaseClass
|
|
|
$discountAmount = $data['discountAmount'] ?? 0;
|
|
|
$currentDiscountPrice = bcsub($currentPrice, $discountAmount, 2);
|
|
|
$actPrice = $currentDiscountPrice;
|
|
|
- $realPrice = $currentDiscountPrice;
|
|
|
}
|
|
|
|
|
|
$data['actPrice'] = $actPrice;
|
|
|
$data['bookPrice'] = $actPrice;
|
|
|
$data['orderPrice'] = $actPrice;
|
|
|
- $data['realPrice'] = $realPrice;
|
|
|
+ $data['realPrice'] = $actPrice;
|
|
|
|
|
|
$data['sendTimeWant'] = isset($data['sendTimeWant']) && !empty($data['sendTimeWant']) ? $data['sendTimeWant'] : date("Y-m-d");
|
|
|
//订单有效期
|