Authored by tanling

sdk

@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <groupId>com.yoho.dsf</groupId> 16 <groupId>com.yoho.dsf</groupId>
17 <artifactId>yoho-message-sdk</artifactId> 17 <artifactId>yoho-message-sdk</artifactId>
18 <name>yoho-message-sdk</name> 18 <name>yoho-message-sdk</name>
19 - <version>1.0.0-SNAPSHOT</version> 19 + <version>1.0.1-SNAPSHOT</version>
20 <packaging>jar</packaging> 20 <packaging>jar</packaging>
21 21
22 <dependencies> 22 <dependencies>
@@ -17,7 +17,7 @@ public interface IOfflineShopMessage { @@ -17,7 +17,7 @@ public interface IOfflineShopMessage {
17 * 17 *
18 * @return 18 * @return
19 */ 19 */
20 - SendMessageRspBo reserveRemindForAllFans(String activityName, int startTime, int endTime, boolean isAB, String miniPatharam); 20 + SendMessageRspBo reserveRemindForAllFans(String activityName, int startTime, int endTime, boolean isAB, String miniPathParam);
21 21
22 22
23 /** 23 /**
@@ -34,14 +34,14 @@ public interface IOfflineShopMessage { @@ -34,14 +34,14 @@ public interface IOfflineShopMessage {
34 34
35 /** 35 /**
36 * 排队成功通知 36 * 排队成功通知
37 - * @param uids 37 + * @param uid
38 * @param activityName 活动名称 38 * @param activityName 活动名称
39 * @param queueTimeStr 排队时间 39 * @param queueTimeStr 排队时间
40 * @param registerMobile 注册号码 40 * @param registerMobile 注册号码
41 * @param activityId 用于小程序跳转 41 * @param activityId 用于小程序跳转
42 * @return 42 * @return
43 */ 43 */
44 - SendMessageRspBo queueSuccess(List<String> uids, String activityName, String queueTimeStr, String registerMobile, String activityId); 44 + SendMessageRspBo queueSuccess(String uid, String activityName, String queueTimeStr, String registerMobile, String activityId);
45 45
46 46
47 /** 47 /**
@@ -53,7 +53,7 @@ public interface IOfflineShopMessage { @@ -53,7 +53,7 @@ public interface IOfflineShopMessage {
53 * @param expireTime 过期时间 53 * @param expireTime 过期时间
54 * @return 54 * @return
55 */ 55 */
56 - SendMessageRspBo serviceDue(String uid, String brandName, int expireCouponNum, String couponName, int expireTime); 56 + SendMessageRspBo serviceDue(String uid, String brandName, int expireCouponNum, String couponName, String expireTime);
57 57
58 58
59 59
@@ -75,17 +75,17 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl @@ -75,17 +75,17 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl
75 75
76 /** 76 /**
77 * 排队成功通知 77 * 排队成功通知
78 - * @param uids 78 + * @param uid
79 * @param activityName 79 * @param activityName
80 * @param queueTimeStr 80 * @param queueTimeStr
81 * @param registerMobile 81 * @param registerMobile
82 * @param activityId 82 * @param activityId
83 * @return 83 * @return
84 */ 84 */
85 - public SendMessageRspBo queueSuccess(List<String> uids, String activityName, String queueTimeStr, String registerMobile, String activityId) { 85 + public SendMessageRspBo queueSuccess(String uid, String activityName, String queueTimeStr, String registerMobile, String activityId) {
86 // 指定线下店小程序 86 // 指定线下店小程序
87 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(OfflineShopScenes.LIMIT_QUEUE_SUCCESS, 87 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(OfflineShopScenes.LIMIT_QUEUE_SUCCESS,
88 - String.valueOf(System.currentTimeMillis()), PublicNumberConstants.OFF_SHOP_MINIPROGRAM, uids); 88 + String.valueOf(System.currentTimeMillis()), PublicNumberConstants.OFF_SHOP_MINIPROGRAM, uid);
89 89
90 messageCenterCommonEvent.putInParams("activityName", activityName); 90 messageCenterCommonEvent.putInParams("activityName", activityName);
91 messageCenterCommonEvent.putInParams("queueTimeStr", queueTimeStr); 91 messageCenterCommonEvent.putInParams("queueTimeStr", queueTimeStr);
@@ -106,7 +106,7 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl @@ -106,7 +106,7 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl
106 * @return 106 * @return
107 */ 107 */
108 @Override 108 @Override
109 - public SendMessageRspBo serviceDue(String uids, String brandName, int expireCouponNum, String couponName, int expireTime) { 109 + public SendMessageRspBo serviceDue(String uids, String brandName, int expireCouponNum, String couponName, String expireTime) {
110 // 指定线下店公众号 110 // 指定线下店公众号
111 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(OfflineShopScenes.COUPON_SERVICE_DUE, 111 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEventPublicCode(OfflineShopScenes.COUPON_SERVICE_DUE,
112 String.valueOf(System.currentTimeMillis()), PublicNumberConstants.OFF_SHOP_SERVICE, uids); 112 String.valueOf(System.currentTimeMillis()), PublicNumberConstants.OFF_SHOP_SERVICE, uids);
@@ -114,7 +114,7 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl @@ -114,7 +114,7 @@ public class OfflineShopMessageImpl extends AbstractSendMessage implements IOffl
114 messageCenterCommonEvent.putInParams("expireCouponNum", expireCouponNum); 114 messageCenterCommonEvent.putInParams("expireCouponNum", expireCouponNum);
115 messageCenterCommonEvent.putInParams("brandName", brandName); 115 messageCenterCommonEvent.putInParams("brandName", brandName);
116 messageCenterCommonEvent.putInParams("couponName", couponName); 116 messageCenterCommonEvent.putInParams("couponName", couponName);
117 - messageCenterCommonEvent.putInParams("expireTime", DateUtils.long2DateStr(expireTime * 1000l, DateUtils.dateFormat)); 117 + messageCenterCommonEvent.putInParams("expireTime", expireTime);
118 118
119 messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent); 119 messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
120 return new SendMessageRspBo(200, "SUCCESS"); 120 return new SendMessageRspBo(200, "SUCCESS");
@@ -25,7 +25,7 @@ public class TestUserMessage { @@ -25,7 +25,7 @@ public class TestUserMessage {
25 */ 25 */
26 @Test 26 @Test
27 public void reserveRemineForAllFans() { 27 public void reserveRemineForAllFans() {
28 -// offlineShopMessage.reserveRemindForAllFans("线下店王大锤测试活动", 1517905629, 1517905629, "有货", "pages/index/index"); 28 + offlineShopMessage.reserveRemindForAllFans("线下店王大锤测试活动", 1517905629, 1517905629, true, "123");
29 } 29 }
30 30
31 31