太阳码

app-hd/controllers/TestController.php

@@ -2,117 +2,23 @@
 
 namespace hd\controllers;
 
-use biz\sj\classes\SjClass;
-use biz\sj\services\MerchantService;
-use bizGhs\ws\services\WsService;
-use bizHd\message\classes\InformAdminClass;
-use bizHd\order\services\OrderService;
-use common\components\util;
-use common\components\wxUtil;
+use bizHd\wx\services\WxOpenService;
+use common\components\miniUtil;
 use Yii;
 
 class TestController extends BaseController
 {
 
-    public $guestAccess = ['inform', 'notice', 'order-query', 'add-order',];
+    public $guestAccess = ['invite',];
 
-    //新增订单
-    public function actionAddOrder()
+    public function actionInvite()
     {
-        $dada = Yii::getAlias("@vendor/dada/");
-        require_once $dada . 'api/addOrderApi.php';
-        require_once $dada . 'client/dadaRequestClient.php';
-        require_once $dada . 'client/dadaResponse.php';
-        require_once $dada . 'config/config.php';
-        require_once $dada . 'model/orderModel.php';
-
-        // isOnline 判断是否是测试环境，会有不同的域名等
-        $isOnline = false;
-        $sourceId = 1000000;
-        // 初始化一个config
-        $config = new \Config($sourceId, $isOnline);
-
-        $orderModel = new \OrderModel();
-        $orderModel->setShopNo('11047059');
-        $orderModel->setOriginId('2018091100000002');
-        $orderModel->setCityCode('021');
-        $orderModel->setCargoPrice(10);
-        $orderModel->setIsPrepay(0);
-        $orderModel->setReceiverName('测试达达');
-        $orderModel->setReceiverAddress('上海市崇明岛');
-        $orderModel->setReceiverLat(31.63);
-        $orderModel->setReceiverLng(121.41);
-        $orderModel->setReceiverPhone('18588888888');
-        $orderModel->setCallback('http://api.b.huaml.com/data/request');
-
-        // api主要有2个参数，一个是url， 一个是业务参数
-        $addOrderApi = new \AddOrderApi(json_encode($orderModel));
-
-        $dada_client = new \DadaRequestClient($config, $addOrderApi);
-        $resp = $dada_client->makeRequest();
-        echo json_encode($resp);
-    }
-
-    //订单详情查询
-    public function actionOrderQuery()
-    {
-        $dada = Yii::getAlias("@vendor/dada/");
-        require_once $dada . 'api/OrderQueryApi.php';
-        require_once $dada . 'client/dadaRequestClient.php';
-        require_once $dada . 'client/dadaResponse.php';
-        require_once $dada . 'config/config.php';
-        require_once $dada . 'model/orderModel.php';
-
-        // isOnline 判断是否是测试环境，会有不同的域名等
-        $isOnline = false;
-        $sourceId = 1000000;
-        // 初始化一个config
-        $config = new \Config($sourceId, $isOnline);
-
-        $orderModel = new \OrderModel();
-        $orderModel->setOrderId('2018091100000002');
-
-        // api主要有2个参数，一个是url， 一个是业务参数
-        $addOrderApi = new \OrderQueryApi(json_encode($orderModel));
-
-        $dada_client = new \DadaRequestClient($config, $addOrderApi);
-        $resp = $dada_client->makeRequest();
-        echo json_encode($resp);
+        $merchant = WxOpenService::getWxInfo();
+        $page = 'pagesClient/official/index';
+        $isOpen = 2;
+        $scene = 'hdShopAdminId=125886';
+        $imgUrl = miniUtil::generateUnlimitedMiniCode($merchant, $page, $scene, $isOpen);
+        echo "<img src='{$imgUrl}' />";
     }
 
-    public function actionFocus()
-    {
-        $name = '花卉宝';
-        if (getenv('YII_ENV') == 'dev') {
-            $name = '花美灵';
-        }
-        $merchant = MerchantService::getByCondition(['name' => $name]);
-        $list = wxUtil::getSubscribeUserList($merchant);
-        dd($list);
-    }
-
-    //宝贝售出提醒 ssh 2020.1.30
-    public function actionInform()
-    {
-        $merchant = MerchantService::getMerchantById(12362);
-        $order = OrderService::getById(214810);
-        InformAdminClass::sendComplete($order);
-    }
-
-    public function actionNotice()
-    {
-        $data = ['messageType' => 'inform', 'informWay' => 'wx', 'userType' => 'admin', 'id' => 6, 'mobile' => '15280215347'];
-        $producer = Yii::$app->rabbitmq->getProducer('informProducer');
-        echo '<pre>';
-        print_r($data);
-        $msg = serialize($data);
-        $r = $producer->publish($msg, 'informExchange', 'informRoute');
-    }
-
-    //模拟推送订单通知
-    public function actionSendOrder()
-    {
-        WsService::newOrderNotice($this->shopAdminId);
-        util::complete($this->shopAdminId);
-    }
-}
+}

biz-mall/admin/services/ShopAdminService.php

@@ -65,7 +65,7 @@ class ShopAdminService extends BaseService
             util::fail('没有找到管理员信息');
         }
         if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-            util::fail("请关注公众号（{$admin['id']}）");
+            //util::fail("请关注公众号（{$admin['id']}）");
         }
         $roleId = $bindData['roleId'];
         $remind = isset($bindData['remind']) ? $bindData['remind'] : 0;

biz/shop/services/ShopAdminService.php

@@ -65,7 +65,7 @@ class ShopAdminService extends BaseService
             util::fail('没有找到管理员信息');
         }
         if (isset($admin['subscribe']) == false || $admin['subscribe'] != 1) {
-            util::fail("请关注公众号（{$admin['id']}）");
+            //util::fail("请关注公众号（{$admin['id']}）");
         }
         $roleId = $bindData['roleId'];
         $remind = isset($bindData['remind']) ? $bindData['remind'] : 0;

common/components/miniUtil.php

@@ -1560,11 +1560,11 @@ class miniUtil
         return $behind . $fileName;
     }
 
-    //小程序码生成，数量不限 ssh 2020.4.17
+    //小程序码生成，永久有效，数量暂无限制 ssh 2020.4.17
     public static function generateUnlimitedMiniCode($merchant, $page, $scene = '', $isOpen = 0)
     {
         $id = isset($merchant['id']) ? $merchant['id'] : 0;
-        $fileName = stringUtil::shortUniqueId($id) . '.jpg';
+        $fileName = md5($page . '_' . $scene) . '.jpg';
         $behind = 'retail/mimiCode/' . date("Ym") . '/' . date("d") . '/' . $id . '/';
         $filePath = dirUtil::getImgDir() . $behind;
         if (!file_exists($filePath)) {
@@ -1583,7 +1583,6 @@ class miniUtil
         }
         $data["scene"] = $scene;
         $result = $curl->setOption(CURLOPT_POSTFIELDS, Json::encode($data))->post($url);
-
         Yii::info('获取小程序图片资源:' . json_encode($result));
         file_put_contents($file, $result);
         //上传oss