ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 4386530494983c810fd54d5c575a3a9a4b5faed7 1 parent 5d485be1

fixbug

Inline Side-by-side
Showing 3 changed files with 15 additions and 9 deletions
@@ -139,7 +139,11 @@ public class BaseNoticeFacade { @@ -139,7 +139,11 @@ public class BaseNoticeFacade {
139 try { 139 try {
140 return inBoxContentSupplier.get(); 140 return inBoxContentSupplier.get();
141 } catch (Exception e) { 141 } catch (Exception e) {
142 - return exceptionFunction.apply(e); 142 + try {
  143 + return inBoxContentSupplier.get();
  144 + } catch (Exception e1) {
  145 + return exceptionFunction.apply(e1);
  146 + }
143 } 147 }
144 } else { 148 } else {
145 return this.inBoxContent; 149 return this.inBoxContent;
@@ -185,7 +189,11 @@ public class BaseNoticeFacade { @@ -185,7 +189,11 @@ public class BaseNoticeFacade {
185 try { 189 try {
186 return smsContentSupplier.get(); 190 return smsContentSupplier.get();
187 } catch (Exception e) { 191 } catch (Exception e) {
188 - return exceptionFunction.apply(e); 192 + try {
  193 + return smsContentSupplier.get();
  194 + } catch (Exception e1) {
  195 + return exceptionFunction.apply(e1);
  196 + }
189 } 197 }
190 } else { 198 } else {
191 return this.smsContent; 199 return this.smsContent;
@@ -5,7 +5,6 @@ import com.yoho.message.sdk.common.model.SendMessageRspBo; @@ -5,7 +5,6 @@ import com.yoho.message.sdk.common.model.SendMessageRspBo;
5 import com.yoho.message.sdk.service.ufo.IUFOSendService; 5 import com.yoho.message.sdk.service.ufo.IUFOSendService;
6 import com.yohobuy.ufo.model.enums.InboxBusinessTypeEnum; 6 import com.yohobuy.ufo.model.enums.InboxBusinessTypeEnum;
7 import com.yohobuy.ufo.model.order.common.SuperEnterStageLevel; 7 import com.yohobuy.ufo.model.order.common.SuperEnterStageLevel;
8 -import com.yohobuy.ufo.model.order.constants.SkupType;  
9 import com.yohoufo.dal.order.SellerOrderMapper; 8 import com.yohoufo.dal.order.SellerOrderMapper;
10 import com.yohoufo.dal.order.model.BuyerOrder; 9 import com.yohoufo.dal.order.model.BuyerOrder;
11 import com.yohoufo.dal.order.model.SellerOrder; 10 import com.yohoufo.dal.order.model.SellerOrder;
@@ -29,7 +28,6 @@ import java.math.BigDecimal; @@ -29,7 +28,6 @@ import java.math.BigDecimal;
29 import java.util.Arrays; 28 import java.util.Arrays;
30 import java.util.List; 29 import java.util.List;
31 import java.util.Map; 30 import java.util.Map;
32 -import java.util.Optional;  
33 import java.util.concurrent.ArrayBlockingQueue; 31 import java.util.concurrent.ArrayBlockingQueue;
34 import java.util.concurrent.ExecutorService; 32 import java.util.concurrent.ExecutorService;
35 import java.util.concurrent.ThreadPoolExecutor; 33 import java.util.concurrent.ThreadPoolExecutor;
@@ -946,9 +944,9 @@ public class InBoxFacade extends BaseNoticeFacade{ @@ -946,9 +944,9 @@ public class InBoxFacade extends BaseNoticeFacade{
946 sellerNoticeFacade.buyerCancelBeforeDepotReceive(buyerOrder, sog); 944 sellerNoticeFacade.buyerCancelBeforeDepotReceive(buyerOrder, sog);
947 } 945 }
948 946
949 - public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder,String compesant, SellerOrderGoods sog,boolean autoReSellFlag) { 947 + public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder,String compesant, SellerOrderGoods sog,boolean isAutoReSell) {
950 buyerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,compesant,sog); 948 buyerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,compesant,sog);
951 - sellerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,sog,autoReSellFlag); 949 + sellerNoticeFacade.buyerCancelBeforeSellerDeliver(buyerOrder,sog, isAutoReSell);
952 } 950 }
953 951
954 /** 952 /**
@@ -168,7 +168,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade { @@ -168,7 +168,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
168 } 168 }
169 } 169 }
170 170
171 - public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder, SellerOrderGoods sog, boolean autoReSellFlag) { 171 + public void buyerCancelBeforeSellerDeliver(@NonNull BuyerOrder buyerOrder, SellerOrderGoods sog, boolean isAutoReSell) {
172 Integer buyerUid = buyerOrder.getUid(); 172 Integer buyerUid = buyerOrder.getUid();
173 Long orderCode = buyerOrder.getOrderCode(); 173 Long orderCode = buyerOrder.getOrderCode();
174 Integer sellerUid = sog.getUid(); 174 Integer sellerUid = sog.getUid();
@@ -182,7 +182,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade { @@ -182,7 +182,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
182 Product product = productMapper.selectByPrimaryKey(sog.getProductId()); 182 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
183 String productCode = product.getProductCode(); 183 String productCode = product.getProductCode();
184 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_PAID; 184 InboxBusinessTypeEnum ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_BY_BUYER_AFTER_PAID;
185 - if (autoReSellFlag) { 185 + if (isAutoReSell) {
186 ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_AUTO_RESELL_BY_BUYER_AFTER_PAID; 186 ibtOfSeller = InboxBusinessTypeEnum.SALE_CLOSED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
187 } 187 }
188 return buildInboxContent(ibtOfSeller, goodsTypeTagForSeller, prdName, sizeName, productCode); 188 return buildInboxContent(ibtOfSeller, goodsTypeTagForSeller, prdName, sizeName, productCode);
@@ -196,7 +196,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade { @@ -196,7 +196,7 @@ public class SellerNoticeFacade extends BaseNoticeFacade {
196 Product product = productMapper.selectByPrimaryKey(sog.getProductId()); 196 Product product = productMapper.selectByPrimaryKey(sog.getProductId());
197 String productCode = product.getProductCode(); 197 String productCode = product.getProductCode();
198 InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID; 198 InboxBusinessTypeEnum sms = InboxBusinessTypeEnum.SMS_CANCELED_BY_BUYER_AFTER_PAID;
199 - if (autoReSellFlag) { 199 + if (isAutoReSell) {
200 sms = InboxBusinessTypeEnum.SMS_CANCELED_AUTO_RESELL_BY_BUYER_AFTER_PAID; 200 sms = InboxBusinessTypeEnum.SMS_CANCELED_AUTO_RESELL_BY_BUYER_AFTER_PAID;
201 } 201 }
202 return buildSmsContent(sms, orderCode, goodsTypeTagForSeller, prdName, sizeName, productCode); 202 return buildSmsContent(sms, orderCode, goodsTypeTagForSeller, prdName, sizeName, productCode);