Authored by Amos_sdy

发货通知短信内容修改

@@ -57,7 +57,24 @@ public interface ISendOrderMessage { @@ -57,7 +57,24 @@ public interface ISendOrderMessage {
57 public SendMessageRspBo orderSendOut(String uid, String orderCode, String companyName, String expressNum); 57 public SendMessageRspBo orderSendOut(String uid, String orderCode, String companyName, String expressNum);
58 58
59 /** 59 /**
  60 + *
  61 + * Description: 订单发货通知<br>
  62 + *
  63 + * @author amos.shan<br>
  64 + * @taskId <br>
  65 + * @param uid
  66 + * @param uName
  67 + * @param orderCode
  68 + * @param companyName
  69 + * @param expressNum
  70 + * @param isRemote
  71 + * @return <br>
  72 + */
  73 + public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, boolean isRemote);
  74 +
  75 + /**
60 * 线下店订单线上发货发票通知 76 * 线下店订单线上发货发票通知
  77 + *
61 * @return 78 * @return
62 */ 79 */
63 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link); 80 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link);
@@ -74,6 +74,19 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -74,6 +74,19 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
74 } 74 }
75 75
76 @Override 76 @Override
  77 + public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, boolean isRemote) {
  78 + MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.ORDER_SEND_OUT, orderCode, uid);
  79 + messageCenterCommonEvent.putInParams("orderCode", orderCode);
  80 + messageCenterCommonEvent.putInParams("companyName", companyName);
  81 + messageCenterCommonEvent.putInParams("expressNum", expressNum);
  82 + messageCenterCommonEvent.putInParams("uName", uName);
  83 + messageCenterCommonEvent.putInParams("arriveDate", isRemote == true ? "3-5" : "1-3");
  84 + messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
  85 +
  86 + return new SendMessageRspBo(200, "SUCCESS");
  87 + }
  88 +
  89 + @Override
77 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link) { 90 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link) {
78 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.SHOPS_ORDER_INVOICE_ONLINE,orderCode,""); 91 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.SHOPS_ORDER_INVOICE_ONLINE,orderCode,"");
79 messageCenterCommonEvent.putInParams("orderCode", orderCode); 92 messageCenterCommonEvent.putInParams("orderCode", orderCode);
@@ -36,7 +36,7 @@ public class TestSendOrderMessage { @@ -36,7 +36,7 @@ public class TestSendOrderMessage {
36 36
37 @Test 37 @Test
38 public void orderSendOut() { 38 public void orderSendOut() {
39 - sendOrderMessage.orderSendOut("20490172", "1607725059", "顺丰", "1234522298700000"); 39 + sendOrderMessage.orderSendOut("20490172", "1607725059", "顺丰", "1234444522200");
40 } 40 }
41 41
42 @Test 42 @Test