更新
This commit is contained in:
parent
deedafe21f
commit
15a098f733
@ -155,12 +155,7 @@ class Merchant extends BaseController
|
||||
//return app('json')->fail('该商家手机号已存在账户，请更换手机');
|
||||
}
|
||||
unset($data['mer_account'], $data['mer_password']);
|
||||
$margin = $this->repository->checkMargin($id, $data['type_id']);
|
||||
$data['margin'] = $margin['margin'];
|
||||
$data['is_margin'] = $data['paid_margin'] > 0 ? MerchantRepository::PaidMargin : $margin['is_margin'];
|
||||
$data['ot_margin'] = $data['paid_margin'];
|
||||
$datas=$data;
|
||||
$this->repository->update($id, $datas);
|
||||
$this->repository->update($id, $data);
|
||||
return app('json')->success('编辑成功');
|
||||
}
|
||||
|
||||
@ -190,7 +185,7 @@ class Merchant extends BaseController
|
||||
*/
|
||||
public function checkParam(MerchantValidate $validate, $isUpdate = false)
|
||||
{
|
||||
$data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate', 'paid_margin', 'first_margin']);
|
||||
$data = $this->request->params([['area_id',0],['street_id',0],['village_id',0],['category_id', 0], ['type_id', 0], 'mer_name', 'commission_rate', 'real_name', 'mer_phone', 'mer_keyword', 'mer_address', 'mark', ['sort', 0], ['status', 0], ['is_audit', 0], ['is_best', 0], ['is_bro_goods', 0], ['is_bro_room', 0], ['is_trader', 0],'sub_mchid', 'auto_margin_rate','margin']);
|
||||
if (!$isUpdate) {
|
||||
$data += $this->request->params(['mer_account', 'mer_password']);
|
||||
}else {
|
||||
|
||||
@ -91,7 +91,7 @@ class MerchantType extends BaseController
|
||||
|
||||
protected function getValidParams()
|
||||
{
|
||||
$data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'first_margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
|
||||
$data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin','auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
|
||||
$validate = app()->make(MerchantTypeValidate::class);
|
||||
$validate->check($data);
|
||||
if ($data['is_margin'] == 1) {
|
||||
|
||||
@ -280,9 +280,6 @@ class Auth extends BaseController
|
||||
if (!$merchant) {
|
||||
return app('json')->fail('用户店铺异常');
|
||||
}
|
||||
if ($merchant['first_margin'] > 0 && $merchant['first_margin_status'] == 0) {
|
||||
$merchant['margin'] = $merchant['first_margin'];
|
||||
}
|
||||
$repository = app()->make(StoreOrderRepository::class);
|
||||
$orderSn = "bzj" . date('YmdHis') . uniqid();
|
||||
Db::name('margin_order')->insert([
|
||||
|
||||
@ -264,16 +264,11 @@ class Merchant extends BaseController
|
||||
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,first_margin_status')->find();
|
||||
$merchantInfo = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,type_id,mer_name,margin,paid_margin,is_margin')->find();
|
||||
if(empty($merchantInfo)){
|
||||
return app('json')->fail('参数错误');
|
||||
}
|
||||
$merchantInfo['unpaid_margin'] = $merchantInfo['margin'];
|
||||
if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) {
|
||||
$merchantInfo['margin'] = $merchantInfo['first_margin'];
|
||||
} else {
|
||||
$merchantInfo['margin'] = $merchantInfo['margin'];
|
||||
}
|
||||
return app('json')->success($merchantInfo);
|
||||
}
|
||||
|
||||
|
||||
@ -164,9 +164,9 @@ class MerchantIntention extends BaseController
|
||||
'mer_id' => $merInfo['mer_id'],
|
||||
'phone' => $merInfo['mer_phone'],
|
||||
'mer_name' => $merInfo['mer_name'],
|
||||
'name' => $merInfo['mer_name'],
|
||||
'merchant_category_id' => $merInfo['category_id'],
|
||||
'mer_type_id' => $merInfo['type_id'],
|
||||
'is_old_mer' => 1
|
||||
];
|
||||
}
|
||||
$intenInfo['bank_username'] = $data['bank_username'];
|
||||
@ -193,9 +193,9 @@ class MerchantIntention extends BaseController
|
||||
'master_phone' => $intenInfo['phone'],
|
||||
'images' => !empty($intenInfo['images'])?json_encode(explode(',', $intenInfo['images'])):'',
|
||||
'city' => $areaInfo['city_code'] ?? '',
|
||||
'area' => $intenInfo['area_id'] ?? '',
|
||||
'street' => $intenInfo['street_id'] ?? '',
|
||||
'address' => $intenInfo['address'] ?? '',
|
||||
'area' => $merInfo['area_id'] ?? '',
|
||||
'street' => $merInfo['street_id'] ?? '',
|
||||
'address' => $merInfo['address'] ?? '',
|
||||
'bank_username' => $data['bank_username'] ?? '',
|
||||
'bank_opening' => $data['bank_opening'] ?? '',
|
||||
'bank_front' => $data['bank_front'] ?? '',
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<?php
|
||||
declare (strict_types=1);
|
||||
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace app\listener;
|
||||
|
||||
@ -14,38 +15,40 @@ class paySuccessMargin
|
||||
public function handle($event)
|
||||
{
|
||||
Log::info('微信支付保证金成功回调' . json_encode($event));
|
||||
Db::transaction(function () use ($event) {
|
||||
Db::startTrans();
|
||||
try {
|
||||
$order_sn = $event['order_sn'] ?? '';
|
||||
$marginInfo = Db::name('margin_order')->where('order_sn', $order_sn)->find();
|
||||
Db::name('margin_order')->where('order_sn', $order_sn)->update([
|
||||
'paid' => 1,
|
||||
'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();
|
||||
if ($marginInfo) {
|
||||
Db::name('margin_order')->where('order_sn', $order_sn)->update([
|
||||
'paid' => 1,
|
||||
'pay_time' => date('Y-m-d H:i:s')
|
||||
]);
|
||||
$merchantInfo = Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->find();
|
||||
$merchant_type = Db::name('merchant_type')->where('mer_type_id', $marginInfo['type_id'])->find();
|
||||
|
||||
$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([
|
||||
'paid_margin' => $paidMarginAmount
|
||||
]);
|
||||
$marginAmount = (float)$merchantInfo['margin'] - (float)$marginInfo['total_price'];
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
|
||||
'margin' => $marginAmount
|
||||
]);
|
||||
//已支付的保证金
|
||||
$paidMarginAmount = bcadd($merchantInfo['paid_margin'], $marginInfo['total_price'], 2);
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
|
||||
'paid_margin' => $paidMarginAmount
|
||||
]);
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
|
||||
'margin' => 0
|
||||
]);
|
||||
|
||||
if ($merchantInfo['first_margin'] > 0 && $merchantInfo['first_margin_status'] == 0) {
|
||||
if ($marginInfo['total_price'] <= $merchantTypeInfo['first_margin']) {
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
|
||||
'first_margin_status' => 1
|
||||
if ($paidMarginAmount ==$merchant_type['margin']) {
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'])->where('uid', $marginInfo['uid'])->update([
|
||||
'is_margin' => 10
|
||||
]);
|
||||
}
|
||||
}
|
||||
// 提交事务
|
||||
Db::commit();
|
||||
} catch (\Exception $e) {
|
||||
Log::error('微信支付保证金失败' . $e->getMessage());
|
||||
// 回滚事务
|
||||
Db::rollback();
|
||||
}
|
||||
|
||||
if ($marginAmount <= 0) {
|
||||
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
|
||||
'is_margin' => 10
|
||||
]);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -1 +1 @@
|
||||
pGW7pPFlXo9Ex7ZPdlu06BP64TfCI5znDxf7qrBZ2WZxeytwHv3wPtru8i/QOJr/EZtiuPj4JnllFeArvZiqFL/IjYm0OFZjQn4+8dktMn47eD3B7Bwcig8pqc4AHA75G7jj7F94mW965k7lzmufaTLIMmX0BFY5yi2iWILA56pPh92ORC2Z/juM2zr3gWhbv9RGAuOftiBauIZ833GinLSRsBAu41dLydmZSGiL+49UZC50+oz2OEC3WQdluTLyMonpmJ2essaeDufq17/Ng7+ydBEbN2Dx3kdaLLnEgYbGNo74+R5/bCMTFksJX/Y9omD7qycRvaE2WYmZY3IDzw==,ZC9992742
|
||||
oTmdaPVqUz9ndM6Hz6BCP69jTcGgOyr6tOoyr4F07TBDjrBagS59ymsz1T/RbaOf/i8qYom+ZZmoczoJk1uJuKpKDhlQtuQENSbl53DCXAjnag+vFypGb7r5VXxvaEDuykqqaS6a0IHIIyE8D9fHnUdx++ioKJ14BGbrVRRhvOhOOUKCoQo7UA9Ad6w/oP7jh0Pjr9o9lHOkuqZDFQUUD0LTs4gZSYwEiFzZF6LiitkoH6WBx614mPUH0gCdb8MyeaUbNkd9UzipO4FUJ0U5X+jj0EZUedfy4VB3BMMoBTBMV5HywcCVOlcrA8dY1E7vjehUrNa/1PR1QYUuPs/dnQ==,
|
||||
Loading…
x
Reference in New Issue
Block a user