更新
This commit is contained in:
parent
e8dfbec970
commit
ac3593404a
@ -281,14 +281,20 @@ class Auth extends BaseController
|
||||
return app('json')->fail('用户店铺异常');
|
||||
}
|
||||
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();
|
||||
Db::name('margin_order')->insert([
|
||||
'uid' => $user['uid'],
|
||||
'mer_id' => $merchant['mer_id'],
|
||||
'order_sn' => $orderSn,
|
||||
'total_price' => $merchant['margin'],
|
||||
'total_price' => $margin,
|
||||
'pay_type' => 1,
|
||||
'create_time' => date('Y-m-d H:i:s')
|
||||
]);
|
||||
@ -298,10 +304,10 @@ class Auth extends BaseController
|
||||
"mer_id" => $merchant['mer_id'],
|
||||
"pay_type" => 1,
|
||||
"attach" => "margin",
|
||||
"order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
|
||||
"pay_price" => $merchant['margin'],
|
||||
"order_info" => '{"is_margin":1,"margin":"' . $margin . '"}',
|
||||
"pay_price" => $margin,
|
||||
"order_sn" => $orderSn,
|
||||
"body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
|
||||
"body" => $merchant['mer_name'] . ' - ' . $margin,
|
||||
];
|
||||
$payType = 'weixinApp';
|
||||
$service = new PayService($payType, $param);
|
||||
|
Loading…
x
Reference in New Issue
Block a user