root/allLikeMall
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: root:8cc065e5983db6656d665b7cdac0874a2287c6cc
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy
..
compare: root:b9f05915785e612ada461f881095217090028115
Branches Tags
root:master
root:sjy-three
root:Branch_chensl
root:sjy-two
root:khy-two
root:cxw
root:khy1
root:Branch_csl
root:lu
root:sjy-one
root:zzw-one
root:sjy

No commits in common. "8cc065e5983db6656d665b7cdac0874a2287c6cc" and "b9f05915785e612ada461f881095217090028115" have entirely different histories.
8cc065e598 ... b9f0591578

2 changed files with 6 additions and 16 deletions
Show Stats Expand all files Collapse all files

18
yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/controller/admin/reservation/vo/LitemallReservationRespVO.java
View File

@ -53,26 +53,18 @@ public class LitemallReservationRespVO {
@DictFormat("status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 @DictFormat("status") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中
private Integer status; private Integer status;
private String technicianName; @Schema(description = "备注", example = "随便")
@ExcelProperty("备注")
private String remark;
@Schema(description = "创建时间") @Schema(description = "创建时间")
@ExcelProperty("创建时间") @ExcelProperty("创建时间")
private LocalDateTime createTime; private LocalDateTime createTime;
@ExcelProperty("门店")
private String brandName;
@ExcelProperty("用户名称") @ExcelProperty("用户名称")
private String nickname; private String nickname;
//电话 @ExcelProperty("门店")
private String memberphone; private String brandName;
//门店地址
private String brandaddress;
@Schema(description = "备注", example = "随便")
@ExcelProperty("备注")
private String remark;
} }

4
yudao-module-subscribe/yudao-module-subscribe-biz/src/main/java/cn/iocoder/yudao/module/srbscribe/service/reservation/LitemallReservationServiceImpl.java
View File

@ -111,14 +111,12 @@ public class LitemallReservationServiceImpl implements LitemallReservationServic
LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId()); LitemallBrandDO litemallBrandDO = litemallBrandMapper.selectOne("id", litemallReservationDO.getBrandId());
litemallReservationDO.setBrandName(litemallBrandDO.getName()); litemallReservationDO.setBrandName(litemallBrandDO.getName());
litemallReservationDO.setBrandaddress(litemallBrandDO.getAddress());
LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId()); LitemallTechnicianDO litemallTechnicianDO = litemallTechnicianMapper.selectOne("id", litemallReservationDO.getTechnicianId());
litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName()); litemallReservationDO.setTechnicianName(litemallTechnicianDO.getTechnicianName());
MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId()); MemberUserDO memberUserDO = memberUserMapper.selectOne("id", litemallReservationDO.getUserId());
litemallReservationDO.setNickname(memberUserDO.getNickname()); litemallReservationDO.setNickname(memberUserDO.getName());
litemallReservationDO.setMemberphone(memberUserDO.getMobile());
} }
return litemallReservationDOPageResult; return litemallReservationDOPageResult;