diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java index 78a5bbe..916a7ec 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java @@ -9,6 +9,7 @@ package com.heyu.api.data.dao.vv; */ import com.heyu.api.data.entity.vv.VvPackageEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.mybatis.plugin.annotations.IN; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -38,5 +39,5 @@ public interface VvPackageDao extends BaseMapper { - List selectVvPackageByTrackNumbers(List trackNumbers); + List selectVvPackageByTrackNumbers(@IN List trackNumber); } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java index d568d7f..583708e 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java @@ -57,6 +57,7 @@ public interface VvTradeOrderDao extends BaseMapper { @OrderBy(VvTradeOrderEntity.id_) List selectAppByCondition(IPage page, @IF@IN List orderIds, + @IF Long buyerId, @IF String status, @IF @GE Long minCreateTimestamp, @IF@LE Long maxCreateTimestamp, diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index 864c192..be2cd35 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -85,6 +85,7 @@ public class AppOrderController { public List doSelect(IPage page) { return vvTradeOrderDao.selectAppByCondition(page, vvOrderRequest.getOrderIds(), + vvOrderRequest.getBuyerId(), vvOrderRequest.getStatus(), vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(), @@ -99,18 +100,17 @@ public class AppOrderController { for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) { tradeOrderIds.add(vvTradeOrderEntity.getId()); } - List list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds); List trackNumbers = new ArrayList<>(); for (VvTradeOrderLineEntity vvTradeOrderLineEntity : list) { - trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber()); + if(StringUtils.isNotBlank(vvTradeOrderLineEntity.getTrackNumber())){ + trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber()); + } } Map vvPackageEntityMap = new HashMap<>(); - - if (CollectionUtils.isNotEmpty(trackNumbers)) { List packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers); for (VvPackageEntity packageEntity : packageEntities) { @@ -147,8 +147,9 @@ public class AppOrderController { } List vvTradeOrderLineEntitys = packageDTO.getVvTradeOrderLineEntityList(); if (vvTradeOrderLineEntitys == null) { - vvTradeOrderLineEntitys.add(tradeOrderLineEntity); + vvTradeOrderLineEntitys = new ArrayList<>(); } + vvTradeOrderLineEntitys.add(tradeOrderLineEntity); packageDTO.setVvTradeOrderLineEntityList(vvTradeOrderLineEntitys); packageDTOMap.put(tradeOrderLineEntity.getTrackNumber(), packageDTO);