退换货拆分

@@ -27,10 +27,10 @@ public interface ISendOrderMessage {
 	 * 
 	 * @param uid
 	 * @param orderCode
-	 *            订单号
+	 * @type 1:退货 2:换货
 	 * @return
 	 */
-	public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode);
+	public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode, int id, int type);
 
 	/**
 	 * 退款预计到账时间通知
@@ -42,7 +42,7 @@ public interface ISendOrderMessage {
 	 *            支付渠道
 	 * @return
 	 */
-	public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType);
+	public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType, int refundId);
 
 	/**
 	 * 订单已发货【有微信,不短信】

@@ -35,19 +35,22 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
 	}
 
 	@Override
-	public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode) {
+	public SendMessageRspBo exchangeGoodsVerifyPass(String uid, String orderCode, int id, int type) {
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.EXCHANGE_GOODS_VERIFY_PASS,orderCode,uid);
 		messageCenterCommonEvent.putInParams("orderCode", orderCode);
+		messageCenterCommonEvent.putInParams("id", id);
+		messageCenterCommonEvent.putInParams("type", type);
 		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
 
 		return new SendMessageRspBo(200,"SUCCESS");
 	}
 
 	@Override
-	public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType) {
+	public SendMessageRspBo refundExpectReach(String uid, String orderCode, String payType, int refundId) {
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.REFUND_EXPECT_REACH,orderCode,uid);
 		messageCenterCommonEvent.putInParams("orderCode", orderCode);
 		messageCenterCommonEvent.putInParams("payType", payType);
+		messageCenterCommonEvent.putInParams("refundId", refundId);
 		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
 
 		return new SendMessageRspBo(200,"SUCCESS");

@@ -37,12 +37,19 @@ public class TestSendOrderMessage {
 
 	@Test
 	public void exchangeGoodsVerifyPass() {
-		sendOrderMessage.exchangeGoodsVerifyPass("20422396", "1611776769");
+		// 换货申请审核通过
+		sendOrderMessage.exchangeGoodsVerifyPass("20422396", "1611776769", 111, 2);
+	}
+
+	@Test
+	public void refundGoodsVerifyPass() {
+		// 退货申请审核通过
+		sendOrderMessage.exchangeGoodsVerifyPass("20422396", "1611776769", 111, 1);
 	}
 
 	@Test
 	public void refundExpectReach() {
-		sendOrderMessage.refundExpectReach("20422396", "1611776769", "支付宝");
+		sendOrderMessage.refundExpectReach("20422396", "1611776769", "支付宝", 1111);
 	}
 
 	@Test