mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

购物卡不计入采购金额，修改增收补贴

Browse Source
This commit is contained in:
luofei 2024-03-05 17:37:23 +08:00
parent 814bf3921e
commit 273815b728
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -792,7 +792,7 @@ class StoreOrderRepository extends BaseRepository
} }
$order->save(); $order->save();
if ($order->uid != $order->merchant->uid) { if ($order->uid != $order->merchant->uid && !$order->orderProduct[0]->product->isPlatformCard()) {
$refundPrice = StoreRefundOrder::where('order_id', $order['order_id'])->where('status', '<>', -1)->sum('refund_price'); $refundPrice = StoreRefundOrder::where('order_id', $order['order_id'])->where('status', '<>', -1)->sum('refund_price');
$money = bcsub($order->total_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2); $money = bcsub($order->total_price, bcadd($order['extension_one'], $order['extension_two'], 3), 2);
$money = bcsub($money, $refundPrice, 2); $money = bcsub($money, $refundPrice, 2);

3
app/controller/api/server/Store.php
View File

@ -97,6 +97,7 @@ class Store extends BaseController
$saleTarget = $userConsumption['coupon_price']; $saleTarget = $userConsumption['coupon_price'];
$purchaseTarget = $userConsumption['coupon_price']; $purchaseTarget = $userConsumption['coupon_price'];
$merchant['purchase_amount'] = bcsub($userConsumption['coupon_price'], $userConsumption['balance'], 2); $merchant['purchase_amount'] = bcsub($userConsumption['coupon_price'], $userConsumption['balance'], 2);
$merchant['balance'] = $userConsumption['balance'];
} }
} else { } else {
//增收销售补贴 //增收销售补贴
@ -108,6 +109,7 @@ class Store extends BaseController
->field('coupon_price,balance,status') ->field('coupon_price,balance,status')
->find(); ->find();
$subsidyAmount = $userConsumption['coupon_price'] ?? '0.00'; $subsidyAmount = $userConsumption['coupon_price'] ?? '0.00';
$merchant['balance'] = $userConsumption['balance'] ?? '0.00';
foreach ($consumption['config'] as $k => $item) { foreach ($consumption['config'] as $k => $item) {
if (empty($userConsumption) && in_array($merchant['type_id'], $item['type_id'])) { if (empty($userConsumption) && in_array($merchant['type_id'], $item['type_id'])) {
$saleTarget = $item['amount']; $saleTarget = $item['amount'];
@ -143,6 +145,7 @@ class Store extends BaseController
'spring_subsidy' => $saleTarget, 'spring_subsidy' => $saleTarget,
'spring_subsidy_amount' => $merchant['purchase_amount'], 'spring_subsidy_amount' => $merchant['purchase_amount'],
'spring_subsidy_rate' => $springSubsidyRate, 'spring_subsidy_rate' => $springSubsidyRate,
'balance' => $merchant['balance'],
]); ]);
} }