BJ_ZTEITS-Developers / parking-cloud-yudao

Commit adbec22e95e5d8727aa71654443fa4885548f054

Authored by YunaiV
1 parent f587d4f7

feat（mall）：自提门店 admin 接口回填 areaName 

DeliveryPickUpStoreRespVO 加 areaName 字段；DeliveryPickUpStoreConvert 加 convert01（@Mapping areaId→areaName，复用 convertAreaIdToAreaName/AreaUtils.format）；/get 改用 convert01 返回 areaName。convertPage/convertList 间接复用 convert01，故 /page、/list 也会带出 areaName
Inline Side-by-side
Showing 3 changed files with 7 additions and 1 deletions
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java
  View file @adbec22
@@ -73,7 +73,7 @@ public class DeliveryPickUpStoreController { @@ -73,7 +73,7 @@ public class DeliveryPickUpStoreController {
73 } 73 }
74 List<AdminUserRespDTO> verifyUsers = CollUtil.isNotEmpty(deliveryPickUpStore.getVerifyUserIds()) ? 74 List<AdminUserRespDTO> verifyUsers = CollUtil.isNotEmpty(deliveryPickUpStore.getVerifyUserIds()) ?
75 adminUserApi.getUserList(deliveryPickUpStore.getVerifyUserIds()) : null; 75 adminUserApi.getUserList(deliveryPickUpStore.getVerifyUserIds()) : null;
76 - return success(BeanUtils.toBean(deliveryPickUpStore, DeliveryPickUpStoreRespVO.class) 76 + return success(DeliveryPickUpStoreConvert.INSTANCE.convert01(deliveryPickUpStore)
77 .setVerifyUsers(BeanUtils.toBean(verifyUsers, UserSimpleBaseVO.class))); 77 .setVerifyUsers(BeanUtils.toBean(verifyUsers, UserSimpleBaseVO.class)));
78 } 78 }
79 79
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreRespVO.java
  View file @adbec22
@@ -21,6 +21,9 @@ public class DeliveryPickUpStoreRespVO extends DeliveryPickUpStoreBaseVO { @@ -21,6 +21,9 @@ public class DeliveryPickUpStoreRespVO extends DeliveryPickUpStoreBaseVO {
21 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) 21 @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
22 private LocalDateTime createTime; 22 private LocalDateTime createTime;
23 23
  24 + @Schema(description = "地区名称", example = "上海上海市普陀区")
  25 + private String areaName;
  26 +
24 @Schema(description = "核销用户数组", requiredMode = Schema.RequiredMode.REQUIRED) 27 @Schema(description = "核销用户数组", requiredMode = Schema.RequiredMode.REQUIRED)
25 private List<UserSimpleBaseVO> verifyUsers; 28 private List<UserSimpleBaseVO> verifyUsers;
26 29
yudao-module-mall/yudao-module-trade/src/main/java/cn/iocoder/yudao/module/trade/convert/delivery/DeliveryPickUpStoreConvert.java
  View file @adbec22
@@ -30,6 +30,9 @@ public interface DeliveryPickUpStoreConvert { @@ -30,6 +30,9 @@ public interface DeliveryPickUpStoreConvert {
30 30
31 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page); 31 PageResult<DeliveryPickUpStoreRespVO> convertPage(PageResult<DeliveryPickUpStoreDO> page);
32 32
  33 + @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
  34 + DeliveryPickUpStoreRespVO convert01(DeliveryPickUpStoreDO bean);
  35 +
33 List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list); 36 List<DeliveryPickUpStoreSimpleRespVO> convertList1(List<DeliveryPickUpStoreDO> list);
34 @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName") 37 @Mapping(source = "areaId", target = "areaName", qualifiedByName = "convertAreaIdToAreaName")
35 DeliveryPickUpStoreSimpleRespVO convert02(DeliveryPickUpStoreDO bean); 38 DeliveryPickUpStoreSimpleRespVO convert02(DeliveryPickUpStoreDO bean);