发货通知短信内容修改

@@ -57,9 +57,26 @@ public interface ISendOrderMessage {
 	public SendMessageRspBo orderSendOut(String uid, String orderCode, String companyName, String expressNum);
 
 	/**
+	 * 
+	 * Description: 订单发货通知<br>
+	 * 
+	 * @author amos.shan<br>
+	 * @taskId <br>
+	 * @param uid
+	 * @param uName
+	 * @param orderCode
+	 * @param companyName
+	 * @param expressNum
+	 * @param isRemote
+	 * @return <br>
+	 */
+	public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, boolean isRemote);
+
+	/**
 	 * 线下店订单线上发货发票通知
+	 * 
 	 * @return
-     */
+	 */
 	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
 	}
 
 	@Override
+	public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, boolean isRemote) {
+		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.ORDER_SEND_OUT, orderCode, uid);
+		messageCenterCommonEvent.putInParams("orderCode", orderCode);
+		messageCenterCommonEvent.putInParams("companyName", companyName);
+		messageCenterCommonEvent.putInParams("expressNum", expressNum);
+		messageCenterCommonEvent.putInParams("uName", uName);
+		messageCenterCommonEvent.putInParams("arriveDate", isRemote == true ? "3-5" : "1-3");
+		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
+
+		return new SendMessageRspBo(200, "SUCCESS");
+	}
+
+	@Override
 	public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link) {
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.SHOPS_ORDER_INVOICE_ONLINE,orderCode,"");
 		messageCenterCommonEvent.putInParams("orderCode", orderCode);

@@ -36,7 +36,7 @@ public class TestSendOrderMessage {
 
 	@Test
 	public void orderSendOut() {
-		sendOrderMessage.orderSendOut("20490172", "1607725059", "顺丰", "1234522298700000");
+		sendOrderMessage.orderSendOut("20490172", "1607725059", "顺丰", "1234444522200");
 	}
 
 	@Test