新增有赚模板推送

@@ -14,11 +14,12 @@
 	 2、添加注册成功、升/降级模板，退款提醒增加小程序模板 2018-08-22 ADD BY LM 版本 1.0.1
 	 3、线下店小程序消息中心 2018-09-04 ADD BY XINFEI 1.0.2
 	 4、线下店潮流课堂预约、开课模板 2018-09-10 ADD BY LM 1.0.3
+	 5、有货有赚服务号消息模板 2018-09-21 ADD BY LM 1.0.4
 	-->
 	<groupId>com.yoho.dsf</groupId>
 	<artifactId>yoho-message-sdk</artifactId>
 	<name>yoho-message-sdk</name>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.4-SNAPSHOT</version>
     <packaging>jar</packaging>
 
 	<dependencies>

@@ -25,6 +25,11 @@ public class PublicNumberConstants {
     public static final int YOHO_BUY_SERVICE = 2;
 
 
+    /**
+     * 有赚 公众号
+     */
+    public static final int YOUZHUAN_SERVICE = 7;
+
     public static final String ALL_FANS = "all";
 
     /**

@@ -10,13 +10,16 @@ package com.yoho.message.sdk.common.constants;
  **/
 public class YouZhuanScenes {
 
+    //申请通过提醒
+    public static final String YZ_JOIN_SUCCESS = "YZ_JOIN_SUCCESS";
+
+    //预估佣金提醒
+    public static final String ESTIMATE_SETTLE = "YZ_ESTIMATE_SETTLE";
+
     //有货有赚项目  佣金结算提醒
-    public static final String YOZHUAN_COMMISSION_SETTLEMENT = "YOZHUAN_COMMISSION_SETTLEMENT";
+    public static final String YOZHUAN_COMMISSION_SETTLEMENT = "YZ_COMMISSION_SETTLE";
 
     //有货有赚项目  提现打款提醒
-    public static final String YOZHUAN_CRASH_ACCOUNT = "YOZHUAN_CRASH_ACCOUNT";
-
-    //有货有赚项目  订单任务完成提醒
-    public static final String YOZHUAN_ORDER_COMPLETE = "YOZHUAN_ORDER_COMPLETE";
+    public static final String YOZHUAN_CRASH_ACCOUNT = "YZ_CRASH_ACCOUNT";
 
 }

@@ -7,35 +7,46 @@ import com.yoho.message.sdk.common.model.SendMessageRspBo;
  */
 public interface ISendProductMessage {
 
+    /**
+     * 有货有赚项目  申请成功提醒
+     *
+     * @param uid
+     * @param passTime 通过时间
+     *
+     * @return 返回成功标志
+     */
+    SendMessageRspBo joinSuccessNotice(String uid, String passTime);
+
 
     /**
-     * 有货有赚项目  佣金结算提醒
+     * 有货有赚项目  预估佣金提醒
      *
      * @param uid
-     * @param CommissionAmount 佣金总金额
-     * @param moneyArriveTime 结算到账时间
+     * @param orderAmount 佣金总金额
+     * @param nowTime 当前时间
      * @return 返回成功标志
      */
-    SendMessageRspBo commissionNotice(String uid, String CommissionAmount, String moneyArriveTime);
+    SendMessageRspBo estimateNotice(String uid, String orderAmount, String nowTime);
 
     /**
-     * 有货有赚项目  提现打款提醒
+     * 有货有赚项目  佣金结算提醒
      *
-     * @param uid 接收用户UID
-     * @param totalAmount 打款总金额
-     * @param moneyArriveTime 打款到账时间
+     * @param uid
+     * @param orderAmount 变为可结算状态的预估佣金
+     * @param crashTime 可提现时间
      * @return 返回成功标志
      */
-    SendMessageRspBo cashAccountNotice(String uid, String totalAmount, String moneyArriveTime);
+    SendMessageRspBo commissionNotice(String uid, String orderAmount, String crashTime);
 
     /**
-     * 有货有赚项目  订单任务完成提醒
+     * 有货有赚项目  提现打款提醒
      *
      * @param uid 接收用户UID
-     * @param activeName 活动名称
-     * @param activeCommission 获得奖励预估收入金额
-     * @param activeEndTime 活动结束时间
+     * @param orderAmount  打款总金额
+     * @param crashTime 打款时间
      * @return 返回成功标志
      */
-    SendMessageRspBo orderCompletedNotice(String uid, String activeName, String activeCommission, String activeEndTime);
+    SendMessageRspBo cashAccountNotice(String uid, String orderAmount, String crashTime);
+
+
 }

 package com.yoho.message.sdk.service.product;
 
-import com.yoho.message.sdk.common.constants.SendScenes;
+import com.yoho.message.sdk.common.constants.PublicNumberConstants;
 import com.yoho.message.sdk.common.constants.YouZhuanScenes;
 import com.yoho.message.sdk.common.handler.MessageCenterMqHandler;
 import com.yoho.message.sdk.common.model.MessageCenterCommonEvent;
@@ -23,55 +23,70 @@ public class SendProductMessageImpl extends AbstractSendMessage implements ISend
     private MessageCenterMqHandler messageCenterMqHandler;
 
     /**
-     * 有货有赚项目  佣金结算提醒
+     * 有货有赚项目  申请成功提醒
+     *
+     * @param uid
+     * @param passTime 通过时间
      *
-     * @param uid 接收用户UID
-     * @param CommissionAmount 佣金总金额
-     * @param moneyArriveTime 结算到账时间
      * @return 返回成功标志
      */
     @Override
-    public SendMessageRspBo commissionNotice(String uid, String CommissionAmount, String moneyArriveTime) {
-        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(YouZhuanScenes.YOZHUAN_COMMISSION_SETTLEMENT, uid, uid);
-        messageCenterCommonEvent.putInParams("CommissionAmount", CommissionAmount);
-        messageCenterCommonEvent.putInParams("moneyArriveTime", moneyArriveTime);
+    public SendMessageRspBo joinSuccessNotice(String uid, String passTime){
+        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(YouZhuanScenes.YZ_JOIN_SUCCESS, uid, PublicNumberConstants.YOUZHUAN_SERVICE, uid);
+        messageCenterCommonEvent.putInParams("passTime", passTime);
         messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
         return new SendMessageRspBo(200, "SUCCESS");
     }
 
     /**
-     * 有货有赚项目  提现打款提醒
+     * 有货有赚项目  预估佣金提醒
      *
-     * @param uid 接收用户UID
-     * @param totalAmount 打款总金额
-     * @param moneyArriveTime 打款到账时间
+     * @param uid
+     * @param orderAmount 佣金总金额
+     * @param nowTime 当前时间
      * @return 返回成功标志
      */
     @Override
-    public SendMessageRspBo cashAccountNotice(String uid, String totalAmount, String moneyArriveTime) {
-        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(YouZhuanScenes.YOZHUAN_CRASH_ACCOUNT, uid, uid);
-        messageCenterCommonEvent.putInParams("totalAmount", totalAmount);
-        messageCenterCommonEvent.putInParams("moneyArriveTime", moneyArriveTime);
+    public SendMessageRspBo estimateNotice(String uid, String orderAmount, String nowTime){
+        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(YouZhuanScenes.ESTIMATE_SETTLE, uid, PublicNumberConstants.YOUZHUAN_SERVICE, uid);
+        messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
+        messageCenterCommonEvent.putInParams("nowTime", nowTime);
         messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
         return new SendMessageRspBo(200, "SUCCESS");
     }
 
     /**
-     * 有货有赚项目  订单任务完成提醒
+     * 有货有赚项目  佣金结算提醒
+     *
+     * @param uid
+     * @param orderAmount 变为可结算状态的预估佣金
+     * @param crashTime 可提现时间
+     * @return 返回成功标志
+     */
+    @Override
+    public SendMessageRspBo commissionNotice(String uid, String orderAmount, String crashTime) {
+        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(YouZhuanScenes.YOZHUAN_COMMISSION_SETTLEMENT, uid, PublicNumberConstants.YOUZHUAN_SERVICE, uid);
+        messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
+        messageCenterCommonEvent.putInParams("crashTime", crashTime);
+        messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
+        return new SendMessageRspBo(200, "SUCCESS");
+    }
+
+    /**
+     * 有货有赚项目  提现打款提醒
      *
      * @param uid 接收用户UID
-     * @param activeName 活动名称
-     * @param activeCommission 获得奖励预估收入金额
-     * @param activeEndTime 活动结束时间
+     * @param orderAmount 打款总金额
+     * @param crashTime 打款时间
      * @return 返回成功标志
      */
     @Override
-    public SendMessageRspBo orderCompletedNotice(String uid, String activeName, String activeCommission, String activeEndTime) {
-        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(YouZhuanScenes.YOZHUAN_ORDER_COMPLETE, uid, uid);
-        messageCenterCommonEvent.putInParams("activeName", activeName);
-        messageCenterCommonEvent.putInParams("activeCommission", activeCommission);
-        messageCenterCommonEvent.putInParams("activeEndTime", activeEndTime);
+    public SendMessageRspBo cashAccountNotice(String uid, String orderAmount, String crashTime) {
+        MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(YouZhuanScenes.YOZHUAN_CRASH_ACCOUNT, uid, PublicNumberConstants.YOUZHUAN_SERVICE,uid);
+        messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
+        messageCenterCommonEvent.putInParams("crashTime", crashTime);
         messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
         return new SendMessageRspBo(200, "SUCCESS");
     }
+
 }

+package com.yoho.message.sdk.test;
+
+import com.yoho.message.sdk.service.product.ISendProductMessage;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * Created by yoho on 2017/6/27.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(locations = { "classpath*:META-INF/spring/test-message-sdk-*.xml" })
+public class TestProductMessage {
+
+
+    @Autowired
+    ISendProductMessage sendProductMessage;
+
+
+    @Test
+    public void joinSuccessNotice() {
+        sendProductMessage.joinSuccessNotice("500031566", "2018-09-21");
+    }
+
+
+    @Test
+    public void estimateNotice() {
+        sendProductMessage.estimateNotice("500031566", "120.00", "2018-09-21");
+    }
+
+    @Test
+    public void commissionNotice() {
+        sendProductMessage.commissionNotice("500031566", "120.00", "2018-09-21");
+    }
+
+
+    @Test
+    public void cashAccountNotice() {
+        sendProductMessage.cashAccountNotice("500031566", "120.00", "2018-09-21");
+    }
+
+}