Skip to content

P
peizhen-java
Commit 52c7c471 by Wangmin
Options

新增 

根据订单ID查询5种订单数据
parent 546515ac
Showing with 885 additions and 121 deletions
pz-accompany/src/main/java/com/pz/accompany/EmployeesAccompanyController.java
...@@ -5,6 +5,9 @@ import com.pz.common.core.controller.BaseController; ...@@ -5,6 +5,9 @@ import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R; import com.pz.common.core.domain.R;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.merchant.domain.bo.OrderBo;
import com.pz.merchant.domain.vo.OrderInfoVO;
import com.pz.merchant.service.IEmployeesService;
import com.pz.system.domain.vo.AccompanyDemandVo; import com.pz.system.domain.vo.AccompanyDemandVo;
import com.pz.system.service.ITotalOrderService; import com.pz.system.service.ITotalOrderService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
...@@ -32,6 +35,8 @@ public class EmployeesAccompanyController extends BaseController { ...@@ -32,6 +35,8 @@ public class EmployeesAccompanyController extends BaseController {
private final ITotalOrderService totalOrderService; private final ITotalOrderService totalOrderService;
private final IEmployeesService employeesService;
/** /**
* 需求广场 列表 * 需求广场 列表
...@@ -44,6 +49,12 @@ public class EmployeesAccompanyController extends BaseController { ...@@ -44,6 +49,12 @@ public class EmployeesAccompanyController extends BaseController {
return totalOrderService.queryUndistributedOrder(page); return totalOrderService.queryUndistributedOrder(page);
} }
/**
* 获取需求广场订单详细信息
*
* @param orderId 订单ID
* @return 待接单订单详情
*/
public R<AccompanyDemandVo> getOrderInfoById(@NotNull(message = "订单ID不能为空") Long orderId) { public R<AccompanyDemandVo> getOrderInfoById(@NotNull(message = "订单ID不能为空") Long orderId) {
return R.ok(totalOrderService.queryTotalOrderById(orderId)); return R.ok(totalOrderService.queryTotalOrderById(orderId));
} }
...@@ -60,4 +71,16 @@ public class EmployeesAccompanyController extends BaseController { ...@@ -60,4 +71,16 @@ public class EmployeesAccompanyController extends BaseController {
return R.ok(totalOrderService.orderReceiving(emId, orderId)); return R.ok(totalOrderService.orderReceiving(emId, orderId));
} }
/**
* 查询员工所有订单
*
* @param bo 筛选条件
* @param pageQuery 分页
* @return 订单列表
*/
@GetMapping("/order/list")
public TableDataInfo<OrderInfoVO> getAllOrders(OrderBo bo, PageQuery pageQuery) {
return employeesService.queryAllOrder(bo, pageQuery);
}
} }
pz-admin/src/main/resources/application.yml
...@@ -82,7 +82,7 @@ spring: ...@@ -82,7 +82,7 @@ spring:
devtools: devtools:
restart: restart:
# 热部署开关 # 热部署开关
enabled: true enabled: false
mvc: mvc:
format: format:
date-time: yyyy-MM-dd HH:mm:ss date-time: yyyy-MM-dd HH:mm:ss
......
pz-merchant/src/main/java/com/pz/merchant/controller/applet/CompanyController.java
...@@ -5,7 +5,9 @@ import com.dtflys.forest.annotation.Get; ...@@ -5,7 +5,9 @@ import com.dtflys.forest.annotation.Get;
import com.pz.common.core.controller.BaseController; import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R; import com.pz.common.core.domain.R;
import com.pz.common.core.domain.model.LoginUser;
import com.pz.common.core.validate.EditGroup; import com.pz.common.core.validate.EditGroup;
import com.pz.common.helper.LoginHelper;
import com.pz.merchant.domain.bo.CompanyBalanceBo; import com.pz.merchant.domain.bo.CompanyBalanceBo;
import com.pz.merchant.domain.bo.ModifyCompanyInfoBo; import com.pz.merchant.domain.bo.ModifyCompanyInfoBo;
import com.pz.merchant.domain.vo.CompanyAppVo; import com.pz.merchant.domain.vo.CompanyAppVo;
......
pz-merchant/src/main/java/com/pz/merchant/controller/applet/OrderController.java 0 → 100644
package com.pz.merchant.controller.applet;
import cn.dev33.satoken.annotation.SaIgnore;
import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.R;
import com.pz.common.exception.ServiceException;
import com.pz.merchant.service.ISonOrderService;
import com.pz.merchant.service.impl.SonOrderServiceBuilder;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.constraints.NotNull;
/**
* 订单
* <p>created in 2023/9/14 15:44
*
* @author WangMin
* @version 1.0
*/
@Validated
@RestController()
@RequestMapping("/app/order")
@RequiredArgsConstructor
@SaIgnore
public class OrderController extends BaseController {
private final SonOrderServiceBuilder sonOrderServiceBuilder;
/**
* 查询订单详情
*
* @param businessId 业务ID
* @param totalId 主订单ID
* @return 订单详情
*/
@GetMapping("/detail")
public R<Object> getOrderDetailByTotalId(@NotNull(message = "业务ID不能为空") Integer businessId, @NotNull(message = "订单ID不能为空") Integer totalId) {
ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(businessId);
if (orderService == null) {
throw new ServiceException("业务异常");
}
return R.ok(orderService.getSonOrderDetailDataByTotalId(totalId));
}
}
pz-system/src/main/java/com/pz/merchant/domain/bo/OrderBo.java
...@@ -2,6 +2,8 @@ package com.pz.merchant.domain.bo; ...@@ -2,6 +2,8 @@ package com.pz.merchant.domain.bo;
import lombok.Data; import lombok.Data;
import javax.validation.constraints.NotNull;
/** /**
* 查询员工订单实体 * 查询员工订单实体
* <p>created in 2023/9/11 14:14 * <p>created in 2023/9/11 14:14
...@@ -20,6 +22,7 @@ public class OrderBo { ...@@ -20,6 +22,7 @@ public class OrderBo {
/** /**
* 员工ID * 员工ID
*/ */
@NotNull(message = "陪诊员ID不能为空")
private Integer emId; private Integer emId;
/** /**
......
pz-system/src/main/java/com/pz/merchant/domain/vo/OrderInfoVO.java
package com.pz.merchant.domain.vo; package com.pz.merchant.domain.vo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;
/** /**
...@@ -47,7 +46,12 @@ public class OrderInfoVO { ...@@ -47,7 +46,12 @@ public class OrderInfoVO {
*/ */
private String userName; private String userName;
@JsonIgnore private String emName;
private Integer bid;
/**
* 业务ID
*/
private Integer businessId;
} }
pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java
...@@ -17,7 +17,7 @@ public interface ISonOrderService { ...@@ -17,7 +17,7 @@ public interface ISonOrderService {
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo getSonOrderInfoByTotalId(Integer totalId); SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId);
/** /**
* 切换子订单状态 * 切换子订单状态
...@@ -28,4 +28,15 @@ public interface ISonOrderService { ...@@ -28,4 +28,15 @@ public interface ISonOrderService {
*/ */
boolean switchSonOrderStatus(Long totalId, Integer target); boolean switchSonOrderStatus(Long totalId, Integer target);
/**
* 查询订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
default Object getSonOrderDetailDataByTotalId(Integer totalId) {
throw new UnsupportedOperationException("不支持该操作");
}
} }
pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java
...@@ -195,9 +195,9 @@ public class CompanyServiceImpl implements ICompanyService { ...@@ -195,9 +195,9 @@ public class CompanyServiceImpl implements ICompanyService {
result.setTotal(pageResult.getTotal()); result.setTotal(pageResult.getTotal());
// 根据不同子订单装载就诊人员信息和子订单状态 // 根据不同子订单装载就诊人员信息和子订单状态
pageResult.getRecords().forEach(suborder -> { pageResult.getRecords().forEach(suborder -> {
ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBid()); ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBusinessId());
SonOrderVo orderStatus; SonOrderVo orderStatus;
if (orderService != null && (orderStatus = orderService.getSonOrderInfoByTotalId(suborder.getOrderId())) != null) { if (orderService != null && (orderStatus = orderService.getSonOrderSimpleDataByTotalId(suborder.getOrderId())) != null) {
suborder.setUserName(orderStatus.getUserName()); suborder.setUserName(orderStatus.getUserName());
suborder.setSonOrderStatus(orderStatus.getOrderStatus()); suborder.setSonOrderStatus(orderStatus.getOrderStatus());
} }
......
pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java
...@@ -3,9 +3,7 @@ package com.pz.merchant.service.impl; ...@@ -3,9 +3,7 @@ package com.pz.merchant.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.dtflys.forest.annotation.Get;
import com.pz.common.core.domain.entity.SysUser; import com.pz.common.core.domain.entity.SysUser;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
...@@ -33,7 +31,6 @@ import com.pz.merchant.domain.bo.EmployeesBo; ...@@ -33,7 +31,6 @@ import com.pz.merchant.domain.bo.EmployeesBo;
import com.pz.merchant.domain.Employees; import com.pz.merchant.domain.Employees;
import com.pz.merchant.mapper.EmployeesMapper; import com.pz.merchant.mapper.EmployeesMapper;
import com.pz.merchant.service.IEmployeesService; import com.pz.merchant.service.IEmployeesService;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.*; import java.util.*;
...@@ -156,7 +153,7 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -156,7 +153,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
sysUserMapper.updateById(sysUser); sysUserMapper.updateById(sysUser);
} }
return flag; return flag;
} else if (bo.getIdentity() == 3) {//商户新增 } else if (bo.getIdentity() == 3) {// 商户新增
Company add = BeanUtil.toBean(bo, Company.class); Company add = BeanUtil.toBean(bo, Company.class);
boolean flag = companyMapper.insert(add) > 0; boolean flag = companyMapper.insert(add) > 0;
...@@ -331,9 +328,9 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -331,9 +328,9 @@ public class EmployeesServiceImpl implements IEmployeesService {
// 根据不同子订单装载就诊人员信息和子订单状态 // 根据不同子订单装载就诊人员信息和子订单状态
List<OrderInfoVO> orders = page.getRecords(); List<OrderInfoVO> orders = page.getRecords();
orders.forEach(suborder -> { orders.forEach(suborder -> {
ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBid()); ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBusinessId());
SonOrderVo orderStatus; SonOrderVo orderStatus;
if (orderService != null && (orderStatus = orderService.getSonOrderInfoByTotalId(suborder.getOrderId())) != null) { if (orderService != null && (orderStatus = orderService.getSonOrderSimpleDataByTotalId(suborder.getOrderId())) != null) {
suborder.setUserName(orderStatus.getUserName()); suborder.setUserName(orderStatus.getUserName());
suborder.setSonOrderStatus(orderStatus.getOrderStatus()); suborder.setSonOrderStatus(orderStatus.getOrderStatus());
} }
...@@ -353,14 +350,14 @@ public class EmployeesServiceImpl implements IEmployeesService { ...@@ -353,14 +350,14 @@ public class EmployeesServiceImpl implements IEmployeesService {
public TableDataInfo<OrderInfoVO> queryAllOrder(OrderBo bo, PageQuery pageQuery) { public TableDataInfo<OrderInfoVO> queryAllOrder(OrderBo bo, PageQuery pageQuery) {
QueryWrapper<Employees> query = Wrappers.query(); QueryWrapper<Employees> query = Wrappers.query();
query.eq(bo.getEmId() != null, "total_order.em_id", bo.getEmId()) query.eq(bo.getEmId() != null, "total_order.em_id", bo.getEmId())
.eq(bo.getServiceStatus() != null, "total_order.status", bo.getServiceStatus()) .eq(bo.getServiceStatus() != null, "total_order.suborder_status", bo.getServiceStatus())
.ne("total_order.business_id", 0); // 排除商城订单 .between("total_order.business_id", 1, 5); // 陪诊员只能查询1-5的订单
IPage<OrderInfoVO> page = baseMapper.selectOrder(pageQuery.build(), query); IPage<OrderInfoVO> page = baseMapper.selectOrder(pageQuery.build(), query);
// 根据不同子订单装载就诊人员信息和子订单状态 // 根据不同子订单装载就诊人员信息和子订单状态
page.getRecords().forEach(suborder -> { page.getRecords().forEach(suborder -> {
ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBid()); ISonOrderService orderService = sonOrderServiceBuilder.getSonOrderService(suborder.getBusinessId());
SonOrderVo orderStatus; SonOrderVo orderStatus;
if (orderService != null && (orderStatus = orderService.getSonOrderInfoByTotalId(suborder.getOrderId())) != null) { if (orderService != null && (orderStatus = orderService.getSonOrderSimpleDataByTotalId(suborder.getOrderId())) != null) {
suborder.setUserName(orderStatus.getUserName()); suborder.setUserName(orderStatus.getUserName());
suborder.setSonOrderStatus(orderStatus.getOrderStatus()); suborder.setSonOrderStatus(orderStatus.getOrderStatus());
} }
......
pz-system/src/main/java/com/pz/system/domain/TotalOrder.java
...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode; ...@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
@TableName("total_order") @TableName("total_order")
public class TotalOrder extends BaseEntity { public class TotalOrder extends BaseEntity {
private static final long serialVersionUID=1L; private static final long serialVersionUID = 1L;
/** /**
* *
...@@ -56,6 +56,11 @@ public class TotalOrder extends BaseEntity { ...@@ -56,6 +56,11 @@ public class TotalOrder extends BaseEntity {
* 订单状态 * 订单状态
*/ */
private Integer status; private Integer status;
/**
* 子订单状态
*/
private Integer suborderStatus;
/** /**
* 订单备注 * 订单备注
*/ */
......
pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* <p>created in 2023/9/14 14:37
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DbghOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/**
* 用户名称
*/
private String userName;
/**
* 科室
*/
private String department;
/**
* 医院
*/
private String hospital;
/**
* 陪诊时间
*/
private Date visitTime;
/**
* 其他需求
*/
private String description;
/**
* 订单佣金
*/
private Float commission;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>created in 2023/9/14 15:22
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DbmyOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/**
* 药品名称
*/
private String ypName;
/**
* 药店地址
*/
private String ydAddress;
/**
* 取药方式：0-邮寄到家，1-送货上门
*/
private Integer way;
/**
* 是否处方药
*/
private Boolean isCf;
/**
* 处方附件
*/
private String prescriptionAttachment;
/**
* 联系电话
*/
private String phone;
/**
* 收件人
*/
private String recipient;
/**
* 收获地址
*/
private String address;
/**
* 详细地址
*/
private String addressInfo;
/**
* 是否需要冷藏
*/
private Boolean isRefrigerate;
/**
* 备注
*/
private String remark;
/**
* 订单佣金
*/
private Float commission;
}
pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* <p>created in 2023/9/14 14:49
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class DbwzOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/**
* 用户名称
*/
private String userName;
/**
* 科室
*/
private String department;
/**
* 预约时间
*/
private Date visitTime;
/**
* 订单佣金
*/
private Float commission;
/**
* 主诉
*/
private String chiefComplaint;
/**
* 现病史
*/
private String historyOfPresentIllness;
/**
* 即往史
*/
private String pastHistory;
/**
* 相关报告链接
*/
private String relatedReports;
/**
* 服务要求
*/
private String serviceRequirements;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/OrderCommonVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
/**
* <p>created in 2023/9/14 12:01
*
* @author WangMin
* @version 1.0
*/
@Data
public class OrderCommonVo {
/**
* 主订单ID
*/
private Integer orderId;
/**
* 子订单ID
*/
private Integer serviceOrderId;
/**
* 业务ID
*/
private Integer businessId;
/**
* 主订单状态 0：待支付，1：已支付，2：已完成，7：已取消 ，8：已退款
*/
private Integer orderStatus;
/**
* 子订单状态 0：已发布，1：已接单，2：已完成，3：退款中 ，4：已退款,6：进行中
*/
private Integer serviceStatus;
}
pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 预约陪诊列表项实体
* <p>created in 2023/9/14 11:19
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class YypzOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/**
* 用户名称
*/
private String userName;
/**
* 科室
*/
private String department;
/**
* 医院
*/
private String hospital;
/**
* 订单佣金
*/
private Float commission;
/**
* 预约电话
*/
private String phone;
/**
* 陪诊时间
*/
private Date visitTime;
/**
* 评价标志 0-未评价，1-好评，2-差评
*/
private Integer evaluationFlag;
/**
* 需求描述
*/
private String description;
/**
* 用户评价
*/
private String evaluationContent;
/**
* 完成凭证
*/
private String voucher;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZqghOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* <p>created in 2023/9/14 13:49
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ZqghOrderItemVo extends OrderCommonVo {
/**
* 医生
*/
private String doctor;
/**
* 科室
*/
private String department;
/**
* 医院
*/
private String hospital;
/**
* 预约时间
*/
private Date visitTime;
}
pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderItemVo.java 0 → 100644
package com.pz.system.domain.vo;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* <p>created in 2023/9/14 15:12
*
* @author WangMin
* @version 1.0
*/
@EqualsAndHashCode(callSuper = true)
@Data
public class ZyphOrderItemVo extends OrderCommonVo {
/**
* 业务项目
*/
private String project;
/**
* 用户名称
*/
private String userName;
/**
* 科室
*/
private String department;
/**
* 医院
*/
private String hospital;
/**
* 订单佣金
*/
private Float commission;
/**
* 其他需求
*/
private String description;
}
pz-system/src/main/java/com/pz/system/mapper/DbghOrderMapper.java
...@@ -7,6 +7,7 @@ import com.pz.system.domain.DbghOrder; ...@@ -7,6 +7,7 @@ import com.pz.system.domain.DbghOrder;
import com.pz.system.domain.YypzOrder; import com.pz.system.domain.YypzOrder;
import com.pz.system.domain.bo.DbghOrderBo; import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.domain.bo.YypzOrderBo; import com.pz.system.domain.bo.YypzOrderBo;
import com.pz.system.domain.vo.DbghOrderItemVo;
import com.pz.system.domain.vo.DbghOrderVo; import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.system.domain.vo.YypzOrderVo; import com.pz.system.domain.vo.YypzOrderVo;
...@@ -26,8 +27,17 @@ public interface DbghOrderMapper extends BaseMapperPlus<DbghOrderMapper, DbghOrd ...@@ -26,8 +27,17 @@ public interface DbghOrderMapper extends BaseMapperPlus<DbghOrderMapper, DbghOrd
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询代办挂号订单数据表
*
* @param totalId 主订单ID
* @return 代办挂号订单
*/
DbghOrderItemVo selectDbghOrderDetailDateByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/DbmyOrderMapper.java
...@@ -7,6 +7,7 @@ import com.pz.system.domain.DbmyOrder; ...@@ -7,6 +7,7 @@ import com.pz.system.domain.DbmyOrder;
import com.pz.system.domain.DbwzOrder; import com.pz.system.domain.DbwzOrder;
import com.pz.system.domain.bo.DbmyOrderBo; import com.pz.system.domain.bo.DbmyOrderBo;
import com.pz.system.domain.bo.DbwzOrderBo; import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.domain.vo.DbmyOrderItemVo;
import com.pz.system.domain.vo.DbmyOrderVo; import com.pz.system.domain.vo.DbmyOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.system.domain.vo.DbwzOrderVo; import com.pz.system.domain.vo.DbwzOrderVo;
...@@ -25,8 +26,18 @@ public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrd ...@@ -25,8 +26,18 @@ public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrd
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询代办买药订单数据
*
* @param totalId 主订单ID
* @return 代办买药
*/
DbmyOrderItemVo selectDbmyOrderDetailDataByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/DbwzOrderMapper.java
...@@ -8,6 +8,7 @@ import com.pz.system.domain.DbwzOrder; ...@@ -8,6 +8,7 @@ import com.pz.system.domain.DbwzOrder;
import com.pz.system.domain.bo.DbghOrderBo; import com.pz.system.domain.bo.DbghOrderBo;
import com.pz.system.domain.bo.DbwzOrderBo; import com.pz.system.domain.bo.DbwzOrderBo;
import com.pz.system.domain.vo.DbghOrderVo; import com.pz.system.domain.vo.DbghOrderVo;
import com.pz.system.domain.vo.DbwzOrderItemVo;
import com.pz.system.domain.vo.DbwzOrderVo; import com.pz.system.domain.vo.DbwzOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -26,8 +27,17 @@ public interface DbwzOrderMapper extends BaseMapperPlus<DbwzOrderMapper, DbwzOrd ...@@ -26,8 +27,17 @@ public interface DbwzOrderMapper extends BaseMapperPlus<DbwzOrderMapper, DbwzOrd
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询代办挂号详情数据
*
* @param totalId 主订单ID
* @return 代办挂号
*/
DbwzOrderItemVo selectDbwzOrderDetailDataByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/YypzOrderMapper.java
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.pz.merchant.domain.vo.SonOrderVo; import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.system.domain.YypzOrder; import com.pz.system.domain.YypzOrder;
import com.pz.system.domain.bo.YypzOrderBo; import com.pz.system.domain.bo.YypzOrderBo;
import com.pz.system.domain.vo.YypzOrderItemVo;
import com.pz.system.domain.vo.YypzOrderVo; import com.pz.system.domain.vo.YypzOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -19,12 +20,22 @@ import org.apache.ibatis.annotations.Param; ...@@ -19,12 +20,22 @@ import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface YypzOrderMapper extends BaseMapperPlus<YypzOrderMapper, YypzOrder, YypzOrderVo> { public interface YypzOrderMapper extends BaseMapperPlus<YypzOrderMapper, YypzOrder, YypzOrderVo> {
Page<YypzOrderVo> findYypzOrderVoPage(IPage<YypzOrder> iPage, @Param("bo")YypzOrderBo yypzOrderBo); Page<YypzOrderVo> findYypzOrderVoPage(IPage<YypzOrder> iPage, @Param("bo") YypzOrderBo yypzOrderBo);
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询预约陪诊数据
*
* @param totalId 主订单ID
* @return 预约陪诊相关信息
*/
YypzOrderItemVo selectYypzOrderDetailDataByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/ZqghOrderMapper.java
...@@ -7,6 +7,7 @@ import com.pz.system.domain.ZqghOrder; ...@@ -7,6 +7,7 @@ import com.pz.system.domain.ZqghOrder;
import com.pz.system.domain.ZyphOrder; import com.pz.system.domain.ZyphOrder;
import com.pz.system.domain.bo.ZqghOrderBo; import com.pz.system.domain.bo.ZqghOrderBo;
import com.pz.system.domain.bo.ZyphOrderBo; import com.pz.system.domain.bo.ZyphOrderBo;
import com.pz.system.domain.vo.ZqghOrderItemVo;
import com.pz.system.domain.vo.ZqghOrderVo; import com.pz.system.domain.vo.ZqghOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.system.domain.vo.ZyphOrderVo; import com.pz.system.domain.vo.ZyphOrderVo;
...@@ -27,9 +28,18 @@ public interface ZqghOrderMapper extends BaseMapperPlus<ZqghOrderMapper, ZqghOrd ...@@ -27,9 +28,18 @@ public interface ZqghOrderMapper extends BaseMapperPlus<ZqghOrderMapper, ZqghOrd
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询诊前挂号订单ID
*
* @param totalId 主订单Id
* @return 诊前挂号订单
*/
ZqghOrderItemVo selectZqghOrderDetailDateByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/mapper/ZyphOrderMapper.java
...@@ -8,6 +8,7 @@ import com.pz.system.domain.ZyphOrder; ...@@ -8,6 +8,7 @@ import com.pz.system.domain.ZyphOrder;
import com.pz.system.domain.bo.YypzOrderBo; import com.pz.system.domain.bo.YypzOrderBo;
import com.pz.system.domain.bo.ZyphOrderBo; import com.pz.system.domain.bo.ZyphOrderBo;
import com.pz.system.domain.vo.YypzOrderVo; import com.pz.system.domain.vo.YypzOrderVo;
import com.pz.system.domain.vo.ZyphOrderItemVo;
import com.pz.system.domain.vo.ZyphOrderVo; import com.pz.system.domain.vo.ZyphOrderVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
...@@ -26,8 +27,17 @@ public interface ZyphOrderMapper extends BaseMapperPlus<ZyphOrderMapper, ZyphOrd ...@@ -26,8 +27,17 @@ public interface ZyphOrderMapper extends BaseMapperPlus<ZyphOrderMapper, ZyphOrd
/** /**
* 根据主订单ID查询子订单相关信息 * 根据主订单ID查询子订单相关信息
*
* @param totalId 主订单ID * @param totalId 主订单ID
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
SonOrderVo selectSonOrderInfoByTotalId(Integer totalId); SonOrderVo selectSonOrderInfoByTotalId(Integer totalId);
/**
* 查询住院陪护订单数据
*
* @param totalId 主订单ID
* @return 住院陪护订单
*/
ZyphOrderItemVo selectZyphOrderDetailDataByTotalId(Integer totalId);
} }
pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.java
...@@ -127,7 +127,7 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService ...@@ -127,7 +127,7 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService
} }
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -146,4 +146,15 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService ...@@ -146,4 +146,15 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
return baseMapper.selectDbghOrderDetailDateByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/DbmyOrderServiceImpl.java
...@@ -129,7 +129,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService ...@@ -129,7 +129,7 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService
} }
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -148,4 +148,15 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService ...@@ -148,4 +148,15 @@ public class DbmyOrderServiceImpl implements IDbmyOrderService, ISonOrderService
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询代办买药订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
return baseMapper.selectDbmyOrderDetailDataByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.java
...@@ -133,7 +133,7 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService ...@@ -133,7 +133,7 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService
} }
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -152,4 +152,15 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService ...@@ -152,4 +152,15 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询代办问诊订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
return baseMapper.selectDbwzOrderDetailDataByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/PayServiceImpl.java
package com.pz.system.service.impl; package com.pz.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse; import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult; import com.github.binarywang.wxpay.bean.notify.WxPayRefundNotifyResult;
import com.github.binarywang.wxpay.bean.notify.WxScanPayNotifyResult; import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
import com.github.binarywang.wxpay.bean.request.*; import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.bean.result.*; import com.github.binarywang.wxpay.bean.result.WxPayOrderQueryResult;
import com.github.binarywang.wxpay.bean.result.WxPayRefundQueryResult;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
import com.github.binarywang.wxpay.exception.WxPayException; import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService; import com.github.binarywang.wxpay.service.WxPayService;
import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.page.TableDataInfo;
import com.pz.system.domain.City;
import com.pz.system.domain.bo.CityBo;
import com.pz.system.domain.vo.CityVo;
import com.pz.system.mapper.CityMapper;
import com.pz.system.service.ICityService;
import com.pz.system.service.IPayService; import com.pz.system.service.IPayService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PostMapping;
import java.io.File;
import java.util.Collection;
import java.util.List;
/** /**
* 城市Service业务层处理 * 城市Service业务层处理
......
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
...@@ -8,13 +8,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; ...@@ -8,13 +8,11 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.domain.model.LoginUser; import com.pz.common.core.domain.model.LoginUser;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.common.enums.CommonOrderStatus; import com.pz.common.enums.CommonOrderStatus;
import com.pz.common.enums.DBMYOrderStatus; import com.pz.common.enums.DBMYOrderStatus;
import com.pz.common.enums.ShopOrderStatus; import com.pz.common.enums.ShopOrderStatus;
import com.pz.common.enums.TotalOrderStatus;
import com.pz.common.exception.ServiceException; import com.pz.common.exception.ServiceException;
import com.pz.merchant.domain.vo.SonOrderVo; import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.merchant.service.ISonOrderService; import com.pz.merchant.service.ISonOrderService;
...@@ -90,13 +88,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -90,13 +88,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
*/ */
@Override @Override
public TableDataInfo<TotalOrderVo> queryPageList(TotalOrderBo bo, PageQuery pageQuery) { public TableDataInfo<TotalOrderVo> queryPageList(TotalOrderBo bo, PageQuery pageQuery) {
//TODO 待优化 // TODO 待优化
LambdaQueryWrapper<TotalOrder> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<TotalOrder> lqw = buildQueryWrapper(bo);
IPage<TotalOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); IPage<TotalOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(totalOrderVos -> { Optional.ofNullable(result.getRecords()).ifPresent(totalOrderVos -> {
totalOrderVos.forEach(totalOrderVo -> { totalOrderVos.forEach(totalOrderVo -> {
// 陪诊人员 // 陪诊人员
if(totalOrderVo.getEmId() != 0){ if (totalOrderVo.getEmId() != 0) {
Optional.ofNullable(userVsitorMapper.selectVoById(totalOrderVo.getEmId()).getName()) Optional.ofNullable(userVsitorMapper.selectVoById(totalOrderVo.getEmId()).getName())
.ifPresent(totalOrderVo::setEmName); .ifPresent(totalOrderVo::setEmName);
} }
...@@ -105,50 +103,50 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -105,50 +103,50 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
Business business = businessMapper.selectById(totalOrderVo.getBusinessId()); Business business = businessMapper.selectById(totalOrderVo.getBusinessId());
totalOrderVo.setName(business.getName()); totalOrderVo.setName(business.getName());
//服务封面 // 服务封面
Services services = servicesMapper.selectById(totalOrderVo.getServiceId()); Services services = servicesMapper.selectById(totalOrderVo.getServiceId());
totalOrderVo.setCover(services.getCover()); totalOrderVo.setCover(services.getCover());
if(totalOrderVo.getBusinessId() == 1){//预约陪诊 if (totalOrderVo.getBusinessId() == 1) {// 预约陪诊
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId, totalOrderVo.getId())).getStatus() yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 2){//代办挂号 } else if (totalOrderVo.getBusinessId() == 2) {// 代办挂号
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
dbghOrderMapper.selectOne(new LambdaQueryWrapper<DbghOrder>().eq(DbghOrder::getOrderId, totalOrderVo.getId())).getStatus() dbghOrderMapper.selectOne(new LambdaQueryWrapper<DbghOrder>().eq(DbghOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 3){//代办问诊 } else if (totalOrderVo.getBusinessId() == 3) {// 代办问诊
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
dbwzOrderMapper.selectOne(new LambdaQueryWrapper<DbwzOrder>().eq(DbwzOrder::getOrderId, totalOrderVo.getId())).getStatus() dbwzOrderMapper.selectOne(new LambdaQueryWrapper<DbwzOrder>().eq(DbwzOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 4){//住院陪护 } else if (totalOrderVo.getBusinessId() == 4) {// 住院陪护
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
zyphOrderMapper.selectOne(new LambdaQueryWrapper<ZyphOrder>().eq(ZyphOrder::getOrderId, totalOrderVo.getId())).getStatus() zyphOrderMapper.selectOne(new LambdaQueryWrapper<ZyphOrder>().eq(ZyphOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 5){//代办买药 } else if (totalOrderVo.getBusinessId() == 5) {// 代办买药
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrderVo.getId())).getStatus() dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 6){//诊前挂号 } else if (totalOrderVo.getBusinessId() == 6) {// 诊前挂号
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
zqghOrderMapper.selectOne(new LambdaQueryWrapper<ZqghOrder>().eq(ZqghOrder::getOrderId, totalOrderVo.getId())).getStatus() zqghOrderMapper.selectOne(new LambdaQueryWrapper<ZqghOrder>().eq(ZqghOrder::getOrderId, totalOrderVo.getId())).getStatus()
); );
}else if(totalOrderVo.getBusinessId() == 0){//商城订单 } else if (totalOrderVo.getBusinessId() == 0) {// 商城订单
StoreOrder storeOrder = storeOrderMapper.selectOne(new LambdaQueryWrapper<StoreOrder>().eq(StoreOrder::getOrderId, totalOrderVo.getId())); StoreOrder storeOrder = storeOrderMapper.selectOne(new LambdaQueryWrapper<StoreOrder>().eq(StoreOrder::getOrderId, totalOrderVo.getId()));
totalOrderVo.setServiceStatus( totalOrderVo.setServiceStatus(
...@@ -215,7 +213,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -215,7 +213,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
String orderSn = getOrderSn(); String orderSn = getOrderSn();
bo.setStatus(0); bo.setStatus(0);
//组装总订单数据新增 // 组装总订单数据新增
TotalOrder totalOrder = BeanUtil.toBean(bo, TotalOrder.class); TotalOrder totalOrder = BeanUtil.toBean(bo, TotalOrder.class);
totalOrder.setOrderSn(orderSn); totalOrder.setOrderSn(orderSn);
totalOrder.setUid(loginUser.getUserId().intValue()); totalOrder.setUid(loginUser.getUserId().intValue());
...@@ -225,37 +223,37 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -225,37 +223,37 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
totalOrderVo.setOrderSn(orderSn); totalOrderVo.setOrderSn(orderSn);
totalOrderVo.setPayMoney(bo.getPayMoney()); totalOrderVo.setPayMoney(bo.getPayMoney());
if(bo.getBusinessId() == 1){//预约陪诊 if (bo.getBusinessId() == 1) {// 预约陪诊
YypzOrder yypzOrder = BeanUtil.toBean(bo, YypzOrder.class); YypzOrder yypzOrder = BeanUtil.toBean(bo, YypzOrder.class);
yypzOrderMapper.insert(yypzOrder); yypzOrderMapper.insert(yypzOrder);
}else if(bo.getBusinessId() == 2){//代办挂号 } else if (bo.getBusinessId() == 2) {// 代办挂号
DbghOrder dbghOrder = BeanUtil.toBean(bo, DbghOrder.class); DbghOrder dbghOrder = BeanUtil.toBean(bo, DbghOrder.class);
dbghOrderMapper.insert(dbghOrder); dbghOrderMapper.insert(dbghOrder);
}else if(bo.getBusinessId() == 3){//代办问诊 } else if (bo.getBusinessId() == 3) {// 代办问诊
DbwzOrder dbwzOrder = BeanUtil.toBean(bo, DbwzOrder.class); DbwzOrder dbwzOrder = BeanUtil.toBean(bo, DbwzOrder.class);
dbwzOrderMapper.insert(dbwzOrder); dbwzOrderMapper.insert(dbwzOrder);
}else if(bo.getBusinessId() == 4){//住院陪护 } else if (bo.getBusinessId() == 4) {// 住院陪护
ZyphOrder zyphOrder = BeanUtil.toBean(bo, ZyphOrder.class); ZyphOrder zyphOrder = BeanUtil.toBean(bo, ZyphOrder.class);
zyphOrderMapper.insert(zyphOrder); zyphOrderMapper.insert(zyphOrder);
}else if(bo.getBusinessId() == 5){//代办买药 } else if (bo.getBusinessId() == 5) {// 代办买药
DbmyOrder dbmyOrder = BeanUtil.toBean(bo, DbmyOrder.class); DbmyOrder dbmyOrder = BeanUtil.toBean(bo, DbmyOrder.class);
dbmyOrderMapper.insert(dbmyOrder); dbmyOrderMapper.insert(dbmyOrder);
}else if(bo.getBusinessId() == 6){//诊前挂号 } else if (bo.getBusinessId() == 6) {// 诊前挂号
ZqghOrder zqghOrder = BeanUtil.toBean(bo, ZqghOrder.class); ZqghOrder zqghOrder = BeanUtil.toBean(bo, ZqghOrder.class);
zqghOrderMapper.insert(zqghOrder); zqghOrderMapper.insert(zqghOrder);
}else if(bo.getBusinessId() == 0){//商城订单 } else if (bo.getBusinessId() == 0) {// 商城订单
StoreOrder storeOrder = BeanUtil.toBean(bo, StoreOrder.class); StoreOrder storeOrder = BeanUtil.toBean(bo, StoreOrder.class);
storeOrderMapper.insert(storeOrder); storeOrderMapper.insert(storeOrder);
...@@ -277,8 +275,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -277,8 +275,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
@Override @Override
public Boolean cancelOrder(TotalOrderBo bo) { public Boolean cancelOrder(TotalOrderBo bo) {
TotalOrder totalOrder = baseMapper.selectById(bo.getId()); TotalOrder totalOrder = baseMapper.selectById(bo.getId());
if(totalOrder.getBusinessId() == 1){//预约陪诊 if (totalOrder.getBusinessId() == 1) {// 预约陪诊
yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId,totalOrder)); yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId, totalOrder));
throw new ServiceException("该订单已分配给陪诊员，不允许取消订单！"); throw new ServiceException("该订单已分配给陪诊员，不允许取消订单！");
} }
return baseMapper.updateById(totalOrder) > 0; return baseMapper.updateById(totalOrder) > 0;
...@@ -290,97 +288,97 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -290,97 +288,97 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
totalOrder.setRefundAmount(totalOrder.getPayMoney()); totalOrder.setRefundAmount(totalOrder.getPayMoney());
totalOrder.setRefundReason(bo.getRefundReason()); totalOrder.setRefundReason(bo.getRefundReason());
if(totalOrder.getBusinessId() == 1){//预约陪诊 if (totalOrder.getBusinessId() == 1) {// 预约陪诊
YypzOrder yypzOrder = yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId, totalOrder.getId())); YypzOrder yypzOrder = yypzOrderMapper.selectOne(new LambdaQueryWrapper<YypzOrder>().eq(YypzOrder::getOrderId, totalOrder.getId()));
if(yypzOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())){ if (yypzOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 2){//代办挂号 } else if (totalOrder.getBusinessId() == 2) {// 代办挂号
DbghOrder dbghOrder = dbghOrderMapper.selectOne(new LambdaQueryWrapper<DbghOrder>().eq(DbghOrder::getOrderId, totalOrder.getId())); DbghOrder dbghOrder = dbghOrderMapper.selectOne(new LambdaQueryWrapper<DbghOrder>().eq(DbghOrder::getOrderId, totalOrder.getId()));
if(dbghOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())){ if (dbghOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 3){//代办问诊 } else if (totalOrder.getBusinessId() == 3) {// 代办问诊
DbwzOrder dbwzOrder = dbwzOrderMapper.selectOne(new LambdaQueryWrapper<DbwzOrder>().eq(DbwzOrder::getOrderId, totalOrder.getId())); DbwzOrder dbwzOrder = dbwzOrderMapper.selectOne(new LambdaQueryWrapper<DbwzOrder>().eq(DbwzOrder::getOrderId, totalOrder.getId()));
if(dbwzOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())){ if (dbwzOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 4){//住院陪护 } else if (totalOrder.getBusinessId() == 4) {// 住院陪护
ZyphOrder zyphOrder = zyphOrderMapper.selectOne(new LambdaQueryWrapper<ZyphOrder>().eq(ZyphOrder::getOrderId, totalOrder.getId())); ZyphOrder zyphOrder = zyphOrderMapper.selectOne(new LambdaQueryWrapper<ZyphOrder>().eq(ZyphOrder::getOrderId, totalOrder.getId()));
if(zyphOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())){ if (zyphOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 5){//代办买药 } else if (totalOrder.getBusinessId() == 5) {// 代办买药
DbmyOrder dbmyOrder = dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrder.getId())); DbmyOrder dbmyOrder = dbmyOrderMapper.selectOne(new LambdaQueryWrapper<DbmyOrder>().eq(DbmyOrder::getOrderId, totalOrder.getId()));
if(dbmyOrder.getStatus().equals(DBMYOrderStatus.TAKE_ORDER.getCode())){ if (dbmyOrder.getStatus().equals(DBMYOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 6){//诊前挂号 } else if (totalOrder.getBusinessId() == 6) {// 诊前挂号
ZqghOrder zqghOrder = zqghOrderMapper.selectOne(new LambdaQueryWrapper<ZqghOrder>().eq(ZqghOrder::getOrderId, totalOrder.getId())); ZqghOrder zqghOrder = zqghOrderMapper.selectOne(new LambdaQueryWrapper<ZqghOrder>().eq(ZqghOrder::getOrderId, totalOrder.getId()));
if(zqghOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())){ if (zqghOrder.getStatus().equals(CommonOrderStatus.TAKE_ORDER.getCode())) {
throw new ServiceException("陪诊员已接单，不允许退款！"); throw new ServiceException("陪诊员已接单，不允许退款！");
} }
}else if(totalOrder.getBusinessId() == 0){//商城订单 } else if (totalOrder.getBusinessId() == 0) {// 商城订单
StoreOrder storeOrder = storeOrderMapper.selectOne(new LambdaQueryWrapper<StoreOrder>().eq(StoreOrder::getOrderId, totalOrder.getId())); StoreOrder storeOrder = storeOrderMapper.selectOne(new LambdaQueryWrapper<StoreOrder>().eq(StoreOrder::getOrderId, totalOrder.getId()));
if(storeOrder.getStatus().equals(ShopOrderStatus.DELIVER.getCode())){ if (storeOrder.getStatus().equals(ShopOrderStatus.DELIVER.getCode())) {
throw new ServiceException("商品已发货，不允许退款！"); throw new ServiceException("商品已发货，不允许退款！");
} }
} }
//修改主订单退款理由 // 修改主订单退款理由
baseMapper.updateById(totalOrder); baseMapper.updateById(totalOrder);
if(totalOrder.getBusinessId() == 1){//预约陪诊 if (totalOrder.getBusinessId() == 1) {// 预约陪诊
yypzOrderMapper.update(null,new LambdaUpdateWrapper<YypzOrder>() yypzOrderMapper.update(null, new LambdaUpdateWrapper<YypzOrder>()
.eq(YypzOrder::getOrderId,totalOrder.getId()) .eq(YypzOrder::getOrderId, totalOrder.getId())
.set(YypzOrder::getStatus,CommonOrderStatus.BEING_REFUND.getCode())); .set(YypzOrder::getStatus, CommonOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 2){//代办挂号 } else if (totalOrder.getBusinessId() == 2) {// 代办挂号
dbghOrderMapper.update(null,new LambdaUpdateWrapper<DbghOrder>() dbghOrderMapper.update(null, new LambdaUpdateWrapper<DbghOrder>()
.eq(DbghOrder::getOrderId,totalOrder.getId()) .eq(DbghOrder::getOrderId, totalOrder.getId())
.set(DbghOrder::getStatus,CommonOrderStatus.BEING_REFUND.getCode())); .set(DbghOrder::getStatus, CommonOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 3){//代办问诊 } else if (totalOrder.getBusinessId() == 3) {// 代办问诊
dbwzOrderMapper.update(null,new LambdaUpdateWrapper<DbwzOrder>() dbwzOrderMapper.update(null, new LambdaUpdateWrapper<DbwzOrder>()
.eq(DbwzOrder::getOrderId,totalOrder.getId()) .eq(DbwzOrder::getOrderId, totalOrder.getId())
.set(DbwzOrder::getStatus,CommonOrderStatus.BEING_REFUND.getCode())); .set(DbwzOrder::getStatus, CommonOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 4){//住院陪护 } else if (totalOrder.getBusinessId() == 4) {// 住院陪护
zyphOrderMapper.update(null,new LambdaUpdateWrapper<ZyphOrder>() zyphOrderMapper.update(null, new LambdaUpdateWrapper<ZyphOrder>()
.eq(ZyphOrder::getOrderId,totalOrder.getId()) .eq(ZyphOrder::getOrderId, totalOrder.getId())
.set(ZyphOrder::getStatus,CommonOrderStatus.BEING_REFUND.getCode())); .set(ZyphOrder::getStatus, CommonOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 5){//代办买药 } else if (totalOrder.getBusinessId() == 5) {// 代办买药
dbmyOrderMapper.update(null,new LambdaUpdateWrapper<DbmyOrder>() dbmyOrderMapper.update(null, new LambdaUpdateWrapper<DbmyOrder>()
.eq(DbmyOrder::getOrderId,totalOrder.getId()) .eq(DbmyOrder::getOrderId, totalOrder.getId())
.set(DbmyOrder::getStatus,DBMYOrderStatus.BEING_REFUND.getCode())); .set(DbmyOrder::getStatus, DBMYOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 6){//诊前挂号 } else if (totalOrder.getBusinessId() == 6) {// 诊前挂号
zqghOrderMapper.update(null,new LambdaUpdateWrapper<ZqghOrder>() zqghOrderMapper.update(null, new LambdaUpdateWrapper<ZqghOrder>()
.eq(ZqghOrder::getOrderId,totalOrder.getId()) .eq(ZqghOrder::getOrderId, totalOrder.getId())
.set(ZqghOrder::getStatus,CommonOrderStatus.BEING_REFUND.getCode())); .set(ZqghOrder::getStatus, CommonOrderStatus.BEING_REFUND.getCode()));
}else if(totalOrder.getBusinessId() == 0){//商城订单 } else if (totalOrder.getBusinessId() == 0) {// 商城订单
storeOrderMapper.update(null,new LambdaUpdateWrapper<StoreOrder>() storeOrderMapper.update(null, new LambdaUpdateWrapper<StoreOrder>()
.eq(StoreOrder::getOrderId,totalOrder.getId()) .eq(StoreOrder::getOrderId, totalOrder.getId())
.set(StoreOrder::getStatus,ShopOrderStatus.BEING_REFUND.getCode())); .set(StoreOrder::getStatus, ShopOrderStatus.BEING_REFUND.getCode()));
} }
...@@ -415,13 +413,14 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -415,13 +413,14 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
QueryWrapper<TotalOrder> wrapper = Wrappers.query(); QueryWrapper<TotalOrder> wrapper = Wrappers.query();
// 筛选未分配订单 // 筛选未分配订单
wrapper.apply("total_order.em_id = 0") wrapper.apply("total_order.em_id = 0")
.eq("total_order.status", 1)
.between("total_order.business_id", 1, 5); .between("total_order.business_id", 1, 5);
IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper); IPage<AccompanyDemandVo> result = baseMapper.selectUndistributedTotalOrder(page.build(), wrapper);
// 装载子订单信息 // 装载子订单信息
result.getRecords().forEach(order -> { result.getRecords().forEach(order -> {
ISonOrderService orderService = serviceBuilder.getSonOrderService(order.getBid()); ISonOrderService orderService = serviceBuilder.getSonOrderService(order.getBid());
SonOrderVo sonOrder; SonOrderVo sonOrder;
if (orderService != null && (sonOrder = orderService.getSonOrderInfoByTotalId(order.getOrderId())) != null) { if (orderService != null && (sonOrder = orderService.getSonOrderSimpleDataByTotalId(order.getOrderId())) != null) {
order.setAvatar(sonOrder.getAvatar()); order.setAvatar(sonOrder.getAvatar());
order.setSonOrderStatus(sonOrder.getOrderStatus()); order.setSonOrderStatus(sonOrder.getOrderStatus());
order.setHospital(sonOrder.getHospital()); order.setHospital(sonOrder.getHospital());
...@@ -454,7 +453,10 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -454,7 +453,10 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
if (!sonOrderFlag) { if (!sonOrderFlag) {
throw new ServiceException("子订单状态修改出错，接单失败"); throw new ServiceException("子订单状态修改出错，接单失败");
} }
// 绑定主订单陪诊员
totalOrder.setEmId(emId); totalOrder.setEmId(emId);
// 设置主订单中子订单状态为已接单
totalOrder.setSuborderStatus(1);
boolean flag = baseMapper.updateById(totalOrder) > 0; boolean flag = baseMapper.updateById(totalOrder) > 0;
if (!flag) { if (!flag) {
throw new ServiceException("接单失败"); throw new ServiceException("接单失败");
...@@ -475,7 +477,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -475,7 +477,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
// 装载子订单数据 // 装载子订单数据
ISonOrderService orderService = serviceBuilder.getSonOrderService(order.getBid()); ISonOrderService orderService = serviceBuilder.getSonOrderService(order.getBid());
SonOrderVo sonOrder; SonOrderVo sonOrder;
if (orderService != null && (sonOrder = orderService.getSonOrderInfoByTotalId(order.getOrderId())) != null) { if (orderService != null && (sonOrder = orderService.getSonOrderSimpleDataByTotalId(order.getOrderId())) != null) {
order.setSonOrderStatus(sonOrder.getOrderStatus()); order.setSonOrderStatus(sonOrder.getOrderStatus());
order.setAvatar(sonOrder.getAvatar()); order.setAvatar(sonOrder.getAvatar());
order.setHospital(sonOrder.getHospital()); order.setHospital(sonOrder.getHospital());
...@@ -485,7 +487,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -485,7 +487,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
return order; return order;
} }
public String getOrderSn(){ public String getOrderSn() {
long timestamp = System.currentTimeMillis(); long timestamp = System.currentTimeMillis();
String timestampStr = Long.toString(timestamp); String timestampStr = Long.toString(timestamp);
Random random = new Random(); Random random = new Random();
...@@ -494,7 +496,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -494,7 +496,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
return timestampStr + randomStr; return timestampStr + randomStr;
} }
public List<Integer> getTages(String tags){ public List<Integer> getTages(String tags) {
// 去除空格和方括号 // 去除空格和方括号
String numbersString = tags.replaceAll("[\\[\\] ]", ""); String numbersString = tags.replaceAll("[\\[\\] ]", "");
......
pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java
...@@ -135,7 +135,7 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService ...@@ -135,7 +135,7 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -154,4 +154,15 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService ...@@ -154,4 +154,15 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询预约陪诊订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
return baseMapper.selectYypzOrderDetailDataByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java
...@@ -120,7 +120,7 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService ...@@ -120,7 +120,7 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
} }
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -140,4 +140,17 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService ...@@ -140,4 +140,17 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询诊前挂号 订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
// TODO： 诊前挂号暂时取消
// return baseMapper.selectZqghOrderDetailDateByTotalId(totalId);
return ISonOrderService.super.getSonOrderDetailDataByTotalId(totalId);
}
} }
pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.java
...@@ -32,7 +32,7 @@ import java.util.Objects; ...@@ -32,7 +32,7 @@ import java.util.Objects;
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service
public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderService { public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService {
private final ZyphOrderMapper baseMapper; private final ZyphOrderMapper baseMapper;
...@@ -40,7 +40,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic ...@@ -40,7 +40,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic
* 查询住院陪诊订单 * 查询住院陪诊订单
*/ */
@Override @Override
public ZyphOrderVo queryById(Integer id){ public ZyphOrderVo queryById(Integer id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
...@@ -106,8 +106,8 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic ...@@ -106,8 +106,8 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(ZyphOrder entity){ private void validEntityBeforeSave(ZyphOrder entity) {
//TODO 做一些数据校验,如唯一约束 // TODO 做一些数据校验,如唯一约束
} }
/** /**
...@@ -115,8 +115,8 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic ...@@ -115,8 +115,8 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 // TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
} }
...@@ -128,7 +128,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic ...@@ -128,7 +128,7 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic
* @return 子订单相关信息 * @return 子订单相关信息
*/ */
@Override @Override
public SonOrderVo getSonOrderInfoByTotalId(Integer totalId) { public SonOrderVo getSonOrderSimpleDataByTotalId(Integer totalId) {
return baseMapper.selectSonOrderInfoByTotalId(totalId); return baseMapper.selectSonOrderInfoByTotalId(totalId);
} }
...@@ -147,4 +147,15 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic ...@@ -147,4 +147,15 @@ public class ZyphOrderServiceImpl implements IZyphOrderService , ISonOrderServic
sonOrder.setStatus(target); sonOrder.setStatus(target);
return baseMapper.updateById(sonOrder) > 0; return baseMapper.updateById(sonOrder) > 0;
} }
/**
* 查询住院陪护订单详情
*
* @param totalId 主订单ID
* @return 订单详情
*/
@Override
public Object getSonOrderDetailDataByTotalId(Integer totalId) {
return baseMapper.selectZyphOrderDetailDataByTotalId(totalId);
}
} }
pz-system/src/main/resources/mapper/merchant/EmployeesMapper.xml
...@@ -102,9 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -102,9 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
services.name as project, services.name as project,
services.cover, services.cover,
services.price, services.price,
employees.name as emName,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission, CONVERT((1 - services.fenmo / 100), decimal(10, 2)) * CONVERT(services.price, decimal(10, 2)) as commission,
services.bid total_order.business_id as businessId
from total_order from total_order
left join employees on total_order.em_id = employees.id
left join services on total_order.service_id = services.id left join services on total_order.service_id = services.id
<where> <where>
<if test="ew.emptyOfWhere == false"> <if test="ew.emptyOfWhere == false">
......
pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml
...@@ -64,5 +64,28 @@ ...@@ -64,5 +64,28 @@
where dbgh_order.order_id = #{id} where dbgh_order.order_id = #{id}
</select> </select>
<select id="selectDbghOrderDetailDateByTotalId" resultType="com.pz.system.domain.vo.DbghOrderItemVo">
select total_order.id as orderId,
dbgh_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
dbgh_order.status as serviceStatus,
services.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName,
hospital.name as hospital,
department.title as department,
dbgh_order.visit_time,
total_order.remark as description
from total_order
left join dbgh_order on dbgh_order.order_id = total_order.id
left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = dbgh_order.visitor
left join hospital on dbgh_order.hid = hospital.id
left join department on department.id = dbgh_order.did
where total_order.id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml
...@@ -65,5 +65,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,5 +65,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where dbmy_order.order_id = #{id} where dbmy_order.order_id = #{id}
</select> </select>
<select id="selectDbmyOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.DbmyOrderItemVo">
select total_order.id as orderId,
dbmy_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
dbmy_order.status as serviceStatus,
services.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
dbmy_order.yp_name,
dbmy_order.yd_address,
dbmy_order.way,
dbmy_order.is_cf,
dbmy_order.prescription_attachment,
dbmy_order.phone,
dbmy_order.recipient,
dbmy_order.adress as address,
dbmy_order.address_info,
dbmy_order.is_refrigerate,
total_order.remark
from total_order
left join dbmy_order on dbmy_order.order_id = total_order.id
left join services on total_order.service_id = services.id
where total_order.id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml
...@@ -66,5 +66,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -66,5 +66,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where dbwz_order.order_id = #{id} where dbwz_order.order_id = #{id}
</select> </select>
<select id="selectDbwzOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.DbwzOrderItemVo">
select total_order.id as orderId,
dbwz_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
dbwz_order.status as serviceStatus,
services.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName,
dbwz_order.visit_time,
department.title as department,
dbwz_order.chief_complaint,
dbwz_order.history_of_present_illness,
dbwz_order.past_history,
dbwz_order.related_reports,
dbwz_order.service_requirements,
total_order.remark
from total_order
left join dbwz_order on dbwz_order.order_id = total_order.id
left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = dbwz_order.visitor
left join department on department.id = dbwz_order.did
where total_order.id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml
...@@ -65,4 +65,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,4 +65,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join hospital on hospital.id = yypz_order.hid left join hospital on hospital.id = yypz_order.hid
where yypz_order.order_id = #{id} where yypz_order.order_id = #{id}
</select> </select>
<select id="selectYypzOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.YypzOrderItemVo">
select total_order.id as orderId,
yypz_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
yypz_order.status as serviceStatus,
yypz_order.phone,
yypz_order.visit_time,
services.name as project,
total_order.evaluation_content,
total_order.is_satisfaction as evaluation_flag,
total_order.remark as description,
yypz_order.voucher,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName,
hospital.name as hospital,
department.title as department,
yypz_order.remark
from total_order
left join yypz_order on yypz_order.order_id = total_order.id
left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = yypz_order.visitor
left join hospital on yypz_order.hid = hospital.id
left join department on department.id = yypz_order.did
where total_order.id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml
...@@ -62,4 +62,22 @@ ...@@ -62,4 +62,22 @@
where zqgh_order.order_id = #{id} where zqgh_order.order_id = #{id}
</select> </select>
<select id="selectZqghOrderDetailDateByTotalId" resultType="com.pz.system.domain.vo.ZqghOrderItemVo">
select total_order.id as orderId,
zqgh_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
zqgh_order.status as serviceStatus,
hospital.name as hospital,
department.title as department,
zqgh_order.time_of_appointment as visitTime,
doctor.name as doctor
from total_order
left join zqgh_order on zqgh_order.id = total_order.id
left join hospital on zqgh_order.hid = hospital.id
left join department on department.id = zqgh_order.did
left join doctor on zqgh_order.doctor_id = doctor.id
where total_order.id = #{id}
</select>
</mapper> </mapper>
pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml
...@@ -70,5 +70,27 @@ ...@@ -70,5 +70,27 @@
where zyph_order.order_id = #{id} where zyph_order.order_id = #{id}
</select> </select>
<select id="selectZyphOrderDetailDataByTotalId" resultType="com.pz.system.domain.vo.ZyphOrderItemVo">
select total_order.id as orderId,
zyph_order.id as serviceOrderId,
total_order.business_id,
total_order.status as orderStatus,
zyph_order.status as serviceStatus,
services.name as project,
CONVERT((1 - services.fenmo / 100), decimal(10, 2)) *
CONVERT(services.price, decimal(10, 2)) as commission,
user_vsitor.name as userName,
hospital.name as hospital,
department.title as department,
total_order.remark as description
from total_order
left join zyph_order on zyph_order.order_id = total_order.id
left join services on total_order.service_id = services.id
left join user_vsitor on user_vsitor.id = zyph_order.visitor
left join hospital on zyph_order.hid = hospital.id
left join department on department.id = zyph_order.did
where total_order.id = #{id}
</select>
</mapper> </mapper>
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