|
@@ -878,12 +878,12 @@ public class CmsOrderController {
|
|
|
@GetMapping("/get/sameSpec/empty/relation")
|
|
@GetMapping("/get/sameSpec/empty/relation")
|
|
|
public Result<SearchResult<EmptyGroupsRelationView>> getSameSpecEmptyRelation(Long skuId, Long groupsId, Long relationId, Boolean isNormal) {
|
|
public Result<SearchResult<EmptyGroupsRelationView>> getSameSpecEmptyRelation(Long skuId, Long groupsId, Long relationId, Boolean isNormal) {
|
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap())
|
|
MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap())
|
|
|
- .field(EmptyGroupsRelationView::getStatus, GroupsTrips.Status.down.name()).op(Operator.NotEqual);
|
|
|
|
|
|
|
+ .field(EmptyGroupsRelationView::getStatus, GroupsTrips.Status.down.name()).op(Operator.NotEqual).field(EmptyGroupsRelationView::getSkuId, skuId);
|
|
|
GoodsDonSku sku = skuMapper.selectById(skuId);
|
|
GoodsDonSku sku = skuMapper.selectById(skuId);
|
|
|
if (sku.getGoodsId() == Constant.NETFLIX_GID) {
|
|
if (sku.getGoodsId() == Constant.NETFLIX_GID) {
|
|
|
builder.orderBy(EmptyGroupsRelationView::getCreatedTime).desc().orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
|
|
builder.orderBy(EmptyGroupsRelationView::getCreatedTime).desc().orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
|
|
|
} else {
|
|
} else {
|
|
|
- builder.field(EmptyGroupsRelationView::getSkuId, skuId).orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
|
|
|
|
|
|
|
+ builder.orderBy(EmptyGroupsRelationView::getAvailableNum).desc();
|
|
|
}
|
|
}
|
|
|
Date expiryTime = null;
|
|
Date expiryTime = null;
|
|
|
if (relationId != null) {
|
|
if (relationId != null) {
|