YOHOBUY / yoho-message-sdk · Commits

Go to a project

Authored by YOHO01\x.wang
Commit 46201bd526b89e14040f5f6fd7c36f978d504736 1 parent 52b76829

增加上门换货等场景支持

Inline Side-by-side
Showing 5 changed files with 116 additions and 22 deletions
... ... @@ -65,4 +65,10 @@ public class SendScenes {
public static final String CHANGE_GOODS_VERIFY_PASS = "CHANGE_GOODS_VERIFY_PASS";
//退款成功
public static final String REFUND_SUCCESS = "REFUND_SUCCESS";
//上门换货审核通过
public static final String HOME_CHANGE_VERIFY_PASS = "HOME_CHANGE_VERIFY_PASS";
//退货商品未寄回
public static final String RETRUN_NOT_SEND_BACK = "RETRUN_NOT_SEND_BACK";
//换货商品未寄回
public static final String CHANGE_NOT_SEND_BACK = "CHANGE_NOT_SEND_BACK";
}
... ...
... ... @@ -30,6 +30,7 @@ public interface ISendOrderMessage {
* @type 1:退货 2:换货
* @return
*/
@Deprecated
public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode, int id, int type);
/**
... ... @@ -44,6 +45,7 @@ public interface ISendOrderMessage {
* @param type
* @return <br>
*/
@Deprecated
public SendMessageRspBo exchangeGoodsVerifyPassSms(String mobile, String orderCode, String uName, int type);
/**
... ... @@ -58,6 +60,7 @@ public interface ISendOrderMessage {
* @param type
* @return <br>
*/
@Deprecated
public SendMessageRspBo exchangeGoodsVerifyPassPush(String uid, String uName, String orderCode, int id, int type);
/**
... ... @@ -70,6 +73,7 @@ public interface ISendOrderMessage {
* 支付渠道
* @return
*/
@Deprecated
public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType, int refundId);
/**
... ... @@ -82,6 +86,7 @@ public interface ISendOrderMessage {
* 物流单号
* @return
*/
@Deprecated
public SendMessageRspBo orderSendOut(String uid, String orderCode, String companyName, String expressNum);
/**
... ... @@ -98,6 +103,7 @@ public interface ISendOrderMessage {
* @param arriveDate
* @return <br>
*/
@Deprecated
public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
... ... @@ -110,6 +116,7 @@ public interface ISendOrderMessage {
* @param orderCode
* @return <br>
*/
@Deprecated
public SendMessageRspBo orderSendOutPush(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
... ... @@ -126,6 +133,7 @@ public interface ISendOrderMessage {
* @param arriveDate
* @return <br>
*/
@Deprecated
public SendMessageRspBo orderSendOutSms(String mobile, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
... ... @@ -138,6 +146,7 @@ public interface ISendOrderMessage {
* @param orderCode
* @return <br>
*/
@Deprecated
public SendMessageRspBo orderAllocateSendOutPush(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
... ... @@ -154,6 +163,7 @@ public interface ISendOrderMessage {
* @param arriveDate
* @return <br>
*/
@Deprecated
public SendMessageRspBo orderAllocateSendOutSms(String mobile, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
/**
... ... @@ -181,6 +191,7 @@ public interface ISendOrderMessage {
* @param orderCode
* @return <br>
*/
@Deprecated
public SendMessageRspBo exchangeRefundCancel(String uid, String uName, String orderCode);
/**
... ... @@ -276,4 +287,47 @@ public interface ISendOrderMessage {
*/
public SendMessageRspBo refundSuccess(String uid, String orderCode, String productName, String orderAmount, String payType, String refundTime, int refundId);
/**
* 上门换货审核通过
* @param uid
* @param uName
* @param orderCode
* @param orderStatus
* @param productName
* @param productNum
* @param orderAmount
* @param busId
* @return
*/
public SendMessageRspBo homeChangeVerifyPass(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId);
/**
* 退货未寄回
* @param uid
* @param uName
* @param orderCode
* @param orderStatus
* @param productName
* @param productNum
* @param orderAmount
* @param busId
* @return
*/
public SendMessageRspBo returnNotSendBack(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId);
/**
* 换货未寄回
* @param uid
* @param uName
* @param orderCode
* @param orderStatus
* @param productName
* @param productNum
* @param orderAmount
* @param busId
* @return
*/
public SendMessageRspBo changeNotSendBack(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId);
}
... ...
... ... @@ -245,22 +245,31 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
@Override
public SendMessageRspBo returnGoodsVerifyPass(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.RETURN_GOODS_VERIFY_PASS, orderCode, uid);
return this.dealOrderReturnOrChange(SendScenes.RETURN_GOODS_VERIFY_PASS, uid, uName, orderCode, orderStatus, productName, productNum, orderAmount, busId);
}
@Override
public SendMessageRspBo changeGoodsVerifyPass(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
return this.dealOrderReturnOrChange(SendScenes.CHANGE_GOODS_VERIFY_PASS, uid, uName, orderCode, orderStatus, productName, productNum, orderAmount, busId);
}
@Override
public SendMessageRspBo refundSuccess(String uid, String orderCode, String productName, String orderAmount, String payType, String refundTime, int refundId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_SUCCESS, orderCode, uid);
messageCenterCommonEvent.putInParams("orderCode", orderCode);
messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
messageCenterCommonEvent.putInParams("orderStatus", orderStatus);
messageCenterCommonEvent.putInParams("payType", payType);
messageCenterCommonEvent.putInParams("productName", productName);
messageCenterCommonEvent.putInParams("productNum", productNum);
messageCenterCommonEvent.putInParams("uName", uName);
messageCenterCommonEvent.putInParams("busId", busId);
messageCenterCommonEvent.putInParams("refundTime", refundTime);
messageCenterCommonEvent.putInParams("refundId", refundId);
messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
return new SendMessageRspBo(200, "SUCCESS");
}
@Override
public SendMessageRspBo changeGoodsVerifyPass(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.CHANGE_GOODS_VERIFY_PASS, orderCode, uid);
public SendMessageRspBo homeChangeVerifyPass(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.HOME_CHANGE_VERIFY_PASS, orderCode, uid);
messageCenterCommonEvent.putInParams("orderCode", orderCode);
messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
messageCenterCommonEvent.putInParams("orderStatus", orderStatus);
... ... @@ -274,17 +283,13 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
}
@Override
public SendMessageRspBo refundSuccess(String uid, String orderCode, String productName, String orderAmount, String payType, String refundTime, int refundId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_SUCCESS, orderCode, uid);
messageCenterCommonEvent.putInParams("orderCode", orderCode);
messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
messageCenterCommonEvent.putInParams("payType", payType);
messageCenterCommonEvent.putInParams("productName", productName);
messageCenterCommonEvent.putInParams("refundTime", refundTime);
messageCenterCommonEvent.putInParams("refundId", refundId);
messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
public SendMessageRspBo returnNotSendBack(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
return this.dealOrderReturnOrChange(SendScenes.RETRUN_NOT_SEND_BACK, uid, uName, orderCode, orderStatus, productName, productNum, orderAmount, busId);
}
return new SendMessageRspBo(200, "SUCCESS");
@Override
public SendMessageRspBo changeNotSendBack(String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
return this.dealOrderReturnOrChange(SendScenes.CHANGE_NOT_SEND_BACK, uid, uName, orderCode, orderStatus, productName, productNum, orderAmount, busId);
}
private SendMessageRspBo dealOrderSendOut(String sendScene, String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate) {
... ... @@ -298,4 +303,18 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
return new SendMessageRspBo(200, "SUCCESS");
}
private SendMessageRspBo dealOrderReturnOrChange(String sendScene, String uid, String uName, String orderCode, String orderStatus, String productName, String productNum, String orderAmount, int busId) {
MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(sendScene, orderCode, uid);
messageCenterCommonEvent.putInParams("orderCode", orderCode);
messageCenterCommonEvent.putInParams("orderAmount", orderAmount);
messageCenterCommonEvent.putInParams("orderStatus", orderStatus);
messageCenterCommonEvent.putInParams("productName", productName);
messageCenterCommonEvent.putInParams("productNum", productNum);
messageCenterCommonEvent.putInParams("uName", uName);
messageCenterCommonEvent.putInParams("busId", busId);
messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
return new SendMessageRspBo(200, "SUCCESS");
}
}
\ No newline at end of file
... ...
... ... @@ -19,11 +19,11 @@ public class TestPromotionMessage {
@Test
public void testInviteCouponWait() {
sendPromotionMessage.inviteCouponWait("50002614", "170183676", "50元优惠券", "1234567");
sendPromotionMessage.inviteCouponWait("500026790", "170554985", "50元现金券", "500026804");
}
@Test
public void testInviteCouponSend() {
sendPromotionMessage.inviteCouponSend("50002614", "1234567", "50元优惠券", "1234567");
sendPromotionMessage.inviteCouponSend("500026792", "170829027", "50元现金券", "500026806");
}
}
... ...
... ... @@ -132,18 +132,18 @@ public class TestSendOrderMessage {
//订单已发货，有微信不短信
@Test
public void orderSendOutNew() {
sendOrderMessage.orderSendOutNew("8041612","用户","1764678584","圆通","123321456","2017-05-04");
sendOrderMessage.orderSendOutNew("8041612","用户","1769391779","圆通","123321456","2017-05-04");
}
@Test
public void orderSendOutOther() {
sendOrderMessage.orderSendOutOther("8041612","用户","1764678584","圆通","123321456","2017-05-04");
sendOrderMessage.orderSendOutOther("8041612","用户","1769391779","圆通","1245678","2017-05-04");
}
//订单已发货至分货舱，有微信不短信
@Test
public void orderSendOutWarehouse() {
sendOrderMessage.orderSendOutWarehouse("8041612","用户","1764678584","申通","4545454545","2017-05-04");
sendOrderMessage.orderSendOutWarehouse("8041612","用户","1769391779","申通","4545454545","2017-05-04");
}
//订单取消。微信
... ... @@ -169,4 +169,19 @@ public class TestSendOrderMessage {
public void refundSuccess() {
sendOrderMessage.refundSuccess("8041612","1764678584","Diamond 迷彩印花T恤","752.10","建设银行","2017-05-25 15:51:10",1);
}
@Test
public void homeChangeVerifyPass() {
sendOrderMessage.homeChangeVerifyPass("8041612","用户","1764678584","已审核","Diamond 迷彩印花T恤","1","752.10", 2);
}
@Test
public void returnNotSendBack() {
sendOrderMessage.returnNotSendBack("8041612","用户","1764678584","商品寄回","Diamond 迷彩印花T恤","1","999", 2);
}
@Test
public void changeNotSendBack() {
sendOrderMessage.changeNotSendBack("8041612","用户","1764678584","商品寄回","Diamond 迷彩印花T恤","5","999", 2);
}
}
... ...