From 5e34932dc39f9c303bd179ae56946747c5723fb5 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 8 May 2024 11:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/merchat/MerchantController.php | 8 +-- app/admin/lists/merchat/MerchantLists.php | 6 +- .../{merchat => merchant}/MerchantLogic.php | 6 +- app/admin/logic/retail/CashierclassLogic.php | 3 + .../MerchantValidate.php | 4 +- app/api/lists/merchant/MerchantLists.php | 2 +- app/api/logic/order/OrderLogic.php | 12 +++- app/api/service/WechatUserService.php | 2 +- app/common/cache/UserTokenCache.php | 2 +- .../model/{merchat => merchant}/Merchant.php | 4 +- app/common/service/wechat/WeChatOaService.php | 4 +- app/common/service/wechat/WechatTemplate.php | 66 +++++++++++++++++++ 12 files changed, 99 insertions(+), 20 deletions(-) rename app/admin/logic/{merchat => merchant}/MerchantLogic.php (97%) rename app/admin/validate/{merchat => merchant}/MerchantValidate.php (96%) rename app/common/model/{merchat => merchant}/Merchant.php (79%) create mode 100644 app/common/service/wechat/WechatTemplate.php diff --git a/app/admin/controller/merchat/MerchantController.php b/app/admin/controller/merchat/MerchantController.php index 958fa57..d555250 100644 --- a/app/admin/controller/merchat/MerchantController.php +++ b/app/admin/controller/merchat/MerchantController.php @@ -4,15 +4,15 @@ namespace app\admin\controller\merchat; use app\admin\controller\BaseAdminController; -use app\admin\lists\merchat\MerchantLists; -use app\admin\logic\merchat\MerchantLogic; -use app\admin\validate\merchat\MerchantValidate; +use app\admin\lists\merchant\MerchantLists; +use app\admin\logic\merchant\MerchantLogic; +use app\admin\validate\merchant\MerchantValidate; /** * 商户列表控制器 * Class MerchantController - * @package app\admin\controller\merchat + * @package app\admin\controller\merchant */ class MerchantController extends BaseAdminController { diff --git a/app/admin/lists/merchat/MerchantLists.php b/app/admin/lists/merchat/MerchantLists.php index d1b16a9..c7dfe3f 100644 --- a/app/admin/lists/merchat/MerchantLists.php +++ b/app/admin/lists/merchat/MerchantLists.php @@ -1,17 +1,17 @@ value('name'); }); + $find['merchant_info']=Merchant::where('mer_id',$find['merchant'])->field('mer_name,service_phone')->find(); + } return $find->toArray(); } diff --git a/app/admin/validate/merchat/MerchantValidate.php b/app/admin/validate/merchant/MerchantValidate.php similarity index 96% rename from app/admin/validate/merchat/MerchantValidate.php rename to app/admin/validate/merchant/MerchantValidate.php index 15c62ae..4029132 100644 --- a/app/admin/validate/merchat/MerchantValidate.php +++ b/app/admin/validate/merchant/MerchantValidate.php @@ -1,6 +1,6 @@ 0){ + $address=UserAddress::where(['id'=>$addressId,'uid'=>Request()->userId])->find(); + if($address){ + $_order['real_name'] = $address['real_name']; + $_order['user_phone'] = $address['phone']; + $_order['user_address'] = $address['detail']; + } + } $_order = $orderInfo['order']; $_order['deduction_price'] = 0; $_order['merchant'] = $params['mer_id']; diff --git a/app/api/service/WechatUserService.php b/app/api/service/WechatUserService.php index 3fe97ae..a9b765b 100644 --- a/app/api/service/WechatUserService.php +++ b/app/api/service/WechatUserService.php @@ -6,7 +6,7 @@ namespace app\api\service; use app\common\enum\YesNoEnum; use app\common\model\user\{User, UserAuth}; use app\common\enum\user\UserTerminalEnum; -use app\common\model\merchat\Merchant; +use app\common\model\merchant\Merchant; use app\common\model\supplier\Supplier; use app\common\service\{ConfigService, storage\Driver as StorageDriver}; use think\Exception; diff --git a/app/common/cache/UserTokenCache.php b/app/common/cache/UserTokenCache.php index bc7ee59..150fa44 100644 --- a/app/common/cache/UserTokenCache.php +++ b/app/common/cache/UserTokenCache.php @@ -15,7 +15,7 @@ namespace app\common\cache; -use app\common\model\merchat\Merchant; +use app\common\model\merchant\Merchant; use app\common\model\supplier\Supplier; use app\common\model\user\User; use app\common\model\user\UserSession; diff --git a/app/common/model/merchat/Merchant.php b/app/common/model/merchant/Merchant.php similarity index 79% rename from app/common/model/merchat/Merchant.php rename to app/common/model/merchant/Merchant.php index ac7cfb5..34af109 100644 --- a/app/common/model/merchat/Merchant.php +++ b/app/common/model/merchant/Merchant.php @@ -1,6 +1,6 @@ Client = (new WeChatOaService())->getClient(); + $this->Config = (new WeChatOaService())->config; + $this->token = (new WeChatOaService())->app->getAccessToken()->getToken(); + } + + /** + * @notes 新报价通知 + */ + public function NewQuotationNotification($data) + { + $template = [ + 'touser' => $data['openid'], + 'template_id' => 'hfvTch-DcP_UQ83VkD6Z-eMimeRrK8P8zpWC9j2dOKc', + 'miniprogram' => 'data', + 'appid' => $this->Config['app_id'], + 'pagepath' => 'pages/index/index', + 'data' => [ + 'thing2' => ['value' => $data['data1']], + 'time6' => ['value' => $data['data2']], + 'thing4' => ['value' => $data['data3']], + 'phone_number5' => ['value' => $data['data3']], + ] + ]; + return $this->post($template); + } + /** + * @notes 采用通知 + */ + public function AdoptingNotifications($data) + { + $template = [ + 'touser' => $data['openid'], + 'template_id' => 'hfvTch-DcP_UQ83VkD6Z-eMimeRrK8P8zpWC9j2dOKc', + 'miniprogram' => 'data', + 'appid' => $this->Config['app_id'], + 'pagepath' => 'pages/index/index', + 'data' => [ + 'thing2' => ['value' => $data['data1']], + 'thing3' => ['value' => $data['data2']], + 'const4' => ['value' => $data['data3']??08302669767], + ] + ]; + return $this->post($template); + } + protected function post($template) + { + $url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" . $this->token; + $res = $this->Client->postJson($url, $template)->toArray(); + if ($res['errmsg'] == 'ok' && $res['errcode'] == 0) { + return true; + } + throw new BusinessException($res['errmsg'], 3000); + } +} \ No newline at end of file