...
|
...
|
@@ -195,8 +195,8 @@ public class SkupListService { |
|
|
int type;
|
|
|
if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){
|
|
|
List<Integer> statusList = sellerOrderListService.initOrderListRequest(request);
|
|
|
|
|
|
int total = sellerOrderGoodsViewMapper.selectNotEntryCntByUidStatus(request.getUid(), statusList, NORMAL_SKUPTYPES);
|
|
|
List<Integer> skupTypesCondition = NORMAL_SKUPTYPES;
|
|
|
int total = sellerOrderGoodsViewMapper.selectNotEntryCntByUidStatus(request.getUid(), statusList, skupTypesCondition);
|
|
|
respBuilder = PageResp.builder()
|
|
|
.page(request.getPage())
|
|
|
.pageSize(limit)
|
...
|
...
|
@@ -207,7 +207,7 @@ public class SkupListService { |
|
|
}
|
|
|
int offset = (request.getPage() - 1) * limit;
|
|
|
List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectNotEntryListByUidStatus(request.getUid(),
|
|
|
statusList, NORMAL_SKUPTYPES, offset, limit);
|
|
|
statusList, skupTypesCondition, offset, limit);
|
|
|
//TODO 可以提前计算 total offset limit三者之间的关系,减少一次网络I
|
|
|
if (CollectionUtils.isEmpty(sogList)){
|
|
|
logger.warn("seller get order list SellerOrderGoods is empty,req {}", request);
|
...
|
...
|
@@ -335,14 +335,15 @@ public class SkupListService { |
|
|
sogCondition.setProductId(productId);
|
|
|
sogCondition.setUid(uid);
|
|
|
sogCondition.setStatus(status);
|
|
|
List<Integer> skupTypesCondition = NORMAL_SKUPTYPES;
|
|
|
//
|
|
|
int total = sellerOrderGoodsViewMapper.selectEntryCntByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES);
|
|
|
int total = sellerOrderGoodsViewMapper.selectEntryCntByUidStatusGBSku(sogCondition, skupTypesCondition);
|
|
|
if (total == 0){
|
|
|
return popDTO;
|
|
|
}
|
|
|
|
|
|
int offset = 0, limit = total;
|
|
|
List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES,
|
|
|
List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypesCondition,
|
|
|
offset, limit);
|
|
|
if (CollectionUtils.isEmpty(sogList)){
|
|
|
logger.warn("seller getPrdOverPriceDTO use SellerOrderGoods is empty,uid {} productId {}", uid, productId);
|
...
|
...
|
@@ -468,7 +469,7 @@ public class SkupListService { |
|
|
sogCondition.setProductId(productId=req.getProductId());
|
|
|
sogCondition.setUid(uid);
|
|
|
sogCondition.setStatus(status);
|
|
|
List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES, 0, 1);
|
|
|
List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, ENTRY_SKUP_TYPES, 0, 1);
|
|
|
if (CollectionUtils.isEmpty(sogList)){
|
|
|
logger.warn("in getOrderListInfo soglist is empty req {}", req);
|
|
|
return null;
|
...
|
...
|
|