quyixiao/eb-service-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交悠

Browse Source
This commit is contained in:
quyixiao 2025-08-25 09:25:24 +08:00
parent 8785d3f680
commit 3585d87ba9
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java
View File

@ -9,6 +9,7 @@ package com.heyu.api.data.dao.vv;
*/ */
import com.heyu.api.data.entity.vv.VvPackageEntity; import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -38,5 +39,5 @@ public interface VvPackageDao extends BaseMapper<VvPackageEntity> {
List<VvPackageEntity> selectVvPackageByTrackNumbers(List<String> trackNumbers); List<VvPackageEntity> selectVvPackageByTrackNumbers(@IN List<String> trackNumber);
} }

1
api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderDao.java
View File

@ -57,6 +57,7 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
@OrderBy(VvTradeOrderEntity.id_) @OrderBy(VvTradeOrderEntity.id_)
List<VvTradeOrderEntity> selectAppByCondition(IPage page, List<VvTradeOrderEntity> selectAppByCondition(IPage page,
@IF@IN List<Long> orderIds, @IF@IN List<Long> orderIds,
@IF Long buyerId,
@IF String status, @IF String status,
@IF @GE Long minCreateTimestamp, @IF @GE Long minCreateTimestamp,
@IF@LE Long maxCreateTimestamp, @IF@LE Long maxCreateTimestamp,

11
api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java
View File

@ -85,6 +85,7 @@ public class AppOrderController {
public List doSelect(IPage page) { public List doSelect(IPage page) {
return vvTradeOrderDao.selectAppByCondition(page, return vvTradeOrderDao.selectAppByCondition(page,
vvOrderRequest.getOrderIds(), vvOrderRequest.getOrderIds(),
vvOrderRequest.getBuyerId(),
vvOrderRequest.getStatus(), vvOrderRequest.getStatus(),
vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(),
@ -99,18 +100,17 @@ public class AppOrderController {
for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) { for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) {
tradeOrderIds.add(vvTradeOrderEntity.getId()); tradeOrderIds.add(vvTradeOrderEntity.getId());
} }
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds); List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds);
List<String> trackNumbers = new ArrayList<>(); List<String> trackNumbers = new ArrayList<>();
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : list) { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : list) {
trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber()); if(StringUtils.isNotBlank(vvTradeOrderLineEntity.getTrackNumber())){
trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber());
}
} }
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>(); Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(trackNumbers)) { if (CollectionUtils.isNotEmpty(trackNumbers)) {
List<VvPackageEntity> packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers); List<VvPackageEntity> packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers);
for (VvPackageEntity packageEntity : packageEntities) { for (VvPackageEntity packageEntity : packageEntities) {
@ -147,8 +147,9 @@ public class AppOrderController {
} }
List<VvTradeOrderLineEntity> vvTradeOrderLineEntitys = packageDTO.getVvTradeOrderLineEntityList(); List<VvTradeOrderLineEntity> vvTradeOrderLineEntitys = packageDTO.getVvTradeOrderLineEntityList();
if (vvTradeOrderLineEntitys == null) { if (vvTradeOrderLineEntitys == null) {
vvTradeOrderLineEntitys.add(tradeOrderLineEntity); vvTradeOrderLineEntitys = new ArrayList<>();
} }
vvTradeOrderLineEntitys.add(tradeOrderLineEntity);
packageDTO.setVvTradeOrderLineEntityList(vvTradeOrderLineEntitys); packageDTO.setVvTradeOrderLineEntityList(vvTradeOrderLineEntitys);
packageDTOMap.put(tradeOrderLineEntity.getTrackNumber(), packageDTO); packageDTOMap.put(tradeOrderLineEntity.getTrackNumber(), packageDTO);