Authored by chenchao

optimized

@@ -67,6 +67,7 @@ public class ActionStatusHold { @@ -67,6 +67,7 @@ public class ActionStatusHold {
67 selfCancel = Arrays.asList(OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(), 67 selfCancel = Arrays.asList(OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(),
68 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()); 68 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
69 } 69 }
  70 +
70 } 71 }
71 public static boolean isBuyerSelfCancel(Integer status){ 72 public static boolean isBuyerSelfCancel(Integer status){
72 return BuyerASH.selfCancel.contains(status); 73 return BuyerASH.selfCancel.contains(status);
@@ -884,11 +884,23 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -884,11 +884,23 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
884 } 884 }
885 885
886 if (OrderCodeType.BUYER_TYPE.equals(codeType)){ 886 if (OrderCodeType.BUYER_TYPE.equals(codeType)){
887 - String confirmDesc = "您确定取消出售吗?取消后将根据《卖家须知》"+ FLAG_PRE +"扣除对应保证金"+ FLAG_SUFFIX + "作为赔偿打入卖家账户"; 887 + String confirmDesc = getConfirmDesc4BuyerOrder(orderCode);
888 occr.setConfirmDesc(confirmDesc); 888 occr.setConfirmDesc(confirmDesc);
889 } 889 }
890 return occr; 890 return occr;
891 } 891 }
892 892
893 - 893 + private String getConfirmDesc4BuyerOrder(long orderCode){
  894 + String confirmDesc = null;
  895 + BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
  896 + if (buyerOrder == null){
  897 + return "订单不存在";
  898 + }
  899 + if (ActionStatusHold.sellerCanCancelBuyerOrder(buyerOrder.getStatus())) {
  900 + confirmDesc = "您确定取消出售吗?取消后将根据《卖家须知》" + FLAG_PRE + "扣除对应保证金" + FLAG_SUFFIX + "作为赔偿打入卖家账户";
  901 + }else {
  902 + confirmDesc = "无法取消,请刷新后查看订单最新状态";
  903 + }
  904 + return confirmDesc;
  905 + }
894 } 906 }