Merge branch 'master' of http://101.43.112.107:3000/root/allLikeMall into cxw
This commit is contained in:
commit
aed2d035c1
@ -53,18 +53,26 @@ public class LitemallReservationRespVO {
|
|||||||
@DictFormat("status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
@DictFormat("status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中
|
||||||
private Integer status;
|
private Integer status;
|
||||||
|
|
||||||
@Schema(description = "备注", example = "随便")
|
private String technicianName;
|
||||||
@ExcelProperty("备注")
|
|
||||||
private String remark;
|
|
||||||
|
|
||||||
@Schema(description = "创建时间")
|
@Schema(description = "创建时间")
|
||||||
@ExcelProperty("创建时间")
|
@ExcelProperty("创建时间")
|
||||||
private LocalDateTime createTime;
|
private LocalDateTime createTime;
|
||||||
|
|
||||||
@ExcelProperty("用户名称")
|
|
||||||
private String nickname;
|
|
||||||
|
|
||||||
@ExcelProperty("门店")
|
@ExcelProperty("门店")
|
||||||
private String brandName;
|
private String brandName;
|
||||||
|
|
||||||
|
@ExcelProperty("用户名称")
|
||||||
|
private String nickname;
|
||||||
|
|
||||||
|
//电话
|
||||||
|
private String memberphone;
|
||||||
|
|
||||||
|
//门店地址
|
||||||
|
private String brandaddress;
|
||||||
|
|
||||||
|
@Schema(description = "备注", example = "随便")
|
||||||
|
@ExcelProperty("备注")
|
||||||
|
private String remark;
|
||||||
}
|
}
|
@ -111,12 +111,14 @@ 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.getName());
|
litemallReservationDO.setNickname(memberUserDO.getNickname());
|
||||||
|
litemallReservationDO.setMemberphone(memberUserDO.getMobile());
|
||||||
}
|
}
|
||||||
|
|
||||||
return litemallReservationDOPageResult;
|
return litemallReservationDOPageResult;
|
||||||
|
Loading…
Reference in New Issue
Block a user