Skip to content

P
peizhen-java
Commit 93f5dd53 by sdif
Options

用户端代码提交

parent ac690471
Showing with 76 additions and 24 deletions
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
......@@ -161,9 +161,18 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
yypzOrder.getStatus()
);
// totalOrderVo = BeanUtil.toBean(yypzOrder, TotalOrderVo.class);
totalOrderVo.setHospital(hospitalMapper.selectById(yypzOrder.getHid()).getName());
totalOrderVo.setVisitor(userVsitorMapper.selectById(yypzOrder.getVisitor()).getName());
totalOrderVo.setDepartment(departmentMapper.selectById(yypzOrder.getDid()).getTitle());
Optional.ofNullable(hospitalMapper.selectById(yypzOrder.getHid()))
.map(Hospital::getName)
.ifPresent(totalOrderVo::setHospital);
Optional.ofNullable(userVsitorMapper.selectById(yypzOrder.getVisitor()))
.map(UserVsitor::getName)
.ifPresent(totalOrderVo::setVisitor);
Optional.ofNullable(departmentMapper.selectById(yypzOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
//totalOrderVo.setHospital(hospitalMapper.selectById(yypzOrder.getHid()).getName());
//totalOrderVo.setVisitor(userVsitorMapper.selectById(yypzOrder.getVisitor()).getName());
//totalOrderVo.setDepartment(departmentMapper.selectById(yypzOrder.getDid()).getTitle());
totalOrderVo.setPhone(yypzOrder.getPhone());
totalOrderVo.setVisitTime(yypzOrder.getVisitTime());
totalOrderVo.setOverTime(yypzOrder.getOverTime());
......@@ -178,9 +187,18 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
dbghOrder.getStatus()
);
// totalOrderVo = BeanUtil.toBean(dbghOrder, TotalOrderVo.class);
totalOrderVo.setHospital(hospitalMapper.selectById(dbghOrder.getHid()).getName());
Optional.ofNullable(hospitalMapper.selectById(dbghOrder.getHid()))
.map(Hospital::getName)
.ifPresent(totalOrderVo::setHospital);
Optional.ofNullable(userVsitorMapper.selectById(dbghOrder.getVisitor()))
.map(UserVsitor::getName)
.ifPresent(totalOrderVo::setVisitor);
Optional.ofNullable(departmentMapper.selectById(dbghOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
/*totalOrderVo.setHospital(hospitalMapper.selectById(dbghOrder.getHid()).getName());
totalOrderVo.setDepartment(departmentMapper.selectById(dbghOrder.getDid()).getTitle());
totalOrderVo.setVisitor(userVsitorMapper.selectById(dbghOrder.getVisitor()).getName());
totalOrderVo.setVisitor(userVsitorMapper.selectById(dbghOrder.getVisitor()).getName());*/
totalOrderVo.setVisitTime(dbghOrder.getVisitTime());
totalOrderVo.setOverTime(dbghOrder.getOverTime());
totalOrderVo.setVoucher(dbghOrder.getVoucher());
......@@ -194,9 +212,18 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
);
// totalOrderVo = BeanUtil.toBean(dbwzOrder, TotalOrderVo.class);
// totalOrderVo = BeanUtil.toBean(dbwzOrder, TotalOrderVo.class);
totalOrderVo.setProject(servicesMapper.selectVoById(totalOrderVo.getServiceId()).getName());
Optional.ofNullable(servicesMapper.selectById(totalOrderVo.getServiceId()))
.map(Services::getName)
.ifPresent(totalOrderVo::setProject);
Optional.ofNullable(userVsitorMapper.selectById(dbwzOrder.getVisitor()))
.map(UserVsitor::getName)
.ifPresent(totalOrderVo::setVisitor);
Optional.ofNullable(departmentMapper.selectById(dbwzOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
/* totalOrderVo.setProject(servicesMapper.selectVoById(totalOrderVo.getServiceId()).getName());
totalOrderVo.setDepartment(departmentMapper.selectById(dbwzOrder.getDid()).getTitle());
totalOrderVo.setVisitor(userVsitorMapper.selectById(dbwzOrder.getVisitor()).getName());
totalOrderVo.setVisitor(userVsitorMapper.selectById(dbwzOrder.getVisitor()).getName());*/
totalOrderVo.setVisitTime(dbwzOrder.getVisitTime());
totalOrderVo.setChiefComplaint(dbwzOrder.getChiefComplaint());
totalOrderVo.setHistoryOfPresentIllness(dbwzOrder.getHistoryOfPresentIllness());
......@@ -217,9 +244,18 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
zyphOrder.getStatus()
);
// totalOrderVo = BeanUtil.toBean(zyphOrder, TotalOrderVo.class);
totalOrderVo.setHospital(hospitalMapper.selectById(zyphOrder.getHid()).getName());
Optional.ofNullable(hospitalMapper.selectById(zyphOrder.getHid()))
.map(Hospital::getName)
.ifPresent(totalOrderVo::setHospital);
Optional.ofNullable(userVsitorMapper.selectById(zyphOrder.getVisitor()))
.map(UserVsitor::getName)
.ifPresent(totalOrderVo::setVisitor);
Optional.ofNullable(departmentMapper.selectById(zyphOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
/*totalOrderVo.setHospital(hospitalMapper.selectById(zyphOrder.getHid()).getName());
totalOrderVo.setVisitor(userVsitorMapper.selectById(zyphOrder.getVisitor()).getName());
totalOrderVo.setDepartment(departmentMapper.selectById(zyphOrder.getDid()).getTitle());
totalOrderVo.setDepartment(departmentMapper.selectById(zyphOrder.getDid()).getTitle());*/
totalOrderVo.setPhrq(zyphOrder.getStartDay() + "-" + zyphOrder.getEndDay());
totalOrderVo.setPhsj(zyphOrder.getStartTime() + "-" + zyphOrder.getEndTime());
totalOrderVo.setOverTime(zyphOrder.getOverTime());
......@@ -253,10 +289,22 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
totalOrderVo.setServiceStatus(
zqghOrder.getStatus()
);
totalOrderVo.setHospital(hospitalMapper.selectById(zqghOrder.getHid()).getName());
Optional.ofNullable(hospitalMapper.selectById(zqghOrder.getHid()))
.map(Hospital::getName)
.ifPresent(totalOrderVo::setHospital);
/*Optional.ofNullable(userVsitorMapper.selectById(zqghOrder.getVisitor()))
.map(UserVsitor::getName)
.ifPresent(totalOrderVo::setVisitor);*/
Optional.ofNullable(departmentMapper.selectById(zqghOrder.getDid()))
.map(Department::getTitle)
.ifPresent(totalOrderVo::setDepartment);
Optional.ofNullable(doctorMapper.selectById(zqghOrder.getDoctorId()))
.map(Doctor::getName)
.ifPresent(totalOrderVo::setDoctor);
/*totalOrderVo.setHospital(hospitalMapper.selectById(zqghOrder.getHid()).getName());
totalOrderVo.setDepartment(departmentMapper.selectById(zqghOrder.getDid()).getTitle());
totalOrderVo.setHospital(hospitalMapper.selectById(zqghOrder.getHid()).getName());
totalOrderVo.setDoctor(doctorMapper.selectById(zqghOrder.getDoctorId()).getName());
totalOrderVo.setDoctor(doctorMapper.selectById(zqghOrder.getDoctorId()).getName());*/
totalOrderVo.setTimeOfAppointment(zqghOrder.getTimeOfAppointment());
totalOrderVo.setOverTime(zqghOrder.getOverTime());
totalOrderVo.setVoucher(zqghOrder.getVoucher());
......@@ -270,26 +318,30 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
);
StoreGoodsVo storeGoods = storeGoodsMapper.selectVoById(storeOrder.getGoodsId());
List<Integer> ids = JsonUtils.parseArray(storeGoods.getTags(), Integer.class);
List<StoreGoodsTag> storeGoodsTags = storeGoodsTagMapper.selectList(new LambdaQueryWrapper<StoreGoodsTag>().in(StoreGoodsTag::getId, ids).select(StoreGoodsTag::getTitle));
totalOrderVo.setTags(storeGoodsTags);
totalOrderVo.setStoreGoodsVo(storeGoods);
UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
totalOrderVo.setUserAddressVo(userAddressVo);
if(null != storeGoods){
List<Integer> ids = JsonUtils.parseArray(storeGoods.getTags(), Integer.class);
List<StoreGoodsTag> storeGoodsTags = storeGoodsTagMapper.selectList(new LambdaQueryWrapper<StoreGoodsTag>().in(StoreGoodsTag::getId, ids).select(StoreGoodsTag::getTitle));
totalOrderVo.setTags(storeGoodsTags);
totalOrderVo.setStoreGoodsVo(storeGoods);
totalOrderVo.setName(storeGoods.getTitle());
totalOrderVo.setSmallCover(storeGoods.getSmallCover());
totalOrderVo.setPrice(storeGoods.getSalePrice());
totalOrderVo.setIntro(storeGoods.getIntro());
totalOrderVo.setGoodsId(storeGoods.getId());
}
if (StringUtils.isNotEmpty(storeOrder.getLogisticsCode())) {
UserAddressVo userAddressVo = userAddressMapper.selectVoById(storeOrder.getAddressId());
TotalOrderBo totalOrderBo = new TotalOrderBo();
if(null != userAddressVo){
totalOrderVo.setUserAddressVo(userAddressVo);
totalOrderBo.setPhone(userAddressVo.getPhone());
}
totalOrderBo.setId(totalOrderVo.getId());
totalOrderBo.setPhone(userAddressVo.getPhone());
totalOrderBo.setLogisticsCode(storeOrder.getLogisticsCode());
totalOrderVo.setObject(selectLogisticsStatus(totalOrderBo));
}
totalOrderVo.setName(storeGoods.getTitle());
totalOrderVo.setNum(storeOrder.getNum());
totalOrderVo.setSmallCover(storeGoods.getSmallCover());
totalOrderVo.setPrice(storeGoods.getSalePrice());
totalOrderVo.setIntro(storeGoods.getIntro());
totalOrderVo.setGoodsId(storeGoods.getId());
}
return totalOrderVo;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment