Authored by chenchao

fix refresh bug

@@ -195,8 +195,8 @@ public class SkupListService { @@ -195,8 +195,8 @@ public class SkupListService {
195 int type; 195 int type;
196 if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){ 196 if ((type=request.getType()) == SellerOrderListType.IN_SALE.getType()){
197 List<Integer> statusList = sellerOrderListService.initOrderListRequest(request); 197 List<Integer> statusList = sellerOrderListService.initOrderListRequest(request);
198 -  
199 - int total = sellerOrderGoodsViewMapper.selectNotEntryCntByUidStatus(request.getUid(), statusList, NORMAL_SKUPTYPES); 198 + List<Integer> skupTypesCondition = NORMAL_SKUPTYPES;
  199 + int total = sellerOrderGoodsViewMapper.selectNotEntryCntByUidStatus(request.getUid(), statusList, skupTypesCondition);
200 respBuilder = PageResp.builder() 200 respBuilder = PageResp.builder()
201 .page(request.getPage()) 201 .page(request.getPage())
202 .pageSize(limit) 202 .pageSize(limit)
@@ -207,7 +207,7 @@ public class SkupListService { @@ -207,7 +207,7 @@ public class SkupListService {
207 } 207 }
208 int offset = (request.getPage() - 1) * limit; 208 int offset = (request.getPage() - 1) * limit;
209 List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectNotEntryListByUidStatus(request.getUid(), 209 List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectNotEntryListByUidStatus(request.getUid(),
210 - statusList, NORMAL_SKUPTYPES, offset, limit); 210 + statusList, skupTypesCondition, offset, limit);
211 //TODO 可以提前计算 total offset limit三者之间的关系,减少一次网络I 211 //TODO 可以提前计算 total offset limit三者之间的关系,减少一次网络I
212 if (CollectionUtils.isEmpty(sogList)){ 212 if (CollectionUtils.isEmpty(sogList)){
213 logger.warn("seller get order list SellerOrderGoods is empty,req {}", request); 213 logger.warn("seller get order list SellerOrderGoods is empty,req {}", request);
@@ -335,14 +335,15 @@ public class SkupListService { @@ -335,14 +335,15 @@ public class SkupListService {
335 sogCondition.setProductId(productId); 335 sogCondition.setProductId(productId);
336 sogCondition.setUid(uid); 336 sogCondition.setUid(uid);
337 sogCondition.setStatus(status); 337 sogCondition.setStatus(status);
  338 + List<Integer> skupTypesCondition = NORMAL_SKUPTYPES;
338 // 339 //
339 - int total = sellerOrderGoodsViewMapper.selectEntryCntByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES); 340 + int total = sellerOrderGoodsViewMapper.selectEntryCntByUidStatusGBSku(sogCondition, skupTypesCondition);
340 if (total == 0){ 341 if (total == 0){
341 return popDTO; 342 return popDTO;
342 } 343 }
343 344
344 int offset = 0, limit = total; 345 int offset = 0, limit = total;
345 - List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES, 346 + List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypesCondition,
346 offset, limit); 347 offset, limit);
347 if (CollectionUtils.isEmpty(sogList)){ 348 if (CollectionUtils.isEmpty(sogList)){
348 logger.warn("seller getPrdOverPriceDTO use SellerOrderGoods is empty,uid {} productId {}", uid, productId); 349 logger.warn("seller getPrdOverPriceDTO use SellerOrderGoods is empty,uid {} productId {}", uid, productId);
@@ -468,7 +469,7 @@ public class SkupListService { @@ -468,7 +469,7 @@ public class SkupListService {
468 sogCondition.setProductId(productId=req.getProductId()); 469 sogCondition.setProductId(productId=req.getProductId());
469 sogCondition.setUid(uid); 470 sogCondition.setUid(uid);
470 sogCondition.setStatus(status); 471 sogCondition.setStatus(status);
471 - List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, NORMAL_SKUPTYPES, 0, 1); 472 + List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, ENTRY_SKUP_TYPES, 0, 1);
472 if (CollectionUtils.isEmpty(sogList)){ 473 if (CollectionUtils.isEmpty(sogList)){
473 logger.warn("in getOrderListInfo soglist is empty req {}", req); 474 logger.warn("in getOrderListInfo soglist is empty req {}", req);
474 return null; 475 return null;