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-25 17:57:16 +08:00
commit a78e0d723e
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/common/repositories/system/merchant/MerchantIntentionRepository.php
View File

@ -116,7 +116,7 @@ class MerchantIntentionRepository extends BaseRepository
$margin = app()->make(MerchantTypeRepository::class)->get($intention['mer_type_id']); $margin = app()->make(MerchantTypeRepository::class)->get($intention['mer_type_id']);
$data['is_margin'] = $margin['is_margin'] ?? -1; $data['is_margin'] = $margin['is_margin'] ?? -1;
$data['margin'] = 0; $data['margin'] = $margin['margin'] ?? 0;
$merData = []; $merData = [];
if ($create) { if ($create) {
$password = substr($intention['phone'], -6); $password = substr($intention['phone'], -6);
@ -138,9 +138,7 @@ class MerchantIntentionRepository extends BaseRepository
'mer_password' => $password, 'mer_password' => $password,
'is_margin' => $margin['is_margin'] ?? -1, 'is_margin' => $margin['is_margin'] ?? -1,
// 用户需缴纳保证金 // 用户需缴纳保证金
'recharge_margin' => $margin['margin'] ?? 0, 'margin' => $margin['margin'] ?? 0,
// 用户已缴纳保证金
'margin' => 0,
'uid' => $intention['uid'], 'uid' => $intention['uid'],
'reg_admin_id' => $autoCreate ? 0: request()->adminId(), 'reg_admin_id' => $autoCreate ? 0: request()->adminId(),
'mer_intention_id' => $id 'mer_intention_id' => $id

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

@ -286,7 +286,7 @@ class Auth extends BaseController
'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['recharge_margin'], 'total_price' => $merchant['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')
]); ]);
@ -296,10 +296,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['recharge_margin'] . '"}', "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}',
"pay_price" => $merchant['recharge_margin'], "pay_price" => $merchant['margin'],
"order_sn" => $orderSn, "order_sn" => $orderSn,
"body" => $merchant['mer_name'] . ' - ' . $merchant['recharge_margin'], "body" => $merchant['mer_name'] . ' - ' . $merchant['margin'],
]; ];
$payType = 'weixinApp'; $payType = 'weixinApp';
$service = new PayService($payType, $param); $service = new PayService($payType, $param);
@ -307,6 +307,15 @@ class Auth extends BaseController
return app('json')->success($payInfo); return app('json')->success($payInfo);
} }
public function marginList()
{
$user = $this->request->userInfo();
[$page, $limit] = $this->getPage();
$count = Db::name('margin_order')->where('uid', $user['uid'])->count();
$list = Db::name('margin_order')->where('uid', $user['uid'])->page($page, $limit)->order('order_id', 'desc')->select()->toArray();
return app('json')->success(compact('count', 'list'));
}
/** /**
* @return mixed * @return mixed
* @throws DataNotFoundException * @throws DataNotFoundException

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

@ -264,7 +264,7 @@ class Merchant extends BaseController
if(empty($id)){ if(empty($id)){
return app('json')->fail('参数错误'); return app('json')->fail('参数错误');
} }
$data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,recharge_margin,is_margin')->find(); $data = Db::name('merchant')->where('mer_id',$id)->field('uid,mer_id,mer_name,margin,paid_margin,is_margin')->find();
return app('json')->success($data); return app('json')->success($data);
} }

12
app/listener/paySuccessMargin.php
View File

@ -22,15 +22,15 @@ 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();
$marginAmount = (float)$merchantInfo['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([
'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([ Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'margin' => $marginAmount 'margin' => $marginAmount
]); ]);
$rechargeAmount = (float)$merchantInfo['recharge_margin'] - (float)$marginInfo['total_price']; if ($marginAmount <= 0) {
Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([
'recharge_margin' => $rechargeAmount
]);
if ($rechargeAmount <= 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
]); ]);

1
route/api.php
View File

@ -69,6 +69,7 @@ Route::group('api/', function () {
Route::post('user/spread', 'api.Auth/spread'); Route::post('user/spread', 'api.Auth/spread');
//用户缴纳保证金 //用户缴纳保证金
Route::post('user/margin', 'api.Auth/doMargin'); Route::post('user/margin', 'api.Auth/doMargin');
Route::get('user/margin/list', 'api.Auth/marginList');
//优惠券 //优惠券
Route::group('coupon', function () { Route::group('coupon', function () {