林琦海 пре 5 година
родитељ
комит
8876823d61
4 измењених фајлова са 52 додато и 36 уклоњено
  1. 10 14
      common/components/dict.php
  2. 17 10
      common/services/xhTMessageService.php
  3. 16 10
      console/controllers/InitController.php
  4. 9 2
      sql.sql

+ 10 - 14
common/components/dict.php

@@ -114,21 +114,17 @@ class dict
         ],
 
 
-        //模板消息
+        //模板消息 平台类型: 1花店,2供货商,3商城
         'tMessage' => [
-            'OPENTM207430125' => '操作成功通知',
-            'OPENTM401915538' => '审核通知',
-            'TM00006' => '充值通知',
-            'OPENTM201205968' => '订单送达通知',
-            'OPENTM207777535' => '付款提醒',
-            'OPENTM401761342' => '订单价格修改通知',
-            'OPENTM205211943' => '会员升级通知',
-            'TM00230' => '积分变动通知',
-            'OPENTM200605630' => '任务处理通知',
-            'OPENTM207422813' => '收入提醒',
-            'OPENTM202297555' => '下单成功通知',
-            'OPENTM207327227' => '宝贝售出提醒',
-            'OPENTM207188526' => '付款成功',
+           1=>[
+                'OPENTM418105100'=>'下单成功通知',
+           ],
+           2=>[
+               'OPENTM418105100'=>'下单成功通知',
+           ],
+           3=>[
+               'OPENTM418105100'=>'下单成功通知',
+           ],
         ],
 
         //用户来源

+ 17 - 10
common/services/xhTMessageService.php

@@ -10,7 +10,7 @@ use common\components\dict;
 
 class xhTMessageService
 {
-	
+
 	//取所有的模板消息
 	public static function getList($merchantId)
 	{
@@ -29,17 +29,17 @@ class xhTMessageService
 		$tm = xhTMessage::add($data);
 		return $tm;
 	}
-	
+
 	public static function batchAdd($data)
 	{
 		xhTMessage::batchAdd($data);
 	}
-	
+
 	public static function delByMerchantId($merchantId)
 	{
 		xhTMessage::deleteByCondition(['merchantId' => $merchantId]);
 	}
-	
+
 	public static function delTMessage($merchant)
 	{
 		$merchantId = $merchant['id'];
@@ -57,7 +57,7 @@ class xhTMessageService
 			self::delByMerchantId($merchantId);
 		}
 	}
-	
+
 	//商家模板初始化 ssh 2020.2.9
 	public static function init($merchant)
 	{
@@ -99,7 +99,7 @@ class xhTMessageService
 		}
 		xhMerchantExtendService::updateByMerchantId($merchantId, ['wxTMessageInit' => 1]);
 	}
-	
+
 	//发送到手机上 ssh 2019.8.11
 	public static function sendUrlToMobile($url, $openId, $merchant)
 	{
@@ -117,7 +117,7 @@ class xhTMessageService
 			wxUtil::sendTaskInform($data, $merchant);
 		}
 	}
-	
+
 	//发送链接到手机上
 	public static function sendUrl($url, $name = '访问链接', $merchant, $admin)
 	{
@@ -136,7 +136,7 @@ class xhTMessageService
 			wxUtil::sendTaskInform($data, $merchant);
 		}
 	}
-	
+
 	//补充缺失的模板 ssh 2020.2.9
 	public static function supplement($merchant, $isOpen)
 	{
@@ -172,5 +172,12 @@ class xhTMessageService
 			}
 		}
 	}
-	
-}
+
+	//初始化消息模板
+    public static function initTMessage()
+    {
+        $tMessageList = dict::getDict('tMessage');
+        
+    }
+
+}

+ 16 - 10
console/controllers/InitController.php

@@ -24,7 +24,7 @@ use common\services\xhInitService;
  */
 class InitController extends Controller
 {
-	
+
 	//开店初始化 ssh 2020.2.8
 	public function actionRabbit()
 	{
@@ -33,7 +33,7 @@ class InitController extends Controller
 		$msg = serialize($data);
 		$producer->publish($msg, 'openShopInitExchange', 'openShopInitRoute');
 	}
-	
+
 	//二次初始化 ssh 2020.1.19
 	public function actionSecondInit($id = 0)
 	{
@@ -44,12 +44,12 @@ class InitController extends Controller
 		//初始化微信菜单
 		xhWxMenuService::applyInit($merchant);
 	}
-	
+
 	public function actionChangeDb()
 	{
 		echo 'ok';
 	}
-	
+
 	//接入一个商家需要的操作 ssh 2019.9.7
 	//  yii init/join-one 12358 更新某个商家公众号
 	//  yii init/join-one 更新平台公众号
@@ -69,7 +69,8 @@ class InitController extends Controller
 		$r = xhTMessageService::supplement($merchant, $isOpen);
 		print_r($r);
 	}
-	
+
+
 	//yii init/sub
 	public function actionSub()
 	{
@@ -80,7 +81,7 @@ class InitController extends Controller
 			$a = 123;
 		});
 	}
-	
+
 	public function actionPub()
 	{
 		$name = 'redis_shi';
@@ -88,13 +89,13 @@ class InitController extends Controller
 		$redisPubSub = \Yii::$app->redisPubSub;
 		$redisPubSub->publish($name, $time);
 	}
-	
+
 	public function actionPullUser()
 	{
 		//拉取用户
 		$this->actionPullUser();
 	}
-	
+
 	// 拉取微信用户 ssh 2019.9.9
 	public function actionPullUser2()
 	{
@@ -110,5 +111,10 @@ class InitController extends Controller
 		$merchantId = 12362;
 		UserService::syncWxAllUser($merchantId);
 	}
-	
-}
+
+	//消息模板初始化 linqh ./yii init/t-message
+    public function actionTMessage()
+    {
+
+    }
+}

+ 9 - 2
sql.sql

@@ -39,7 +39,7 @@ nginx配置修改
 nginx.conf
 ```
 http {
- 
+
     client_max_body_size 50m; # 配置nginx上传文件最大限制,默认1m
 }
 ```
@@ -2483,4 +2483,11 @@ CREATE TABLE IF NOT EXISTS `xhShopCoupon` (
   `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间'
 ) COMMENT='门店优惠券,代金劵';
 ALTER TABLE xhGhsOrder ADD orderType TINYINT NOT NULL DEFAULT 1 COMMENT '1供货商开单生成 2零售采购生成' AFTER `orderSn`;
-ALTER TABLE xhPurchase ADD orderType TINYINT NOT NULL DEFAULT 1 COMMENT '1供货商开单生成 2零售采购生成' AFTER `orderSn`;
+ALTER TABLE xhPurchase ADD orderType TINYINT NOT NULL DEFAULT 1 COMMENT '1供货商开单生成 2零售采购生成' AFTER `orderSn`;
+
+
+-----linqh 2021.05-12
+ALTER TABLE `xhTMessage`
+CHANGE COLUMN `merchantId` `ptStyle`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '平台类型: 1花店,2供货商,3商城' AFTER `id`,
+DROP INDEX `merchantId`,
+ADD INDEX `idx_ptStyle` (`ptStyle`) ;