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

更新

Browse Source
This commit is contained in:
shengchanzhe 2023-12-16 11:07:24 +08:00
parent 67c084ab2c
commit 74d18f9652
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/controller/api/Auth.php
View File

@ -422,7 +422,6 @@ class Auth extends BaseController
public function doMargin() public function doMargin()
{ {
return app('json')->fail('线上缴纳调整中，请在线下缴纳');
$user = $this->request->userInfo(); $user = $this->request->userInfo();
$merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->find(); $merchant = Db::name('merchant')->where('uid', $user['uid'])->where('status', 1)->find();
if (!$merchant) { if (!$merchant) {

10
app/listener/paySuccessMargin.php
View File

@ -18,7 +18,7 @@ class paySuccessMargin
Db::startTrans(); Db::startTrans();
try { try {
$order_sn = $event['order_sn']; $order_sn = $event['order_sn'];
$marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->find(); $marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->where('paid',0)->find();
if ($marginInfo) { if ($marginInfo) {
Db::name('margin_order')->where('order_id', $marginInfo['order_id'])->update([ Db::name('margin_order')->where('order_id', $marginInfo['order_id'])->update([
'paid' => 1, 'paid' => 1,
@ -30,10 +30,7 @@ class paySuccessMargin
//已支付的押金 //已支付的押金
$paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2); $paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2);
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([ Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount 'paid_margin' => $paidMarginAmount,'ot_margin'=>$paidMarginAmount,'margin' => 0
]);
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
'margin' => 0
]); ]);
if ($paidMarginAmount ==$merchant_type['margin']) { if ($paidMarginAmount ==$merchant_type['margin']) {
@ -44,10 +41,13 @@ class paySuccessMargin
} }
// 提交事务 // 提交事务
Db::commit(); Db::commit();
return true;
} catch (\Exception $e) { } catch (\Exception $e) {
Log::error('微信支付押金失败' . $e->getMessage()); Log::error('微信支付押金失败' . $e->getMessage());
// 回滚事务 // 回滚事务
Db::rollback(); Db::rollback();
return false;
} }
} }