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

Merge pull request 'feat(PayNotifyLogic): 修改用户支付通知逻辑，调整资金流动记录' (#57) from dev into rose

Browse Source 
Reviewed-on: #57
This commit is contained in:
mkm 2024-07-27 09:46:57 +08:00
commit f8806b8ada
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/common/logic/PayNotifyLogic.php
View File

@ -93,7 +93,7 @@ class PayNotifyLogic extends BaseLogic
} }
// self::addUserSing($order); // self::addUserSing($order);
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 0, $order['store_id']); $capitalFlowDao->userExpense('user_order_balance_pay', 'order', $order['id'], $order['pay_price'], '', 3, $order['store_id']);
self::dealProductLog($order); self::dealProductLog($order);
self::afterPay($order); self::afterPay($order);
@ -203,7 +203,7 @@ class PayNotifyLogic extends BaseLogic
$user->save(); $user->save();
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'], '', 1, $order['store_id']); $capitalFlowDao->userExpense('user_order_purchase_pay', 'order', $order['id'], $order['pay_price'], '', 18, $order['store_id']);
// if ($user['user_ship'] == 1) { // if ($user['user_ship'] == 1) {
// self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS); // self::dealVipAmount($order, PayEnum::PURCHASE_FUNDS);
// } // }
@ -263,7 +263,7 @@ class PayNotifyLogic extends BaseLogic
} else { } else {
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
//微信支付和用户余额无关 //微信支付和用户余额无关
$capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 1, $order['store_id']); $capitalFlowDao->userExpense('user_order_pay', 'order', $order['id'], $order->pay_price, '', 0, $order['store_id']);
} }
$order->save(); $order->save();
if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) { if ($order['reservation'] == 1 && in_array($order['shipping_type'], [1, 2])) {
@ -304,10 +304,10 @@ class PayNotifyLogic extends BaseLogic
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
if ($purchase_funds >= $orderRe['price']) { if ($purchase_funds >= $orderRe['price']) {
User::where('id', $orderRe['uid'])->dec('purchase_funds', $orderRe['refund_price'])->update(); User::where('id', $orderRe['uid'])->dec('purchase_funds', $orderRe['refund_price'])->update();
$capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $orderRe['refund_price'], '', 1, $orderRe['store_id']); $capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $orderRe['refund_price'], '', 0, $orderRe['store_id']);
} else { } else {
User::where('id', $orderRe['uid'])->dec('purchase_funds', $purchase_funds)->update(); User::where('id', $orderRe['uid'])->dec('purchase_funds', $purchase_funds)->update();
$capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $purchase_funds, '', 1, $orderRe['store_id']); $capitalFlowDao->userExpense('user_balance_recharge_refund', 'order', $orderRe['id'], $purchase_funds, '', 0, $orderRe['store_id']);
} }
//退还 充值得兑换券 //退还 充值得兑换券
UserSignLogic::RefundRecharge($orderRe); UserSignLogic::RefundRecharge($orderRe);