Authored by chenchao

remove

@@ -136,7 +136,32 @@ public class ActionStatusHold { @@ -136,7 +136,32 @@ public class ActionStatusHold {
136 static { 136 static {
137 sellerCanCancelBuyerOrderStatus = Arrays.asList(OrderStatus.HAS_PAYED.getCode()); 137 sellerCanCancelBuyerOrderStatus = Arrays.asList(OrderStatus.HAS_PAYED.getCode());
138 } 138 }
  139 +
  140 + /**
  141 + * 未完成的订单状态,商家退驻时需要
  142 + * @return
  143 + */
  144 +
  145 + public static List<Integer> unfinishedOrderStatusCode = Arrays.asList(
  146 + OrderStatus.WAITING_PAY.getCode(),
  147 + OrderStatus.HAS_PAYED.getCode(),
  148 + OrderStatus.SELLER_SEND_OUT.getCode(),
  149 + OrderStatus.PLATFORM_RECEIVE.getCode(),
  150 + OrderStatus.PLATFORM_CHECKING.getCode(),
  151 + OrderStatus.MINI_FAULT_WAITING.getCode(),
  152 + OrderStatus.MINI_FAULT_ACCEPT.getCode(),
  153 + OrderStatus.JUDGE_PASS.getCode()
  154 + );
  155 +
  156 + }
  157 +
  158 + public static List<Integer> getUnfinishedOrderStatusCode(){
  159 + return SellerASH.unfinishedOrderStatusCode;
139 } 160 }
  161 +
  162 +
  163 +
  164 +
140 public static List<Integer> getSellerShowExpressStatusList(){ 165 public static List<Integer> getSellerShowExpressStatusList(){
141 return SellerASH.View_Express_Status; 166 return SellerASH.View_Express_Status;
142 } 167 }
@@ -814,7 +814,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -814,7 +814,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
814 */ 814 */
815 public int getUnfinishedOrderBySellerUid(Integer uid){ 815 public int getUnfinishedOrderBySellerUid(Integer uid){
816 log.info("in seller order getUnfinishedOrderBySellerUid count uid {} ", uid); 816 log.info("in seller order getUnfinishedOrderBySellerUid count uid {} ", uid);
817 - List<Integer> statusList = OrderStatus.getUnfinishedOrderStatusCode(); 817 + List<Integer> statusList = ActionStatusHold.getUnfinishedOrderStatusCode();
818 Integer total = buyerOrderMapper.selectCntBySellerUidStatus(uid, statusList); 818 Integer total = buyerOrderMapper.selectCntBySellerUidStatus(uid, statusList);
819 log.info("in seller order getUnfinishedOrderBySellerUid count uid {}, total {} ", uid, total); 819 log.info("in seller order getUnfinishedOrderBySellerUid count uid {}, total {} ", uid, total);
820 return total; 820 return total;