From 16b3c51d319cc4a461852a56097d254f0b37b79f Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 14:32:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/listener/paySuccessMargin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php index bc4c208f..2124ea2f 100644 --- a/app/listener/paySuccessMargin.php +++ b/app/listener/paySuccessMargin.php @@ -26,7 +26,7 @@ class paySuccessMargin Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ 'margin' => $marginAmount ]); - $rechargeAmount = (float)$marginInfo['recharge_margin'] - (float)$merchantInfo['total_price']; + $rechargeAmount = (float)$merchantInfo['recharge_margin'] - (float)$marginInfo['total_price']; Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ 'recharge_margin' => $rechargeAmount ]); From 6f075771858ae9994298e23bc03a86f63ea59204 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 15:10:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91=E8=AE=A2=E5=8D=95=E4=BA=A4=E6=98=93=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Auth.php | 9 +++++++++ route/api.php | 1 + 2 files changed, 10 insertions(+) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index 1d2dd3db..aa092d1f 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -307,6 +307,15 @@ class Auth extends BaseController 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)->select()->toArray(); + return app('json')->success(compact('count', 'list')); + } + /** * @return mixed * @throws DataNotFoundException diff --git a/route/api.php b/route/api.php index a751713a..ccbfe1c0 100644 --- a/route/api.php +++ b/route/api.php @@ -69,6 +69,7 @@ Route::group('api/', function () { Route::post('user/spread', 'api.Auth/spread'); //用户缴纳保证金 Route::post('user/margin', 'api.Auth/doMargin'); + Route::get('user/margin/list', 'api.Auth/marginList'); //优惠券 Route::group('coupon', function () { From 279e339c9cd65a3474b403ec852d0c9e1f38e2be Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 15:16:09 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9D=99=E6=80=81?= =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 1b842b3f..d152ac93 100644 --- a/public/index.html +++ b/public/index.html @@ -2,4 +2,4 @@ document.write('') if(window.location.protocol == 'https:'){ document.write('') - }
+ }
From ce086b01573cb4475420428e87dba0e3fd796c41 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 15:28:56 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=87=91=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index aa092d1f..b25e2989 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -312,7 +312,7 @@ class Auth extends BaseController $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)->select()->toArray(); + $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')); } From 26d680995e6b3b21e3f2e2cbe45da16d2953ebb5 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 15:41:17 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E9=9C=80=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/repositories/system/serve/ServeOrderRepository.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/repositories/system/serve/ServeOrderRepository.php b/app/common/repositories/system/serve/ServeOrderRepository.php index be43a534..dc0f14e2 100644 --- a/app/common/repositories/system/serve/ServeOrderRepository.php +++ b/app/common/repositories/system/serve/ServeOrderRepository.php @@ -98,7 +98,7 @@ class ServeOrderRepository extends BaseRepository $arr = [ 'type_id' => $ret['type_id'], 'is_margin' => $ret['is_margin'], - 'margin' => $ret['margin'], + 'margin' => $ret['recharge_margin'], ]; $param = [ 'status' => 0, @@ -109,7 +109,7 @@ class ServeOrderRepository extends BaseRepository 'pay_type' => $data['pay_type'], 'attach' => 'meal', 'order_info' => json_encode($arr,JSON_UNESCAPED_UNICODE), - 'pay_price' => $ret['margin'], + 'pay_price' => $ret['recharge_margin'], ]; return compact('key', 'param'); From 55d8a5b1d07e5dcfa111035b613bd624b3962546 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 17:48:49 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/merchant/MerchantIntentionRepository.php | 6 ++---- .../repositories/system/serve/ServeOrderRepository.php | 4 ++-- app/controller/api/Auth.php | 8 ++++---- app/controller/api/store/merchant/Merchant.php | 2 +- app/listener/paySuccessMargin.php | 6 +++--- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php index beda1718..c4f5c0a6 100644 --- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php +++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php @@ -116,7 +116,7 @@ class MerchantIntentionRepository extends BaseRepository $margin = app()->make(MerchantTypeRepository::class)->get($intention['mer_type_id']); $data['is_margin'] = $margin['is_margin'] ?? -1; - $data['margin'] = 0; + $data['margin'] = $margin['margin'] ?? 0; $merData = []; if ($create) { $password = substr($intention['phone'], -6); @@ -138,9 +138,7 @@ class MerchantIntentionRepository extends BaseRepository 'mer_password' => $password, 'is_margin' => $margin['is_margin'] ?? -1, // 用户需缴纳保证金 - 'recharge_margin' => $margin['margin'] ?? 0, - // 用户已缴纳保证金 - 'margin' => 0, + 'margin' => $margin['margin'] ?? 0, 'uid' => $intention['uid'], 'reg_admin_id' => $autoCreate ? 0: request()->adminId(), 'mer_intention_id' => $id diff --git a/app/common/repositories/system/serve/ServeOrderRepository.php b/app/common/repositories/system/serve/ServeOrderRepository.php index dc0f14e2..be43a534 100644 --- a/app/common/repositories/system/serve/ServeOrderRepository.php +++ b/app/common/repositories/system/serve/ServeOrderRepository.php @@ -98,7 +98,7 @@ class ServeOrderRepository extends BaseRepository $arr = [ 'type_id' => $ret['type_id'], 'is_margin' => $ret['is_margin'], - 'margin' => $ret['recharge_margin'], + 'margin' => $ret['margin'], ]; $param = [ 'status' => 0, @@ -109,7 +109,7 @@ class ServeOrderRepository extends BaseRepository 'pay_type' => $data['pay_type'], 'attach' => 'meal', 'order_info' => json_encode($arr,JSON_UNESCAPED_UNICODE), - 'pay_price' => $ret['recharge_margin'], + 'pay_price' => $ret['margin'], ]; return compact('key', 'param'); diff --git a/app/controller/api/Auth.php b/app/controller/api/Auth.php index b25e2989..0f44370b 100644 --- a/app/controller/api/Auth.php +++ b/app/controller/api/Auth.php @@ -286,7 +286,7 @@ class Auth extends BaseController 'uid' => $user['uid'], 'mer_id' => $merchant['mer_id'], 'order_sn' => $orderSn, - 'total_price' => $merchant['recharge_margin'], + 'total_price' => $merchant['margin'], 'pay_type' => 1, 'create_time' => date('Y-m-d H:i:s') ]); @@ -296,10 +296,10 @@ class Auth extends BaseController "mer_id" => $merchant['mer_id'], "pay_type" => 1, "attach" => "margin", - "order_info" => '{"is_margin":1,"margin":"' . $merchant['recharge_margin'] . '"}', - "pay_price" => $merchant['recharge_margin'], + "order_info" => '{"is_margin":1,"margin":"' . $merchant['margin'] . '"}', + "pay_price" => $merchant['margin'], "order_sn" => $orderSn, - "body" => $merchant['mer_name'] . ' - ' . $merchant['recharge_margin'], + "body" => $merchant['mer_name'] . ' - ' . $merchant['margin'], ]; $payType = 'weixinApp'; $service = new PayService($payType, $param); diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index 2f4c188c..1539d9fd 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -264,7 +264,7 @@ class Merchant extends BaseController if(empty($id)){ 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); } diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php index 2124ea2f..535db236 100644 --- a/app/listener/paySuccessMargin.php +++ b/app/listener/paySuccessMargin.php @@ -26,11 +26,11 @@ class paySuccessMargin Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ 'margin' => $marginAmount ]); - $rechargeAmount = (float)$merchantInfo['recharge_margin'] - (float)$marginInfo['total_price']; + $paidAmount = (float)$merchantInfo['paid_margin'] - (float)$marginInfo['total_price']; Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ - 'recharge_margin' => $rechargeAmount + 'paid_margin' => $paidAmount ]); - if ($rechargeAmount <= 0) { + if ($paidAmount <= 0) { Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ 'is_margin' => 10 ]); From 41ae811e8adb958f4aa77ae2f78a1fcbde961963 Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Mon, 25 Sep 2023 17:50:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=9D=E8=AF=81?= =?UTF-8?q?=E9=87=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/listener/paySuccessMargin.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/listener/paySuccessMargin.php b/app/listener/paySuccessMargin.php index 535db236..1980fc0e 100644 --- a/app/listener/paySuccessMargin.php +++ b/app/listener/paySuccessMargin.php @@ -22,15 +22,15 @@ class paySuccessMargin '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(); - $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([ 'margin' => $marginAmount ]); - $paidAmount = (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' => $paidAmount - ]); - if ($paidAmount <= 0) { + if ($marginAmount <= 0) { Db::name('merchant')->where('mer_id', $marginInfo['mer_id'] ?? 0)->where('uid', $marginInfo['uid'] ?? 0)->update([ 'is_margin' => 10 ]);