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

更新

Browse Source
This commit is contained in:
mkm 2023-09-27 20:57:02 +08:00
parent e8dfbec970
commit ac3593404a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,14 +281,20 @@ class Auth extends BaseController
return app('json')->fail('用户店铺异常'); return app('json')->fail('用户店铺异常');
} }
if($merchant['margin'] == 0){ if($merchant['margin'] == 0){
return app('json')->fail('当前金额为0,不能进行充值'); $margin = Db::name('MerchantType')->where('mer_type_id', $merchant['type_id'])->value('margin');
$margin = bcsub($margin,$merchant['paid_margin'],2);
if($margin==0){
return app('json')->fail('当前金额为0,不能进行充值');
}
}else{
$margin=0;
} }
$orderSn = "bzj" . date('YmdHis') . uniqid(); $orderSn = "bzj" . date('YmdHis') . uniqid();
Db::name('margin_order')->insert([ Db::name('margin_order')->insert([
'uid' => $user['uid'], 'uid' => $user['uid'],
'mer_id' => $merchant['mer_id'], 'mer_id' => $merchant['mer_id'],
'order_sn' => $orderSn, 'order_sn' => $orderSn,
'total_price' => $merchant['margin'], 'total_price' => $margin,
'pay_type' => 1, 'pay_type' => 1,
'create_time' => date('Y-m-d H:i:s') 'create_time' => date('Y-m-d H:i:s')
]); ]);
@ -298,10 +304,10 @@ class Auth extends BaseController
"mer_id" => $merchant['mer_id'], "mer_id" => $merchant['mer_id'],
"pay_type" => 1, "pay_type" => 1,
"attach" => "margin", "attach" => "margin",
"order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}', "order_info" => '{"is_margin":1,"margin":"' . $margin . '"}',
"pay_price" => $merchant['margin'], "pay_price" => $margin,
"order_sn" => $orderSn, "order_sn" => $orderSn,
"body" => $merchant['mer_name'] . ' - ' . $merchant['margin'], "body" => $merchant['mer_name'] . ' - ' . $margin,
]; ];
$payType = 'weixinApp'; $payType = 'weixinApp';
$service = new PayService($payType, $param); $service = new PayService($payType, $param);