Merge branch 'dev_qc693_取消skup重新上架' into test6.9.3

@@ -157,7 +157,7 @@ public class BuyerOrderCancelService {
             }
 
             if (noResponsibility){
-                inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode);
+                inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,reSellAfterCancel);
             }else {
                 inBoxFacade.buyerCancelBeforeSellerDeliver(buyerUid, orderCode,
                         penaltyAmount.toPlainString(), psog,reSellAfterCancel);
@@ -274,7 +274,7 @@ public class BuyerOrderCancelService {
             sellerOrderMapper.updateBySkups(soc, Arrays.asList(skup));
             SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
             if (noResponsibility){
-                inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode);
+                inBoxFacade.noticeSellerWhenBuyerCancelNoResponsibility(psog, orderCode,false);
             }else {
                 inBoxFacade.buyerCancelBeforeDepotReceive(buyerUid, orderCode,
                         penaltyAmount.toPlainString(),  psog);

@@ -1468,7 +1468,7 @@ public class InBoxFacade {
      * 站内：您的商品「商品名称」「尺码」，已被买家取消，您出售的商品已下架，保证金将于1个工作日内退回您的账户。
      * 短信：买家已取消订单，订单编号{}。您的商品「商品名称」已下架，更多信息请查看Yoho!Buy有货APP  [我的-球鞋交易-出售]。
      */
-    public void noticeSellerWhenBuyerCancelNoResponsibility(SellerOrderGoods sog,  long orderCode){
+    public void noticeSellerWhenBuyerCancelNoResponsibility(SellerOrderGoods sog,  long orderCode,boolean autoReSell){
 
         Integer sellerUid = sog.getUid();
         String prdName = sog.getProductName();
@@ -1479,6 +1479,9 @@ public class InBoxFacade {
                 String productCode = product.getProductCode();
 
                 InboxBusinessTypeEnum ibt = InboxBusinessTypeEnum.NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
+                if(autoReSell){
+                    ibt = InboxBusinessTypeEnum.NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
+                }
                 String params = buildParams(prdName, sizeName,productCode, orderCode);
                 InboxReqVO req = buildInboxReqVO(sellerUid, params, ibt);
 
@@ -1494,7 +1497,11 @@ public class InBoxFacade {
                 }
                 List<String> mobileList = Arrays.asList(phone);
 
-                String content = replaceSMSContent(InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY, orderCode, prdName,sizeName,productCode);
+                InboxBusinessTypeEnum sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
+                if(autoReSell){
+                    sms=InboxBusinessTypeEnum.SMS_NOTICE_SELLER_AUTO_RESELL_WHEN_BUYER_CANCEL_NO_RESPONSIBILITY;
+                }
+                String content = replaceSMSContent(sms, orderCode, prdName,sizeName,productCode);
                 sendSmsService.smsSendByMobile(content,mobileList);
                 logger.info("record noticeSellerWhenBuyerCancelNoResponsibility inbox sms msg, sellerUid {}, orderCode {},prdName {}",
                         sellerUid, orderCode, prdName);