From 6cedb3913ca3728cbdb088f7ec8ad39cac6c2fa4 Mon Sep 17 00:00:00 2001 From: weigang Date: Mon, 9 Nov 2020 11:56:28 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E5=8B=BF=E5=90=88=E5=B9=B6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 52e5f9942fc4e368465bde2b3476357db37e356e. --- app/Controller/v3/HomeController.php | 67 ---------------------------- 1 file changed, 67 deletions(-) diff --git a/app/Controller/v3/HomeController.php b/app/Controller/v3/HomeController.php index baa7960..03281c6 100644 --- a/app/Controller/v3/HomeController.php +++ b/app/Controller/v3/HomeController.php @@ -6,7 +6,6 @@ use App\Constants\v3\ActivityType; use App\Constants\v3\Banner; use App\Constants\v3\OrderState; use App\Constants\v3\OrderType; -use App\Constants\v3\Payment; use App\Constants\v3\SsdbKeys; use App\Constants\v3\Tabs; use App\Constants\v3\UserType; @@ -14,7 +13,6 @@ use App\Controller\BaseController; use App\Model\v3\FinancialRecord; use App\Model\v3\Market; use App\Model\v3\Store; -use App\Model\v3\User; use App\Request\v3\StoreIndexRequest; use App\Request\v3\UserIndexRequest; use App\Service\v3\Interfaces\ActivityServiceInterface; @@ -24,7 +22,6 @@ use App\Service\v3\Interfaces\CategoryServiceInterface; use App\Service\v3\Interfaces\CollectStoreServiceInterface; use App\Service\v3\Interfaces\CouponRecServiceInterface; use App\Service\v3\Interfaces\FinancialRecordServiceInterface; -use App\Service\v3\Interfaces\MiniprogramServiceInterface; use App\Service\v3\Interfaces\OrderOnlineServiceInterface; use App\Service\v3\Interfaces\OrderStatisticsServiceInterface; use App\Service\v3\Interfaces\RevenueListServiceInterface; @@ -124,12 +121,6 @@ class HomeController extends BaseController */ protected $financialRecordService; - /** - * @Inject - * @var MiniprogramServiceInterface - */ - protected $miniprogramService; - /** * 小程序首页,根据market_id * 1.banner数据 @@ -139,64 +130,6 @@ class HomeController extends BaseController */ public function appletIndex() { - - // 小程序订阅消息发给商户 - // 付款金额:{{amount1.DATA}}\n商户名称:{{thing2.DATA}}\n支付方式:{{thing3.DATA}}\n交易单号:{{character_string4.DATA}}\n交易时间:{{time5.DATA}}\n - $tmplId = 'PCRNmKGb7t98xsz_GPux3rhXjsu68TPI3nXR7749dC0'; - $page = 'pages/faceOrderList/faceOrderList?store_id=111'; - $res1 = $this->miniprogramService->sendSubscribeMessage( - 'ojbLs4sgoo1l6K8TQ_8HhUF6m_1s', - $tmplId, - [ - 'amount1' => rand(1,20), - 'thing2' => '测试发送'.date('H:i:s'), - 'thing3' => '微信支付', - 'character_string4' => date('YmdHis'), - 'time5' => $item['created_at_text']??date('Y-m-d H:i:s'), - ], - $page - ); - - // 小程序订阅消息发给商户 - // 订单编号:{{character_string7.DATA}}\n商品名称:{{thing10.DATA}}\n退款金额:{{amount3.DATA}}\n处理时间:{{date4.DATA}}\n退款说明:{{thing5.DATA}}\n - $tmplId = 'OaWeg0q40NVW2WeO5BY1TFdWi4GsgIY1rFBwo2wDa0g'; - $page = 'pages/shopOrders/shopOrders?status=refund&store_id=111'; - $res2 = $this->miniprogramService->sendSubscribeMessage( - 'ojbLs4sgoo1l6K8TQ_8HhUF6m_1s', - $tmplId, - [ - 'character_string7' => date('YmdHis'), - 'thing10' => '测试商品', - 'amount3' => '2.01', - 'date4' => date('Y-m-d H:i:s'), - 'thing5' => '退款', - ], - $page - ); - - // 小程序订阅消息发给商户 - // 支付金额:{{amount1.DATA}}\n订单编号:{{character_string2.DATA}}\n支付时间:{{date3.DATA}}\n商品详情:{{thing4.DATA}}\n备注:{{thing7.DATA}}\n - $tmplId = 'UfCON4Dj_7aH_Q5k_HvDgzUb3gu67TokPITsJuvCMxc'; - $page = 'pages/shopOrders/shopOrders?status=paid&store_id=111'; - $res3 = $this->miniprogramService->sendSubscribeMessage( - 'ojbLs4sgoo1l6K8TQ_8HhUF6m_1s', - $tmplId, - [ - 'amount1' => rand(1,20), - 'character_string2' => date('YmdHis'), - 'date3' => date('Y-m-d H:i:s'), - 'thing4' => '测试商品', - 'thing7' => '无备注', - ], - $page - ); - - return $this->success([ - 'res1' => $res1, - 'res2' => $res2, - 'res3' => $res3, - ]); - $marketId = $this->request->input('market_id', -1); $version = $this->request->input('version', -1); $banners = $this->bannerService->all(Banner::TYPE_APPLET_INDEX, $marketId);