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-27 08:36:12 +08:00
parent bd8569770f
commit dd017c9b0f
2 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java
View File

@ -16,7 +16,7 @@ public class AppOrderRequest {
private Long buyerId;
private List<Long> orderIds;
private List<Long> tradeOrderIds;
//商品名称 , 子单维度
private String productName;
@ -38,4 +38,9 @@ public class AppOrderRequest {
private String status;
/***
* 逆向状态
*/
private String reverseStatus;
}

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

@ -7,6 +7,7 @@ import com.heyu.api.alibaba.request.mm.enums.OrderStatusEnums;
import com.heyu.api.alibaba.request.mm.order.AppDeliveredDTO;
import com.heyu.api.alibaba.request.mm.order.resp.*;
import com.heyu.api.alibaba.request.vv.AppOrderRequest;
import com.heyu.api.common.SanUtils;
import com.heyu.api.data.dao.vv.*;
import com.heyu.api.data.entity.vv.*;
import com.heyu.api.data.utils.BigDecimalUtil;
@ -67,49 +68,69 @@ public class AppOrderController {
*/
@RequestMapping("/list")
public R list(@RequestBody AppOrderRequest vvOrderRequest) {
if (StringUtils.isNotBlank(vvOrderRequest.getProductName())) {
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByProductName(vvOrderRequest.getProductName());
List<Long> orderIds = new ArrayList<>();
if (CollectionUtils.isNotEmpty(vvOrderRequest.getOrderIds())) {
orderIds.addAll(vvOrderRequest.getOrderIds());
}
for (VvTradeOrderLineEntity tradeOrderLineEntity : list) {
orderIds.add(tradeOrderLineEntity.getTradeOrderId());
}
vvOrderRequest.setOrderIds(orderIds);
}
PPageUtils pageUtils = PPageUtils.startPage(vvOrderRequest.getPageNum(), vvOrderRequest.getPageSize())
.doSelect(new ISelect() {
@Override
public List doSelect(IPage page) {
return vvTradeOrderDao.selectAppByCondition(page,
vvOrderRequest.getOrderIds(),
vvOrderRequest.getBuyerId(),
return vvTradeOrderLineDao.selectByAdminCondition(page,
vvOrderRequest.getTradeOrderIds(),
null,
null,
null,
null,
null,
vvOrderRequest.getStatus(),
null,
vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(),
null,
null,
vvOrderRequest.getBuyerId(),
vvOrderRequest.getReverseStatus(),
vvOrderRequest.getCreateTimestampSort()
);
}
});
List<VvTradeOrderEntity> vvTradeOrderEntities = pageUtils.getRows();
List<Long> tradeOrderIds = new ArrayList<>();
for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) {
tradeOrderIds.add(vvTradeOrderEntity.getId());
// 获取子单
List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = pageUtils.getRows();
// 获取订单
List<Long> tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities,VvTradeOrderLineEntity::getTradeOrderId );
List<VvTradeOrderEntity> tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds);
// 对订单进行排序，必须按照子单的顺序
Map<Long, VvTradeOrderEntity> vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId);
List<VvTradeOrderEntity> vvTradeOrderEntities = new ArrayList<>();
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) {
vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()));
}
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds, vvOrderRequest.getStatus());
List<String> trackNumbers = new ArrayList<>();
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : list) {
if (StringUtils.isNotBlank(vvTradeOrderLineEntity.getTrackNumber())) {
trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber());
}
}
// 重新获取子单
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectByAdminConditionList(
vvOrderRequest.getTradeOrderIds(),
null,
null,
null,
null,
null,
vvOrderRequest.getStatus(),
null,
vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(),
null,
null,
vvOrderRequest.getBuyerId(),
vvOrderRequest.getReverseStatus(),
vvOrderRequest.getCreateTimestampSort());
List<String> trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber);
Map<String, VvPackageEntity> vvPackageEntityMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(trackNumbers)) {
List<VvPackageEntity> packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers);
@ -187,8 +208,6 @@ public class AppOrderController {
}
Set<Long> productIds = new HashSet<>();
List<VvSkuPropertyValueEntity> vvSkuPropertyValueList = vvSkuPropertyValueDao.selectVvSkuPropertyValueBySkuIds(skuIds);
Map<Long, List<VvSkuPropertyValueEntity>> vvSkuPropertyValueMap = new HashMap<>();
for (VvSkuPropertyValueEntity vvSkuPropertyValueEntity : vvSkuPropertyValueList) {