From 12fa45989f1515fd4f38b28cadd8bbee08686774 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Wed, 15 Oct 2025 23:19:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java | 4 ++++ .../alibaba/request/mm/enums/OrderStatusEnums.java | 3 ++- .../api/alibaba/request/mm/order/AppDeliveredDTO.java | 9 +++------ .../heyu/api/controller/vv/AppOrderController.java | 11 +++++++---- .../api/controller/vv/AppShoppingCartController.java | 6 +++--- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java index dbb1df9..1f24879 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineDao.java @@ -138,4 +138,8 @@ public interface VvTradeOrderLineDao extends BaseMapper List selectVvTradeOrderLineByTrackNumberGroupBySkuId(String trackNumber); int updateVvTradeOrderLineCommentIdById(Long commentId,@By Long id); + + + + List selectVvTradeOrderLineByTrackNumber(String trackNumber); } \ No newline at end of file diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java index 6e184cc..9e3a64b 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/enums/OrderStatusEnums.java @@ -5,7 +5,8 @@ public enum OrderStatusEnums { wait_pay("wait_pay","待支付"), wait_shipping("wait_shipping","待发货"), - cancel("cancel","取消"), + cancel("cancel","买家取消订单"), + close("close","卖家关闭订单"), shipping("shipping","已发货"), delivered("delivered","已签收"), all_refund("all_refund","全部退款"), diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java index 5407f11..61fd754 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/AppDeliveredDTO.java @@ -3,17 +3,14 @@ package com.heyu.api.alibaba.request.mm.order; import lombok.Data; -import java.util.List; - @Data public class AppDeliveredDTO { + /*** - * 子订单号 + * trackNumber */ - private List tradeOrderLineIds; - - + private String trackNumber; } 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 7b134c2..2c47ce0 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 @@ -64,6 +64,7 @@ public class AppOrderController { * https://api.1024api.com/api-interface/app/order/list * * 列表 + * todo quyixiao */ @RequestMapping("/list") public R list(@RequestBody AppOrderRequest vvOrderRequest) { @@ -107,7 +108,6 @@ public class AppOrderController { for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { AppTradeOrderLineResp appTradeOrderLineResp = new AppTradeOrderLineResp(); - BeanUtils.copyProperties(vvTradeOrderLineEntity, appTradeOrderLineResp); VvPackageEntity packageDTO = vvPackageEntityMap.get(vvTradeOrderLineEntity.getTrackNumber()); @@ -115,6 +115,7 @@ public class AppOrderController { VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId()); appTradeOrderLineResp.setVvPackageEntity(packageDTO); + appTradeOrderLineResp.setTradeOrderEntity(vvTradeOrderEntity); vvOrderListResps.add(appTradeOrderLineResp); @@ -124,7 +125,7 @@ public class AppOrderController { /*** - * 列表 + * 订单添加 */ @RequestMapping("/add") public R add(@RequestBody VvTradeOrderDTO vvOrderRequest) { @@ -265,12 +266,14 @@ public class AppOrderController { } + + /*** - * 订单 妥投 + * 订单 妥投 /app/order/delivered */ @RequestMapping("/delivered") public R topack(@RequestBody AppDeliveredDTO vvDeliveredDTO) { - List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvDeliveredDTO.getTradeOrderLineIds()); + List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(vvDeliveredDTO.getTrackNumber()); for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) { if (!OrderStatusEnums.shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) { return R.error("订单状态不对"); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java index 80dc49d..21b8e55 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppShoppingCartController.java @@ -95,7 +95,7 @@ public class AppShoppingCartController { /*** - * 更新 或 添加 ，如数量更新 + * 更新 或 添加 ，如数量更新 /app/shipping/cart/addOrUpdate */ @RequestMapping("/addOrUpdate") public R add(@RequestBody VvShoppingCartAddRequest VvShoppingCartAddRequest) { @@ -114,8 +114,8 @@ public class AppShoppingCartController { vvShoppingCartEntity.setProductId(vvSkuEntity.getProductId()); - vvShoppingCartEntity.setSinglePrice(vvSkuEntity.getSalePrice()); - vvShoppingCartEntity.setAllPrice(BigDecimalUtil.multiply(vvSkuEntity.getSalePrice(), new BigDecimal(VvShoppingCartAddRequest.getNum()))); + vvShoppingCartEntity.setSinglePrice(vvSkuEntity.getPromotionPrice()); + vvShoppingCartEntity.setAllPrice(BigDecimalUtil.multiply(vvSkuEntity.getPromotionPrice(), new BigDecimal(VvShoppingCartAddRequest.getNum()))); List vvSkuPropertyValueEntities = vvSkuPropertyValueDao.selectVvSkuPropertyValueBySkuId(vvShoppingCartEntity.getSkuId()); VvSkuPropertyValueEntity vvSkuPropertyValue = vvSkuPropertyValueEntities.get(0);