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

更新保证金缴纳

Browse Source
This commit is contained in:
yaooo 2023-09-26 14:07:53 +08:00
parent dfc8497267
commit 6041ab67ba
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/controller/api/store/merchant/Merchant.php
View File

@ -262,10 +262,21 @@ class Merchant extends BaseController
{ {
$id = $this->request->param('id'); $id = $this->request->param('id');
if(empty($id)){ if(empty($id)){
return app('json')->fail('参数不能为空');
}
$merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin,first_margin_status')->find();
if(empty($merchantInfo)){
return app('json')->fail('参数错误'); return app('json')->fail('参数错误');
} }
$data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,paid_margin,is_margin')->find(); $merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
return app('json')->success($data); if ($merchantTypeInfo['first_margin'] > 0) {
if ($merchantInfo['first_margin_status']) {
$merchantInfo['margin'] = bcsub($merchantInfo['margin'], $merchantTypeInfo['first_margin'], 2);
} else {
$merchantInfo['margin'] = $merchantTypeInfo['first_margin'];
}
}
return app('json')->success($merchantInfo);
} }
public function apply($merId){ public function apply($merId){

11
app/listener/paySuccessMargin.php
View File

@ -22,6 +22,7 @@ class paySuccessMargin
'pay_time' => date('Y-m-d H:i:s') 'pay_time' => date('Y-m-d H:i:s')
]); ]);
$merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find(); $merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->find();
$paidMarginAmount = (float)$merchantInfo['paid_margin'] + (float)$marginInfo['total_price']; $paidMarginAmount = (float)$merchantInfo['paid_margin'] + (float)$marginInfo['total_price'];
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'paid_margin' => $paidMarginAmount 'paid_margin' => $paidMarginAmount
@ -30,6 +31,16 @@ class paySuccessMargin
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'margin' => $marginAmount 'margin' => $marginAmount
]); ]);
$merchantTypeInfo = Db::name('merchant_type')->where('mer_type_id', $merchantInfo['type_id'])->find();
if ($merchantTypeInfo['first_margin'] > 0) {
if (!$merchantInfo['first_margin_status'] && ($marginInfo['total_price'] <= $merchantInfo['first_margin'])) {
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'first_margin_status' => 1
]);
}
}
if ($marginAmount <= 0) { if ($marginAmount <= 0) {
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'is_margin' => 10 'is_margin' => 10