Merge branch 'dx' into 'master'

支付宝二期，推广码1分钱买全部

See merge request rays/pcloud-common-parent!43

pcloud-common-core/src/main/java/com/pcloud/common/core/constant/MQTopicProducer.java

@@ -348,4 +348,9 @@ public class MQTopicProducer {
 	 * 商品创建
 	 */
 	public static final String PRODUCT_CREATE = "topic.productCreate";
+
+	/**
+	 * 代理商删除TOPIC
+	 */
+	public static final String DELETE_PROMOTER = "topic.deletePromoter";
 }

pcloud-common/src/main/java/com/pcloud/common/utils/SessionUtil.java

@@ -67,14 +67,15 @@ public abstract class SessionUtil {
 	public static final String ROLE_CODE = "roleCode";
 
 	/**
-	 * wechatUserId
+	 * 讲师ID
 	 */
-	public static final String WECHAT_USER_ID = "wechatUserId";
+	public static final String LECTURER_ID = "lecturerId";
+
 
 	/**
-	 * 讲师Id
+	 * wechatUserId
 	 */
-	public static final String LECTURER_ID = "lecturerId";
+	public static final String WECHAT_USER_ID = "wechatUserId";
 
 	/**
 	 * wechatUserId
@@ -82,6 +83,26 @@ public abstract class SessionUtil {
 	public static final String THIRD_TYPE = "thirdType";
 
 	/**
+	 * 代理商ID
+	 */
+	public static final String PROMOTER_ID = "promoterId";
+
+	/**
+	 * 代理商名称
+	 */
+	public static final String PROMOTER_NAME = "promoterName";
+
+	/**
+	 * 代理商电话
+	 */
+	public static final String PROMOTER_PHONE = "promoterPhone";
+
+	/**
+	 * 代理商创建时间
+	 */
+	public static final String PROMOTER_CREATE_TIME = "promoterCreateTime";
+
+	/**
 	 * 登录场景
 	 */
 	public static final String MERCHANT_MEMBER_ID = "merchantMemberId";