...
|
...
|
@@ -37,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.Objects;
|
|
|
import java.util.Set;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
...
|
...
|
@@ -114,7 +111,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
|
|
PageResp orderListInfoRsp;
|
|
|
int type;
|
|
|
if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){
|
|
|
List<Integer> statusList = initOrderListRequest(request);
|
|
|
List<Integer> statusList = getSkupStatusListV683();
|
|
|
|
|
|
int total = sellerOrderGoodsMapper.selectCntByUidStatusGBBNList(request.getUid(), statusList);
|
|
|
int limit = request.getLimit();
|
...
|
...
|
@@ -269,6 +266,18 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
|
|
}
|
|
|
return orderListInfo;
|
|
|
}
|
|
|
private static List<Integer> skupStatusListV683 =Arrays.asList(
|
|
|
SkupStatus.CAN_NOT_SELL.getCode(),
|
|
|
SkupStatus.CAN_SELL.getCode(),
|
|
|
SkupStatus.YOHO_CANCEL_SELL.getCode(),
|
|
|
SkupStatus.SELF_CANCEL_PAY.getCode(),
|
|
|
SkupStatus.TIMEOUT_CANCEL.getCode(),
|
|
|
SkupStatus.SELLER_CANCEL_SELL.getCode()
|
|
|
);
|
|
|
|
|
|
public static List<Integer> getSkupStatusListV683(){
|
|
|
return skupStatusListV683;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
protected List<Integer> initOrderListRequest(OrderListRequest request) {
|
...
|
...
|
|