Authored by Amos_sdy

5.5版本订单消息修改

@@ -23,7 +23,7 @@ public interface ISendOrderMessage { @@ -23,7 +23,7 @@ public interface ISendOrderMessage {
23 public SendMessageRspBo firstOrderGetCoupon(String uid, String orderCode); 23 public SendMessageRspBo firstOrderGetCoupon(String uid, String orderCode);
24 24
25 /** 25 /**
26 - * 退换货审核通过 26 + * 退换货审核通过--发push
27 * 27 *
28 * @param uid 28 * @param uid
29 * @param orderCode 29 * @param orderCode
@@ -33,6 +33,20 @@ public interface ISendOrderMessage { @@ -33,6 +33,20 @@ public interface ISendOrderMessage {
33 public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode, int id, int type); 33 public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode, int id, int type);
34 34
35 /** 35 /**
  36 + *
  37 + * Description:退换货审核通过--只发短信 <br>
  38 + *
  39 + * @author amos.shan<br>
  40 + * @taskId <br>
  41 + * @param mobile
  42 + * @param orderCode
  43 + * @param uName
  44 + * @param type
  45 + * @return <br>
  46 + */
  47 + public SendMessageRspBo exchangeGoodsVerifyPassSms(String mobile, String orderCode, String uName, int type);
  48 +
  49 + /**
36 * 退款预计到账时间通知 50 * 退款预计到账时间通知
37 * 51 *
38 * @param uid 52 * @param uid
@@ -58,7 +72,7 @@ public interface ISendOrderMessage { @@ -58,7 +72,7 @@ public interface ISendOrderMessage {
58 72
59 /** 73 /**
60 * 74 *
61 - * Description: 订单发货通知<br> 75 + * Description: 订单发货通知--发短信<br>
62 * 76 *
63 * @author amos.shan<br> 77 * @author amos.shan<br>
64 * @taskId <br> 78 * @taskId <br>
@@ -73,6 +87,18 @@ public interface ISendOrderMessage { @@ -73,6 +87,18 @@ public interface ISendOrderMessage {
73 public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate); 87 public SendMessageRspBo orderSendOut(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate);
74 88
75 /** 89 /**
  90 + *
  91 + * Description: 订单发货通知--发push<br>
  92 + *
  93 + * @author amos.shan<br>
  94 + * @taskId <br>
  95 + * @param uid
  96 + * @param orderCode
  97 + * @return <br>
  98 + */
  99 + public SendMessageRspBo orderSendOutPush(String uid, String orderCode);
  100 +
  101 + /**
76 * 线下店订单线上发货发票通知 102 * 线下店订单线上发货发票通知
77 * 103 *
78 * @return 104 * @return
@@ -52,6 +52,24 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -52,6 +52,24 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
52 } 52 }
53 53
54 @Override 54 @Override
  55 + public SendMessageRspBo exchangeGoodsVerifyPassSms(String mobile, String orderCode, String uName, int type) {
  56 + MessageCenterCommonEvent messageCenterCommonEvent = new MessageCenterCommonEvent();
  57 + if (type == 1) {
  58 + // 退货
  59 + messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_GOODS_VERIFY_PASS, orderCode, "");
  60 + } else if (type == 2) {
  61 + // 换货
  62 + messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.EXCHANGE_GOODS_VERIFY_PASS, orderCode, "");
  63 + }
  64 + messageCenterCommonEvent.putInParams("mobile", mobile);
  65 + messageCenterCommonEvent.putInParams("orderCode", orderCode);
  66 + messageCenterCommonEvent.putInParams("uName", uName);
  67 + messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
  68 +
  69 + return new SendMessageRspBo(200, "SUCCESS");
  70 + }
  71 +
  72 + @Override
55 public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType, int refundId) { 73 public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType, int refundId) {
56 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_EXPECT_REACH,orderCode,uid); 74 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_EXPECT_REACH,orderCode,uid);
57 messageCenterCommonEvent.putInParams("orderCode", orderCode); 75 messageCenterCommonEvent.putInParams("orderCode", orderCode);
@@ -87,6 +105,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -87,6 +105,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
87 } 105 }
88 106
89 @Override 107 @Override
  108 + public SendMessageRspBo orderSendOutPush(String uid, String orderCode) {
  109 + MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.ORDER_SEND_OUT, orderCode, uid);
  110 + messageCenterCommonEvent.putInParams("orderCode", orderCode);
  111 + messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
  112 +
  113 + return new SendMessageRspBo(200, "SUCCESS");
  114 + }
  115 +
  116 + @Override
90 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link) { 117 public SendMessageRspBo sendShopsOrderInvoiceOnline(String mobile, String userName, String orderCode, String companyName, String expressNum, String link) {
91 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.SHOPS_ORDER_INVOICE_ONLINE,orderCode,""); 118 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.SHOPS_ORDER_INVOICE_ONLINE,orderCode,"");
92 messageCenterCommonEvent.putInParams("orderCode", orderCode); 119 messageCenterCommonEvent.putInParams("orderCode", orderCode);