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

Merge branch 'feat_agree' into dev

Browse Source
This commit is contained in:
yaooo 2023-09-23 14:57:49 +08:00
commit e6412e7cf0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,6 +281,15 @@ class Auth extends BaseController
return app('json')->fail('用户店铺异常');
}
$repository = app()->make(StoreOrderRepository::class);
$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'],
'pay_type' => 1,
'create_time' => date('Y-m-d H:i:s')
]);
$param = [
"status" => 0,
"is_del" => 0,
@ -289,7 +298,7 @@ class Auth extends BaseController
"attach" => "margin",
"order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
"pay_price" => $merchant['margin'],
"order_sn" => "bzj" . date('YmdHis') . uniqid(),
"order_sn" => $orderSn,
"body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
];
$payType = 'weixinApp';