diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java index 5d00260..df02dcb 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java @@ -53,18 +53,26 @@ public class LitemallReservationRespVO { @DictFormat("status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Integer status; - @Schema(description = "备注", example = "随便") - @ExcelProperty("备注") - private String remark; + private String technicianName; + @Schema(description = "创建时间") @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("用户名称") - private String nickname; - @ExcelProperty("门店") private String brandName; + @ExcelProperty("用户名称") + private String nickname; + + //电话 + private String memberphone; + + //门店地址 + private String brandaddress; + + @Schema(description = "备注", example = "随便") + @ExcelProperty("备注") + private String remark; } \ No newline at end of file diff --git a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java index 6c13674..00921a3 100644 --- a/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java +++ b/yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java @@ -111,12 +111,14 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId()); litemallReservationDO.setBrandName(litemallBrandDO.getName()); + litemallReservationDO.setBrandaddress(litemallBrandDO.getAddress()); LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId()); litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName()); MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId()); - litemallReservationDO.setNickname(memberUserDO.getName()); + litemallReservationDO.setNickname(memberUserDO.getNickname()); + litemallReservationDO.setMemberphone(memberUserDO.getMobile()); } return litemallReservationDOPageResult;