diff --git a/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100DTO.java b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100DTO.java index cc87b77..163cfda 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100DTO.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100DTO.java @@ -145,6 +145,10 @@ public class KuaiDi100DTO { private CourierInfoDTO courierInfo; // 从物流轨迹中提取出的快递员信息,当且仅当入参needCourierInfo=True时会返回 + + + + @NoArgsConstructor @Data public static class RouteInfoDTO { diff --git a/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100VO.java b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100VO.java new file mode 100644 index 0000000..eee5f54 --- /dev/null +++ b/api-mapper/src/main/java/com/heyu/api/data/dto/vv/KuaiDi100VO.java @@ -0,0 +1,16 @@ +package com.heyu.api.data.dto.vv; + + +import lombok.Data; + +@Data +public class KuaiDi100VO extends KuaiDi100DTO{ + + /*** + * 物流公司 + */ + private String logisticsCompany; + + + +} 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 index 15d94ea..924ff54 100644 --- 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 @@ -6,10 +6,13 @@ 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.dto.vv.KuaiDi100VO; import com.heyu.api.data.enums.RoleEnums; +import com.heyu.api.data.kuaidi100.LogisticsMapUtils; import com.heyu.api.data.service.vv.VvPackageService; import com.heyu.api.data.utils.R; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -34,8 +37,14 @@ public class AdminLogisticsController { @Describe("后台物流查询") @RequestMapping("/query") public R query(@RequestBody VvAdminLogisticsRequest request) { - KuaiDi100DTO kuaiDi100DTO = vvPackageService.selectVvKuaidiAndUpdateData(request.getTrackNumber(), RoleEnums.admin.getRole(),false); - return R.ok().setData(kuaiDi100DTO); + KuaiDi100DTO kuaiDi100DTO = vvPackageService.selectVvKuaidiAndUpdateData(request.getTrackNumber(), RoleEnums.admin.getRole(), false); + + KuaiDi100VO kuaiDi100VO = new KuaiDi100VO(); + BeanUtils.copyProperties(kuaiDi100DTO, kuaiDi100VO); + + String logisticsCompany = LogisticsMapUtils.getLogisticsCompanyName(kuaiDi100DTO.getCom()); + kuaiDi100VO.setLogisticsCompany(logisticsCompany); + return R.ok().setData(kuaiDi100VO); } }