Merge branch 'dev_0131_拼团消息模板'

@@ -90,6 +90,14 @@ public class SendScenes {
 	// 待支付
 	public static final String MINI_WAITING_PAY = "MINI_WAITING_PAY";
 
+	// 拼团成功
+	public static final String GROUP_ORDER_SUCCESS = "GROUP_ORDER_SUCCESS";
+
+	// 拼团失败
+	public static final String GROUP_ORDER_FAIL = "GROUP_ORDER_FAIL";
+
+	// 拼团进度
+	public static final String GROUP_ORDER_SPEED = "GROUP_ORDER_SPEED";
 
 	//上门换货审核通过
 	public static final String HOME_CHANGE_VERIFY_PASS = "HOME_CHANGE_VERIFY_PASS";

@@ -368,6 +368,41 @@ public interface ISendOrderMessage {
 	public SendMessageRspBo paySuccess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount,int miniappFlg);
 
 
+	/**
+	 * 拼团成功通知
+	 * @param uid
+	 * @param orderCode
+	 * @param groupTime
+	 * @param productName
+	 * @param groupOrderAmount
+	 * @return
+	 */
+	public SendMessageRspBo fightGroupsSuccess(String uid, String orderCode, int groupTime, String productName, String groupOrderAmount);
+
+
+	/**
+	 * 拼团失败
+	 * @param uid
+	 * @param orderCode
+	 * @param groupFailTime
+	 * @param productName
+	 * @param groupOrderAmount
+	 * @return
+	 */
+	public SendMessageRspBo fightGroupsFail(String uid, String orderCode, int groupFailTime, String productName, String groupOrderAmount);
+
+
+	/**
+	 * 拼团进度
+	 * @param uid
+	 * @param orderCode
+	 * @param leftTime
+	 * @param groupTime
+	 * @param productName
+	 * @param payAmount
+	 * @return
+	 */
+	public SendMessageRspBo fightGroupsSpeed(String uid, String orderCode, String leftTime, int groupTime, String productName, String payAmount);
 
 
 }

@@ -381,6 +381,53 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
 		return new SendMessageRspBo(200, "SUCCESS");
 	}
 
+	@Override
+	public SendMessageRspBo fightGroupsSuccess(String uid, String orderCode, int groupTime, String productName, String groupOrderAmount) {
+
+		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.GROUP_ORDER_SUCCESS, orderCode, uid);
+
+		messageCenterCommonEvent.putInParams("orderCode", orderCode);
+		messageCenterCommonEvent.putInParams("groupTime", DateUtils.long2DateStr(groupTime * 1000l, DateUtils.fullDateTimeFormat));
+		messageCenterCommonEvent.putInParams("productName", productName);
+
+		messageCenterCommonEvent.putInParams("groupOrderAmount", groupOrderAmount);
+
+		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
+
+		return new SendMessageRspBo(200, "SUCCESS");
+	}
+
+	@Override
+	public SendMessageRspBo fightGroupsFail(String uid, String orderCode, int groupFailTime, String productName, String groupOrderAmount) {
+
+		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.GROUP_ORDER_FAIL, orderCode, uid);
+
+		messageCenterCommonEvent.putInParams("orderCode", orderCode);
+		messageCenterCommonEvent.putInParams("groupFailTime", DateUtils.long2DateStr(groupFailTime * 1000l, DateUtils.fullDateTimeFormat));
+		messageCenterCommonEvent.putInParams("productName", productName);
+
+		messageCenterCommonEvent.putInParams("groupOrderAmount", groupOrderAmount);
+
+		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
+
+		return new SendMessageRspBo(200, "SUCCESS");
+	}
+
+	@Override
+	public SendMessageRspBo fightGroupsSpeed(String uid, String orderCode, String leftTime, int groupTime, String productName, String payAmount) {
+		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.GROUP_ORDER_SPEED, orderCode, uid);
+
+		messageCenterCommonEvent.putInParams("leftTime", leftTime);
+		messageCenterCommonEvent.putInParams("orderCode", orderCode);
+		messageCenterCommonEvent.putInParams("groupTime", DateUtils.long2DateStr(groupTime * 1000l, DateUtils.fullDateTimeFormat));
+		messageCenterCommonEvent.putInParams("productName", productName);
+
+		messageCenterCommonEvent.putInParams("payAmount", payAmount);
+
+		messageCenterMqHandler.sendMessageToMq(messageCenterCommonEvent);
+
+		return new SendMessageRspBo(200, "SUCCESS");
+	}
 
 
 	@Override

@@ -185,4 +185,23 @@ public class TestSendOrderMessage {
 	public void changeNotSendBack() {
 		sendOrderMessage.changeNotSendBack("8041612","用户","1764678584","商品寄回","Diamond 迷彩印花T恤","5","999", 2);
 	}
+
+	@Test
+	public void fightGroupSuccess(){
+		sendOrderMessage.fightGroupsSuccess("54096844", "41312884053",1517391944,"测试商品", "1");
+	}
+
+	@Test
+	public void fightGroupsFail(){
+		sendOrderMessage.fightGroupsFail("54096844", "41382090069",1517391944,"测试商品", "99999元");
+	}
+
+
+	@Test
+	public void fightGroupsSpeed(){
+		sendOrderMessage.fightGroupsSpeed("54096844", "41482753365","6小时",1517391944,"测试商品", "99999元");
+	}
+
+
+
 }