From 0f877ff6b6efd81263706e9fe30130be167cbcae Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Sat, 16 Mar 2024 11:09:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=AB=E7=A0=81=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/api/Demo.php | 15 +++++++ crmeb/services/WechatService.php | 9 +++- crmeb/services/easywechat/micropay/Client.php | 41 +++++++++++++++++++ .../easywechat/micropay/ServiceProvider.php | 33 +++++++++++++++ route/api.php | 1 + 5 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 app/controller/api/Demo.php create mode 100644 crmeb/services/easywechat/micropay/Client.php create mode 100644 crmeb/services/easywechat/micropay/ServiceProvider.php diff --git a/app/controller/api/Demo.php b/app/controller/api/Demo.php new file mode 100644 index 00000000..8a5c0fe2 --- /dev/null +++ b/app/controller/api/Demo.php @@ -0,0 +1,15 @@ +$name]; + $a=WechatService::create()->micropay()->scanCode($order); + halt($a); + } +} \ No newline at end of file diff --git a/crmeb/services/WechatService.php b/crmeb/services/WechatService.php index 70f648cf..34f0dccf 100644 --- a/crmeb/services/WechatService.php +++ b/crmeb/services/WechatService.php @@ -78,6 +78,7 @@ class WechatService $this->application->register(new \crmeb\services\easywechat\merchant\ServiceProvider); $this->application->register(new \crmeb\services\easywechat\combinePay\ServiceProvider); $this->application->register(new \crmeb\services\easywechat\pay\ServiceProvider); + $this->application->register(new \crmeb\services\easywechat\micropay\ServiceProvider); $this->application->register(new \crmeb\services\easywechat\batches\ServiceProvider); $this->application->register(new \crmeb\services\easywechat\wechatTemplate\ServiceProvider); } @@ -993,7 +994,13 @@ class WechatService return $this->application->combinePay; } - + /** + * @return easywechat\micropay\Client + */ + public function micropay() + { + return $this->application->micropay; + } /** * 获取模板列表 diff --git a/crmeb/services/easywechat/micropay/Client.php b/crmeb/services/easywechat/micropay/Client.php new file mode 100644 index 00000000..114f2fd7 --- /dev/null +++ b/crmeb/services/easywechat/micropay/Client.php @@ -0,0 +1,41 @@ + +// +---------------------------------------------------------------------- + + +namespace crmeb\services\easywechat\micropay; + + +use crmeb\services\easywechat\BaseClient; + +class Client extends BaseClient +{ + + + public function scanCode($order) + { + $content=[ + 'appid'=>$this->app['config']['app_id'], + 'mch_id'=>2, + 'device_info'=>3, + 'body'=>'线下支付', + 'attach'=>'测试数据', + 'out_trade_no'=>time(), + 'total_fee'=>1, + 'spbill_create_ip'=>request()->ip(), + 'auth_code'=>$order['auth_code'], + ]; + $content = json_encode($content); + $res= $this->request('/pay/micropay', 'POST', ['sign_body' => $content]); + return $res; + } + + +} diff --git a/crmeb/services/easywechat/micropay/ServiceProvider.php b/crmeb/services/easywechat/micropay/ServiceProvider.php new file mode 100644 index 00000000..137a72b4 --- /dev/null +++ b/crmeb/services/easywechat/micropay/ServiceProvider.php @@ -0,0 +1,33 @@ + + * + * This source file is subject to the MIT license that is bundled + * with this source code in the file LICENSE. + */ + + namespace crmeb\services\easywechat\micropay; + +use Pimple\Container; +use Pimple\ServiceProviderInterface; + +/** + * Class ServiceProvider. + * + * @author ClouderSky + */ +class ServiceProvider implements ServiceProviderInterface +{ + /** + * {@inheritdoc}. + */ + public function register(Container $pimple) + { + $pimple['micropay'] = function ($pimple) { + return new Client($pimple['access_token'], $pimple); + }; + } +} diff --git a/route/api.php b/route/api.php index 9d7d66b4..9b23097d 100644 --- a/route/api.php +++ b/route/api.php @@ -21,6 +21,7 @@ use think\facade\Route; Route::group('api/', function () { Route::any('test', 'api.Auth/test'); + Route::any('ceshi', 'api.Demo/ceshi'); Route::any('promote_writing', 'api.Common/promote_writing'); Route::any('applet', 'api.Common/applet'); Route::any('promote_writing', 'api.Common/promoteWriting'); From 0cc0ee8ea87a84fe353d807a2246a8b55f80083b Mon Sep 17 00:00:00 2001 From: liu <1873441552@qq.com> Date: Sat, 16 Mar 2024 11:10:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=AF=B9=E5=85=AC?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/order/StoreOrderRepository.php | 12 ++++++++++++ app/controller/api/store/order/StoreOrder.php | 8 ++++++++ route/api.php | 2 ++ 3 files changed, 22 insertions(+) diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 0219f7e8..d90da6e9 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2749,7 +2749,19 @@ class StoreOrderRepository extends BaseRepository } + public function dealVerify(string $img, int $id) + { + $data = StoreOrder::getDB()->where('order_id',$id)->find(); + if(empty($data)) return app('json')->fail('没有该订单'); + if(empty($data['order_extend']) && $data['pay_type'] != Enum::public) return app('json')->fail('该订单不是对公转账订单!'); + $old = $data['order_extend']; + $old['corporate_voucher'] = $img; + $new = json_encode($old, JSON_UNESCAPED_UNICODE); + $data->order_extend = $new; + $data->save(); + return true; + } } diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 99a2b950..af13d58c 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -324,5 +324,13 @@ class StoreOrder extends BaseController } + //更改数据-上传凭证 + public function upload_verify($id) + { + $img = $this->request->param('url'); + $this->repository->dealVerify($img,$id); + return app('json')->success('上传凭证成功'); + } + } diff --git a/route/api.php b/route/api.php index 9d7d66b4..dcf44ba2 100644 --- a/route/api.php +++ b/route/api.php @@ -74,6 +74,7 @@ Route::group('api/', function () { //订单 Route::any('order_mix', 'api.store.order.StoreOrder/getOrder');//商户获取商品 + Route::group('order', function () { Route::post('check', '/checkOrder'); Route::post('create', '/createOrder'); @@ -92,6 +93,7 @@ Route::group('api/', function () { Route::get('verify_code/:id', '/verifyCode'); Route::post('receipt/:id', '/createReceipt'); Route::get('delivery/:id', '/getOrderDelivery'); + Route::post('upload/:id', '/upload_verify'); })->prefix('api.store.order.StoreOrder'); // 预售