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-10-16 09:38:56 +08:00
parent a9a938fc51
commit 6a9814c83e
5 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,10 +62,7 @@ public interface VvTradeOrderDao extends BaseMapper<VvTradeOrderEntity> {
@IF@LE Long maxCreateTimestamp, @IF@LE Long maxCreateTimestamp,
@IF String createTimestampSort); @IF String createTimestampSort);
Integer updateByBuerIdAndIds(String status,@By Long buyerId,@By Long id);
void updateByBuerIdAndIds(String status,@By Long buyerId,@By List<Long> ids);
List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IFNullReturnEmpty @IN List<Long> id); List<VvTradeOrderEntity> selectVvTradeOrderByTradeOrderIds(@IFNullReturnEmpty @IN List<Long> id);

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

@ -127,6 +127,7 @@ public interface VvTradeOrderLineDao extends BaseMapper<VvTradeOrderLineEntity>
List<VvTradeOrderLineEntity> selectByAppCondition(IPage page, List<VvTradeOrderLineEntity> selectByAppCondition(IPage page,
@IF @IN List<Long> tradeOrderIds, @IF @IN List<Long> tradeOrderIds,
@IF String status, @IF String status,
@IF@NE String deleteStatus,
@IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp, @IF @GE @Column(VvTradeOrderLineEntity.create_timestamp) Long minCreateTimestamp,
@IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp, @IF @LE @Column(VvTradeOrderLineEntity.create_timestamp) Long maxCreateTimestamp,
@IF @LIKE String productName, @IF @LIKE String productName,

13
api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvTradeOrderDeleteDTO.java
View File

@ -3,16 +3,21 @@ package com.heyu.api.alibaba.request.mm.order.resp;
import lombok.Data; import lombok.Data;
import java.util.List;
@Data @Data
public class VvTradeOrderDeleteDTO { public class VvTradeOrderDeleteDTO {
private List<Long> ids ; /***
* 物流单号
*/
private String trackNumber;
/***
* 买家id
*/
private Long buyerId ; private Long buyerId ;
} }

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

@ -32,7 +32,7 @@ public class AppOrderRequest {
private Long maxCreateTimestamp; private Long maxCreateTimestamp;
/** /**
* 按时间排序 * 按时间排序 ASC , DESC
*/ */
private String createTimestampSort; private String createTimestampSort;
@ -40,6 +40,8 @@ public class AppOrderRequest {
// wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered
private String status; private String status;
/*** /***
* 逆向状态 * 逆向状态
*/ */

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

@ -75,6 +75,7 @@ public class AppOrderController {
return vvTradeOrderLineDao.selectByAppCondition(page, return vvTradeOrderLineDao.selectByAppCondition(page,
vvOrderRequest.getTradeOrderIds(), vvOrderRequest.getTradeOrderIds(),
vvOrderRequest.getStatus(), vvOrderRequest.getStatus(),
OrderStatusEnums.delete.getStatus(),
vvOrderRequest.getMinCreateTimestamp(), vvOrderRequest.getMinCreateTimestamp(),
vvOrderRequest.getMaxCreateTimestamp(), vvOrderRequest.getMaxCreateTimestamp(),
vvOrderRequest.getProductName(), vvOrderRequest.getProductName(),
@ -84,8 +85,6 @@ public class AppOrderController {
); );
} }
}); });
// 获取子单 // 获取子单
List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = pageUtils.getRows(); List<VvTradeOrderLineEntity> vvTradeOrderLineEntities = pageUtils.getRows();
// 获取订单 // 获取订单
@ -261,13 +260,13 @@ public class AppOrderController {
@RequestMapping("/delete") @RequestMapping("/delete")
public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) { public R add(@RequestBody VvTradeOrderDeleteDTO vvOrderRequest) {
vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvOrderRequest.getIds()); List<VvTradeOrderLineEntity> vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvOrderRequest.getTrackNumber());
for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
vvTradeOrderDao.updateByBuerIdAndIds(OrderStatusEnums.delete.getStatus(), vvOrderRequest.getBuyerId(), vvTradeOrderLineEntity.getId());
}
return R.ok(); return R.ok();
} }
/*** /***
* 订单 妥投 /app/order/delivered * 订单 妥投 /app/order/delivered
*/ */