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

Merge pull request 'dev' (#18) from dev into main

Browse Source 
Reviewed-on: #18
This commit is contained in:
mkm 2024-06-26 19:42:02 +08:00
commit 6fb168f64e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/controller/store/StoreController.php
View File

@ -83,6 +83,8 @@ class StoreController extends BaseApiController
$find=UserUserLogic::StoreAdd($params); $find=UserUserLogic::StoreAdd($params);
}else{ }else{
$find['real_name']=$params['real_name']; $find['real_name']=$params['real_name'];
$find['user_ship']=$params['user_ship']??0;
$find['label_id']=$params['label_id']??0;
$find->save(); $find->save();
} }
if($find === false){ if($find === false){

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

@ -279,8 +279,7 @@ class PayNotifyLogic extends BaseLogic
$user = User::where('id', $order['uid'])->findOrEmpty(); $user = User::where('id', $order['uid'])->findOrEmpty();
$capitalFlowDao = new CapitalFlowLogic($user); $capitalFlowDao = new CapitalFlowLogic($user);
$deal_money = bcdiv($extra['amount']['refund'], 100, 2); $deal_money = bcdiv($extra['amount']['refund'], 100, 2);
if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) {
if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额
if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) { if (in_array($order['pay_type'], [PayEnum::BALANCE_PAY, PayEnum::PURCHASE_FUNDS])) {
if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额 if ($order['pay_type'] == PayEnum::BALANCE_PAY) { //用户余额
$user->now_money = bcadd($user->now_money, $deal_money, 2); $user->now_money = bcadd($user->now_money, $deal_money, 2);
@ -308,6 +307,7 @@ class PayNotifyLogic extends BaseLogic
return true; return true;
// self::afterPay($order,$extra['transaction_id']); // self::afterPay($order,$extra['transaction_id']);
} }
}
/** /**