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 {
* @param expressNum 快递单号
* @return
*/
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum);
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
* 新定义订单发货通知,收件人为yoho用户（支持微信）
... ... @@ -203,7 +203,7 @@ public interface ISendOrderMessage {
* @param expressNum
* @return
*/
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum);
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
* 订单发货通知发至分仓（支持微信）
... ... @@ -214,7 +214,7 @@ public interface ISendOrderMessage {
* @param expressNum 快递单号
* @return
*/
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum);
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
* 订单发货通知发至分仓（支持微信）,收件人为yoho用户
... ... @@ -225,7 +225,7 @@ public interface ISendOrderMessage {
* @param expressNum
* @return
*/
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum);
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
* 订单取消（支持微信）
... ...
... ... @@ -212,23 +212,23 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
}
@Override
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum);
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate);
}
@Override
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum);
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate);
}
@Override
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum);
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate);
}
@Override
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum);
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate);
}
@Override
... ... @@ -284,12 +284,13 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
return new SendMessageRspBo(200, "SUCCESS");
}
private SendMessageRspBo dealOrderSendOut(String sendScene, String uid, String uName, String orderCode, String companyName, String expressNum) {
private SendMessageRspBo dealOrderSendOut(String sendScene, String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(sendScene, orderCode, uid);
messageCenterCommonEvent.putInParams("orderCode", orderCode);
messageCenterCommonEvent.putInParams("companyName", companyName);
messageCenterCommonEvent.putInParams("expressNum", expressNum);
messageCenterCommonEvent.putInParams("uName", uName);
messageCenterCommonEvent.putInParams("arriveDate", arriveDate);
messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
return new SendMessageRspBo(200, "SUCCESS");
... ...
... ... @@ -132,13 +132,13 @@ public class TestSendOrderMessage {
//订单已发货，有微信不短信
@Test
public void orderSendOutNew() {
sendOrderMessage.orderSendOutNew("14308456","用户","1764678584","圆通","123321456");
sendOrderMessage.orderSendOutNew("14308456","用户","1764678584","圆通","123321456","2017-05-04");
}
//订单已发货至分货舱，有微信不短信
@Test
public void orderSendOutWarehouse() {
sendOrderMessage.orderSendOutWarehouse("14308456","用户","1764678584","申通","4545454545");
sendOrderMessage.orderSendOutWarehouse("14308456","用户","1764678584","申通","4545454545","2017-05-04");
}
//订单取消。微信
... ...