From 334ea41b033d421ecc33fb7e875bca94259f3b72 Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Sun, 16 Nov 2025 17:30:30 +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 --- .../request/mm/VvAppLogisticsRequest.java | 9 ++++ .../request/mm/order/VvDeliveredDTO.java | 6 +++ .../order/resp/VvAdminLogisticsRequest.java | 29 +++++++++++ .../mm/AdminLogisticsController.java | 49 +++++++++++++++++++ .../controller/vv/AppLogisticsController.java | 4 -- 5 files changed, 93 insertions(+), 4 deletions(-) create mode 100644 api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java create mode 100644 api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLogisticsController.java diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java index 9d58232..994d1c5 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvAppLogisticsRequest.java @@ -1,5 +1,6 @@ package com.heyu.api.alibaba.request.mm; +import com.alibaba.fastjson.JSON; import com.heyu.api.alibaba.request.vv.AppBaseRequest; import lombok.Data; @@ -14,6 +15,14 @@ public class VvAppLogisticsRequest extends AppBaseRequest { */ private String trackNumber; + + public static void main(String[] args) { + VvAppLogisticsRequest vvAppLogisticsRequest = new VvAppLogisticsRequest(); + vvAppLogisticsRequest.setTrackNumber("JT3137200563019"); + vvAppLogisticsRequest.setBuyerId(7L); + System.out.println(JSON.toJSONString(vvAppLogisticsRequest)); + } + } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvDeliveredDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvDeliveredDTO.java index 4a8f6b3..10744d8 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvDeliveredDTO.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvDeliveredDTO.java @@ -1,6 +1,7 @@ package com.heyu.api.alibaba.request.mm.order; +import com.alibaba.fastjson.JSON; import com.heyu.api.alibaba.request.mm.AdminBaseDTO; import lombok.Data; @@ -12,6 +13,11 @@ public class VvDeliveredDTO extends AdminBaseDTO { private String trackNumber; + public static void main(String[] args) { + VvDeliveredDTO vvDeliveredDTO = new VvDeliveredDTO(); + vvDeliveredDTO.setTrackNumber("123"); + System.out.println(JSON.toJSONString(vvDeliveredDTO)); + } } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java new file mode 100644 index 0000000..356a4a0 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/VvAdminLogisticsRequest.java @@ -0,0 +1,29 @@ +package com.heyu.api.alibaba.request.mm.order.resp; + +import com.alibaba.fastjson.JSON; +import com.heyu.api.alibaba.request.vv.AppBaseRequest; +import lombok.Data; + +@Data +public class VvAdminLogisticsRequest extends AppBaseRequest { + + + + /*** + * + * 物流单号 + */ + private String trackNumber; + + + public static void main(String[] args) { + VvAdminLogisticsRequest vvAppLogisticsRequest = new VvAdminLogisticsRequest(); + vvAppLogisticsRequest.setTrackNumber("JT3137200563019"); + vvAppLogisticsRequest.setBuyerId(7L); + System.out.println(JSON.toJSONString(vvAppLogisticsRequest)); + } + +} + + + diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLogisticsController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLogisticsController.java new file mode 100644 index 0000000..62debaa --- /dev/null +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminLogisticsController.java @@ -0,0 +1,49 @@ +package com.heyu.api.controller.mm; + + +import com.heyu.api.alibaba.request.mm.order.resp.VvAdminLogisticsRequest; +import com.heyu.api.common.annotation.Describe; +import com.heyu.api.data.dao.vv.VvPackageDao; +import com.heyu.api.data.dao.vv.VvTradeOrderLineDao; +import com.heyu.api.data.dto.vv.KuaiDi100DTO; +import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; +import com.heyu.api.data.enums.RoleEnums; +import com.heyu.api.data.service.vv.VvPackageService; +import com.heyu.api.data.utils.R; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@Slf4j +@RestController +@RequestMapping("/mm/logistics") +public class AdminLogisticsController { + + + @Autowired + private VvPackageDao vvPackageDao; + + @Autowired + private VvTradeOrderLineDao vvTradeOrderLineDao; + + @Autowired + private VvPackageService vvPackageService; + + // http://localhost:8888/mm/logistics/query + @Describe("物流查询") + @RequestMapping("/query") + public R query(@RequestBody VvAdminLogisticsRequest request) { + List vvTradeOrderLineEntity = vvTradeOrderLineDao.selectVvTradeOrderLineByBuyerIdTrackNumber(request.getBuyerId(), request.getTrackNumber()); + if (CollectionUtils.isEmpty(vvTradeOrderLineEntity)) { + return R.error("trackNumber不是你的"); + } + KuaiDi100DTO kuaiDi100DTO = vvPackageService.selectVvKuaidiAndUpdateData(request.getTrackNumber(), RoleEnums.user.getRole()); + return R.ok().setData(kuaiDi100DTO); + } + +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java index 29f5add..6a2884d 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppLogisticsController.java @@ -43,12 +43,8 @@ public class AppLogisticsController { if (CollectionUtils.isEmpty(vvTradeOrderLineEntity)) { return R.error("trackNumber不是你的"); } - KuaiDi100DTO kuaiDi100DTO = vvPackageService.selectVvKuaidiAndUpdateData(request.getTrackNumber(), RoleEnums.user.getRole()); - - return R.ok().setData(kuaiDi100DTO); } - }