YOHOBUY / yoho-message-sdk · Commits

Go to a project

Authored by wangxin
Commit 6e12dde0aceb823307ddea8e9c7ddec43a050502 1 parent 07b4357a

方法增加预计到达时间参数

Inline Side-by-side
Showing 3 changed files with 16 additions and 15 deletions
@@ -192,7 +192,7 @@ public interface ISendOrderMessage { @@ -192,7 +192,7 @@ public interface ISendOrderMessage {
192 * @param expressNum 快递单号 192 * @param expressNum 快递单号
193 * @return 193 * @return
194 */ 194 */
195 - public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum); 195 + public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
196 196
197 /** 197 /**
198 * 新定义订单发货通知,收件人为yoho用户（支持微信） 198 * 新定义订单发货通知,收件人为yoho用户（支持微信）
@@ -203,7 +203,7 @@ public interface ISendOrderMessage { @@ -203,7 +203,7 @@ public interface ISendOrderMessage {
203 * @param expressNum 203 * @param expressNum
204 * @return 204 * @return
205 */ 205 */
206 - public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum); 206 + public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
207 207
208 /** 208 /**
209 * 订单发货通知发至分仓（支持微信） 209 * 订单发货通知发至分仓（支持微信）
@@ -214,7 +214,7 @@ public interface ISendOrderMessage { @@ -214,7 +214,7 @@ public interface ISendOrderMessage {
214 * @param expressNum 快递单号 214 * @param expressNum 快递单号
215 * @return 215 * @return
216 */ 216 */
217 - public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum); 217 + public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
218 218
219 /** 219 /**
220 * 订单发货通知发至分仓（支持微信）,收件人为yoho用户 220 * 订单发货通知发至分仓（支持微信）,收件人为yoho用户
@@ -225,7 +225,7 @@ public interface ISendOrderMessage { @@ -225,7 +225,7 @@ public interface ISendOrderMessage {
225 * @param expressNum 225 * @param expressNum
226 * @return 226 * @return
227 */ 227 */
228 - public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum); 228 + public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
229 229
230 /** 230 /**
231 * 订单取消（支持微信） 231 * 订单取消（支持微信）
@@ -212,23 +212,23 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -212,23 +212,23 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
212 } 212 }
213 213
214 @Override 214 @Override
215 - public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum) {  
216 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum); 215 + public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
  216 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate);
217 } 217 }
218 218
219 @Override 219 @Override
220 - public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum) {  
221 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum); 220 + public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
  221 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate);
222 } 222 }
223 223
224 @Override 224 @Override
225 - public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum) {  
226 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum); 225 + public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
  226 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate);
227 } 227 }
228 228
229 @Override 229 @Override
230 - public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum) {  
231 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum); 230 + public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
  231 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate);
232 } 232 }
233 233
234 @Override 234 @Override
@@ -284,12 +284,13 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -284,12 +284,13 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
284 return new SendMessageRspBo(200, "SUCCESS"); 284 return new SendMessageRspBo(200, "SUCCESS");
285 } 285 }
286 286
287 - private SendMessageRspBo dealOrderSendOut(String sendScene, String uid, String uName, String orderCode, String companyName, String expressNum) { 287 + private SendMessageRspBo dealOrderSendOut(String sendScene, String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
288 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(sendScene, orderCode, uid); 288 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(sendScene, orderCode, uid);
289 messageCenterCommonEvent.putInParams("orderCode", orderCode); 289 messageCenterCommonEvent.putInParams("orderCode", orderCode);
290 messageCenterCommonEvent.putInParams("companyName", companyName); 290 messageCenterCommonEvent.putInParams("companyName", companyName);
291 messageCenterCommonEvent.putInParams("expressNum", expressNum); 291 messageCenterCommonEvent.putInParams("expressNum", expressNum);
292 messageCenterCommonEvent.putInParams("uName", uName); 292 messageCenterCommonEvent.putInParams("uName", uName);
  293 + messageCenterCommonEvent.putInParams("arriveDate", arriveDate);
293 messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent); 294 messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
294 295
295 return new SendMessageRspBo(200, "SUCCESS"); 296 return new SendMessageRspBo(200, "SUCCESS");
@@ -132,13 +132,13 @@ public class TestSendOrderMessage { @@ -132,13 +132,13 @@ public class TestSendOrderMessage {
132 //订单已发货，有微信不短信 132 //订单已发货，有微信不短信
133 @Test 133 @Test
134 public void orderSendOutNew() { 134 public void orderSendOutNew() {
135 - sendOrderMessage.orderSendOutNew("14308456","用户","1764678584","圆通","123321456"); 135 + sendOrderMessage.orderSendOutNew("14308456","用户","1764678584","圆通","123321456","2017-05-04");
136 } 136 }
137 137
138 //订单已发货至分货舱，有微信不短信 138 //订单已发货至分货舱，有微信不短信
139 @Test 139 @Test
140 public void orderSendOutWarehouse() { 140 public void orderSendOutWarehouse() {
141 - sendOrderMessage.orderSendOutWarehouse("14308456","用户","1764678584","申通","4545454545"); 141 + sendOrderMessage.orderSendOutWarehouse("14308456","用户","1764678584","申通","4545454545","2017-05-04");
142 } 142 }
143 143
144 //订单取消。微信 144 //订单取消。微信