|
@@ -37,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
|
@@ -37,10 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; |
37
|
import org.springframework.stereotype.Service;
|
37
|
import org.springframework.stereotype.Service;
|
38
|
|
38
|
|
39
|
import java.math.BigDecimal;
|
39
|
import java.math.BigDecimal;
|
40
|
-import java.util.List;
|
|
|
41
|
-import java.util.Map;
|
|
|
42
|
-import java.util.Objects;
|
|
|
43
|
-import java.util.Set;
|
40
|
+import java.util.*;
|
44
|
import java.util.stream.Collectors;
|
41
|
import java.util.stream.Collectors;
|
45
|
|
42
|
|
46
|
|
43
|
|
|
@@ -114,7 +111,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
|
@@ -114,7 +111,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
114
|
PageResp orderListInfoRsp;
|
111
|
PageResp orderListInfoRsp;
|
115
|
int type;
|
112
|
int type;
|
116
|
if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){
|
113
|
if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){
|
117
|
- List<Integer> statusList = initOrderListRequest(request);
|
114
|
+ List<Integer> statusList = getSkupStatusListV683();
|
118
|
|
115
|
|
119
|
int total = sellerOrderGoodsMapper.selectCntByUidStatusGBBNList(request.getUid(), statusList);
|
116
|
int total = sellerOrderGoodsMapper.selectCntByUidStatusGBBNList(request.getUid(), statusList);
|
120
|
int limit = request.getLimit();
|
117
|
int limit = request.getLimit();
|
|
@@ -269,6 +266,18 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
|
@@ -269,6 +266,18 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde |
269
|
}
|
266
|
}
|
270
|
return orderListInfo;
|
267
|
return orderListInfo;
|
271
|
}
|
268
|
}
|
|
|
269
|
+ private static List<Integer> skupStatusListV683 =Arrays.asList(
|
|
|
270
|
+ SkupStatus.CAN_NOT_SELL.getCode(),
|
|
|
271
|
+ SkupStatus.CAN_SELL.getCode(),
|
|
|
272
|
+ SkupStatus.YOHO_CANCEL_SELL.getCode(),
|
|
|
273
|
+ SkupStatus.SELF_CANCEL_PAY.getCode(),
|
|
|
274
|
+ SkupStatus.TIMEOUT_CANCEL.getCode(),
|
|
|
275
|
+ SkupStatus.SELLER_CANCEL_SELL.getCode()
|
|
|
276
|
+ );
|
|
|
277
|
+
|
|
|
278
|
+ public static List<Integer> getSkupStatusListV683(){
|
|
|
279
|
+ return skupStatusListV683;
|
|
|
280
|
+ }
|
272
|
|
281
|
|
273
|
@Override
|
282
|
@Override
|
274
|
protected List<Integer> initOrderListRequest(OrderListRequest request) {
|
283
|
protected List<Integer> initOrderListRequest(OrderListRequest request) {
|