YOHOBUY / yoho-message-sdk · Commits

Go to a project

Authored by tanling
Commit add247096f93c3da1cf0f326015d1e0b5618fbfb 2 parents ad8e41a1 ac750843

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

Inline Side-by-side
Showing 2 changed files with 27 additions and 6 deletions
@@ -337,9 +337,10 @@ public interface ISendOrderMessage { @@ -337,9 +337,10 @@ public interface ISendOrderMessage {
337 * @param orderCode 337 * @param orderCode
338 * @param orderAmount 338 * @param orderAmount
339 * @param productName 339 * @param productName
  340 + * @param miniappFlg
340 * @return 341 * @return
341 */ 342 */
342 - public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName); 343 + public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName,int miniappFlg);
343 344
344 345
345 /** 346 /**
@@ -348,9 +349,10 @@ public interface ISendOrderMessage { @@ -348,9 +349,10 @@ public interface ISendOrderMessage {
348 * @param orderCode 349 * @param orderCode
349 * @param goodReceiptTime 350 * @param goodReceiptTime
350 * @param productName 351 * @param productName
  352 + * @param miniappFlg
351 * @return 353 * @return
352 */ 354 */
353 - public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName); 355 + public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName,int miniappFlg);
354 356
355 357
356 /** 358 /**
@@ -360,9 +362,10 @@ public interface ISendOrderMessage { @@ -360,9 +362,10 @@ public interface ISendOrderMessage {
360 * @param payTime 362 * @param payTime
361 * @param productName 363 * @param productName
362 * @param goodReceiptAddress 364 * @param goodReceiptAddress
  365 + * @param miniappFlg
363 * @return 366 * @return
364 */ 367 */
365 - public SendMessageRspBo paySucess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount); 368 + public SendMessageRspBo paySuccess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount,int miniappFlg);
366 369
367 370
368 371
@@ -302,9 +302,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -302,9 +302,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
302 * @param orderCode 302 * @param orderCode
303 * @param orderAmount 303 * @param orderAmount
304 * @param productName 304 * @param productName
  305 + * @param miniappFlg
305 * @return 306 * @return
306 */ 307 */
307 - public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName) { 308 + public SendMessageRspBo waitingPay(String uid, String orderCode, String orderAmount, String productName, int miniappFlg) {
  309 +
  310 + if (miniappFlg != 1) {
  311 + //yoho暂时不通知
  312 + return null;
  313 + }
308 314
309 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_WAITING_PAY, orderCode, uid); 315 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_WAITING_PAY, orderCode, uid);
310 316
@@ -324,9 +330,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -324,9 +330,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
324 * @param orderCode 330 * @param orderCode
325 * @param goodReceiptTime 331 * @param goodReceiptTime
326 * @param productName 332 * @param productName
  333 + * @param miniappFlg
327 * @return 334 * @return
328 */ 335 */
329 - public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName) { 336 + public SendMessageRspBo confirmOrder(String uid, String orderCode, int goodReceiptTime, String productName, int miniappFlg) {
  337 +
  338 + if (miniappFlg != 1) {
  339 + //yoho暂时不通知
  340 + return null;
  341 + }
330 342
331 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_GOODS_RECEIPT, orderCode, uid); 343 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_GOODS_RECEIPT, orderCode, uid);
332 344
@@ -346,9 +358,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -346,9 +358,15 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
346 * @param payTime 358 * @param payTime
347 * @param productName 359 * @param productName
348 * @param goodReceiptAddress 360 * @param goodReceiptAddress
  361 + * @param miniappFlg
349 * @return 362 * @return
350 */ 363 */
351 - public SendMessageRspBo paySucess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount) { 364 + public SendMessageRspBo paySuccess(String uid, String orderCode, int payTime, String productName, String goodReceiptAddress, String orderAmount, int miniappFlg) {
  365 +
  366 + if (miniappFlg != 1) {
  367 + //yoho暂时不通知
  368 + return null;
  369 + }
352 370
353 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_PAY_SUCCESS, orderCode, uid); 371 MessageCenterCommonEvent messageCenterCommonEvent = genMessageCenterCommonEvent(SendScenes.MINI_PAY_SUCCESS, orderCode, uid);
354 372