Merge branch 'dev_0102_小程序模板消息' of http://git.yoho.cn/yoho30/yoho-message-sdk into dev_0102_小程序模板消息

@@ -337,9 +337,10 @@ public interface ISendOrderMessage {
 	 * @param orderCode
 	 * @param orderAmount
 	 * @param productName
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName);
+	public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName,int miniappFlg);
 
 
 	/**
@@ -348,9 +349,10 @@ public interface ISendOrderMessage {
 	 * @param orderCode
 	 * @param goodReceiptTime
 	 * @param productName
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName);
+	public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName,int miniappFlg);
 
 
 	/**
@@ -360,9 +362,10 @@ public interface ISendOrderMessage {
 	 * @param payTime
 	 * @param productName
 	 * @param goodReceiptAddress
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo paySucess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount);
+	public SendMessageRspBo paySuccess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount,int miniappFlg);
 
 
 

@@ -302,9 +302,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
 	 * @param orderCode
 	 * @param orderAmount
 	 * @param productName
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName) {
+	public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName, int miniappFlg) {
+
+		if (miniappFlg != 1) {
+			//yoho暂时不通知
+			return null;
+		}
 
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_WAITING_PAY, orderCode, uid);
 
@@ -324,9 +330,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
 	 * @param orderCode
 	 * @param goodReceiptTime
 	 * @param productName
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName) {
+	public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName, int miniappFlg) {
+
+		if (miniappFlg != 1) {
+			//yoho暂时不通知
+			return null;
+		}
 
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_GOODS_RECEIPT, orderCode, uid);
 
@@ -346,9 +358,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
 	 * @param payTime
 	 * @param productName
 	 * @param goodReceiptAddress
+	 * @param miniappFlg
 	 * @return
 	 */
-	public SendMessageRspBo paySucess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount) {
+	public SendMessageRspBo paySuccess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount, int miniappFlg) {
+
+		if (miniappFlg != 1) {
+			//yoho暂时不通知
+			return null;
+		}
 
 		MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_PAY_SUCCESS, orderCode, uid);