fixbug

@@ -139,7 +139,11 @@ public class BaseNoticeFacade {
                 try {
                     return inBoxContentSupplier.get();
                 } catch (Exception e) {
-                    return exceptionFunction.apply(e);
+                    try {
+                        return inBoxContentSupplier.get();
+                    } catch (Exception e1) {
+                        return exceptionFunction.apply(e1);
+                    }
                 }
             } else {
                 return this.inBoxContent;
@@ -185,7 +189,11 @@ public class BaseNoticeFacade {
                 try {
                     return smsContentSupplier.get();
                 } catch (Exception e) {
-                    return exceptionFunction.apply(e);
+                    try {
+                        return smsContentSupplier.get();
+                    } catch (Exception e1) {
+                        return exceptionFunction.apply(e1);
+                    }
                 }
             } else {
                 return this.smsContent;

@@ -5,7 +5,6 @@ import com.yoho.message.sdk.common.model.SendMessageRspBo;
 import com.yoho.message.sdk.service.ufo.IUFOSendService;
 import com.yohobuy.ufo.model.enums.InboxBusinessTypeEnum;
 import com.yohobuy.ufo.model.order.common.SuperEnterStageLevel;
-import com.yohobuy.ufo.model.order.constants.SkupType;
 import com.yohoufo.dal.order.SellerOrderMapper;
 import com.yohoufo.dal.order.model.BuyerOrder;
 import com.yohoufo.dal.order.model.SellerOrder;
@@ -29,7 +28,6 @@ import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -946,9 +944,9 @@ public class InBoxFacade extends BaseNoticeFacade{
         sellerNoticeFacade.buyerCancelBeforeDepotReceive(buyerOrder, sog);
     }
 
-    public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder,String compesant, SellerOrderGoods sog,boolean autoReSellFlag) {
+    public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder,String compesant, SellerOrderGoods sog,boolean isAutoReSell) {
         buyerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,compesant,sog);
-        sellerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,sog,autoReSellFlag);
+        sellerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,sog, isAutoReSell);
     }
 
     /**

@@ -168,7 +168,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
         }
     }
 
-    public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder, SellerOrderGoods sog, boolean autoReSellFlag) {
+    public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder, SellerOrderGoods sog, boolean isAutoReSell) {
         Integer buyerUid = buyerOrder.getUid();
         Long orderCode = buyerOrder.getOrderCode();
         Integer sellerUid = sog.getUid();
@@ -182,7 +182,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
                         Product product = productMapper.selectByPrimaryKey(sog.getProductId());
                         String productCode = product.getProductCode();
                         InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_PAID;
-                        if (autoReSellFlag) {
+                        if (isAutoReSell) {
                             ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
                         }
                         return buildInboxContent(ibtOfSeller, goodsTypeTagForSeller, prdName, sizeName, productCode);
@@ -196,7 +196,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
                         Product product = productMapper.selectByPrimaryKey(sog.getProductId());
                         String productCode = product.getProductCode();
                         InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID;
-                        if (autoReSellFlag) {
+                        if (isAutoReSell) {
                             sms = InboxBusinessTypeEnum.SMS_CANCELED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
                         }
                         return buildSmsContent(sms, orderCode, goodsTypeTagForSeller, prdName, sizeName, productCode);