Authored by chenchao

Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.7

@@ -1601,7 +1601,7 @@ public class InBoxFacade { @@ -1601,7 +1601,7 @@ public class InBoxFacade {
1601 if(autoReSell){ 1601 if(autoReSell){
1602 sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY; 1602 sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
1603 } 1603 }
1604 - String content = replaceSMSContent(sms,skupTypeText, orderCode, prdName,sizeName,productCode); 1604 + String content = replaceSMSContent(sms, orderCode,skupTypeText, prdName,sizeName,productCode);
1605 sendSmsService.smsSendByMobile(content,mobileList); 1605 sendSmsService.smsSendByMobile(content,mobileList);
1606 logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}", 1606 logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
1607 sellerUid, orderCode, prdName); 1607 sellerUid, orderCode, prdName);