show express info and clean cache when fail

@@ -34,7 +34,9 @@ public class ActionStatusHold {
                 OrderStatus.MINI_FAULT_REJECT.getCode(),
                 OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode(),
                 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
-                OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()
+                OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode(),
+                OrderStatus.PLATFORM_BLOWN_CUSTOMS_CLEARANCE.getCode(),
+                OrderStatus.BUYER_BLOWN_CUSTOMS_CLEARANCE.getCode()
         );
 
 
@@ -111,7 +113,9 @@ public class ActionStatusHold {
                 OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode(),
                 OrderStatus.WAITING_RECEIVE.getCode(),OrderStatus.DONE.getCode(),
                 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode(),
-                OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()
+                OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode(),
+                OrderStatus.PLATFORM_BLOWN_CUSTOMS_CLEARANCE.getCode(),
+                OrderStatus.BUYER_BLOWN_CUSTOMS_CLEARANCE.getCode()
         );
         //
         static List<Integer> CanRefundStatus;

@@ -76,7 +76,7 @@ public class AlarmEventBuilder {
                 smsAlarmEvent = new SmsAlarmEvent("buyerPaidOrder.selfCancel", "cancel", content);
                 break;
             default:
-                smsAlarmEvent = new SmsAlarmEvent("","","");
+                smsAlarmEvent = new SmsAlarmEvent("RefundBuyerGoodsMoney","RefundBuyerGoodsMoney",content);
         }
         return smsAlarmEvent;
     }

@@ -79,19 +79,14 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
     @Autowired
     UfoServiceCaller ufoServiceCaller;
     
-    //@Value("${order.seller.tip.publishMoneyTip:保证金余额不足}")
     private String publishMoneyTip = "保证金余额不足 ￥";
     
-    //@Value("${order.seller.tip.publishFunctionTip:请充值后进行正常上架/下架}")
     private String publishFunctionTip = "请充值后进行正常上架";
     
-    //@Value("${order.seller.tip.canSaleMoneyTip:保证金余额低于}")
     private String canSaleMoneyTip = "保证金余额不足 ￥";
     
-    //@Value("${order.seller.tip.canSaleFunctionTip:平台下架您所有出售中的商品}")
     private String canSaleFunctionTip = "上架所有商品将会被强制隐藏，不会给用户展示";
     
-    //@Value("${order.seller.tip.recoverTip:充值 ￥{} 恢复超级商家权限}")
     private String recoverTip = "充值 ￥{} 恢复超级商家权限";
     
     private String saleListLowMoneyTip = "您的保证金余额不足，出售中商品将会被强制隐藏，不会给用户展示";
@@ -102,7 +97,6 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 	/**
 	 * 瑕疵确认不通过的情况，卖家的保证金扣掉一部分给平台，暂定0元
 	 */
-	//@Value("${order.seller.earnestmoney.miniFaultRejectPunishFee:0}")
 	private Double miniFaultRejectPunishFee = 0D ;
 
 
@@ -521,8 +515,10 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
 		JSONObject result = new JSONObject();
 		BigDecimal allMoney = sw.getAmount().add(sw.getLockAmount());
 
+		SellerWrapper sellerWrapper = sellerService.getBaseSellerWrapper(uid);
+		SellerBo sellerBo = sellerWrapper.buildSellerBo();
 		Map<EntrySellerType, EntryThreshold> map = sellerService.getEntryThreshold();
-		EntryThreshold sp = map.get(EntrySellerType.SUPER_ENTRY);
+		EntryThreshold sp = map.get(sellerBo.getEntrySellerType());
 		// 查配置、超级卖家门槛金额
 		BigDecimal superMoney = sp.getPrepaymentAmount();
 		BigDecimal lackOfMoneyAsSuper = BigDecimal.ZERO;

@@ -381,6 +381,17 @@ public class BuyerOrderCancelService {
             logger.warn("cancelOverseasOrder fail -> buyerOrderMapper.updateStatusByOrderCode, orderCode {}", orderCode);
             return;
         }
+        int sellerUid = buyerOrder.getSellerUid();
+        //clean cache
+        cacheCleaner.delete(Arrays.asList(CacheKeyBuilder.orderListKey(sellerUid, TabType.SELL.getValue()),
+                CacheKeyBuilder.orderListKey(buyerUid, TabType.BUY.getValue()),
+                CacheKeyBuilder.orderDetailKey(sellerUid, TabType.SELL.getValue(), orderCode),
+                CacheKeyBuilder.orderDetailKey(buyerUid, TabType.BUY.getValue(), orderCode),
+                CacheKeyBuilder.buyerOrderNums(buyerUid)));
+
+        ErpBuyerOrderEvent event = new ErpBuyerOrderEvent(buyerUid);
+        EventBusPublisher.publishEvent(event);
+
         BigDecimal leftGoodsMoney = buyerOrder.getAmount();
 
         BuyerOrderGoods pbog = buyerOrderGoodsMapper.selectOnlyByOrderCode(orderCode);