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-26 08:06:41 +08:00
parent c3e661d4c0
commit cdb65fd698
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java Normal file
View File

@ -0,0 +1,20 @@
package com.heyu.api.alibaba.request.mm.order;
import lombok.Data;
import java.util.List;
@Data
public class AppDeliveredDTO {
/***
* 子订单号
*/
private List<Long> tradeOrderLineIds;
}

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

@ -4,6 +4,7 @@ package com.heyu.api.controller.vv;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
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.data.dao.vv.*;
@ -100,11 +101,11 @@ public class AppOrderController {
for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) {
tradeOrderIds.add(vvTradeOrderEntity.getId());
}
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds,vvOrderRequest.getStatus());
List<VvTradeOrderLineEntity> list = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIds(tradeOrderIds, vvOrderRequest.getStatus());
List<String> trackNumbers = new ArrayList<>();
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : list) {
if(StringUtils.isNotBlank(vvTradeOrderLineEntity.getTrackNumber())){
if (StringUtils.isNotBlank(vvTradeOrderLineEntity.getTrackNumber())) {
trackNumbers.add(vvTradeOrderLineEntity.getTrackNumber());
}
}
@ -312,4 +313,31 @@ public class AppOrderController {
vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvOrderRequest.getIds());
return R.ok();
}
/***
* 订单 妥投
*/
@RequestMapping("/delivered")
public R topack(@RequestBody AppDeliveredDTO vvDeliveredDTO) {
List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvDeliveredDTO.getTradeOrderLineIds());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
return R.error("订单状态不对");
}
}
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.delivered.getStatus());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
}
Long tradeOrderId = vvTradeOrderLineEntityList.get(0).getTradeOrderId();
List<VvTradeOrderLineEntity> countList = vvTradeOrderLineDao.selectVvTradeOrderLineByTradeOrderIdNEStatus(tradeOrderId, OrderStatusEnums.delivered.getStatus());
if (CollectionUtils.isEmpty(countList)) {
VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(tradeOrderId);
vvTradeOrderEntity.setStatus(OrderStatusEnums.delivered.getStatus());
vvTradeOrderDao.updateVvTradeOrderById(vvTradeOrderEntity);
}
return R.ok();
}
}