提交代码

pz-admin/src/main/java/com/pz/web/controller/system/HospitalController.java

@@ -54,7 +54,13 @@ public class HospitalController extends BaseController {
     public TableDataInfo<HospitalVo> list(HospitalBo bo, PageQuery pageQuery) {
     public TableDataInfo<HospitalVo> list(HospitalBo bo, PageQuery pageQuery) {
         return iHospitalService.queryPageList(bo, pageQuery);
         return iHospitalService.queryPageList(bo, pageQuery);
     }
     }
-
+    /**
+     * 查询医院列表
+     */
+    @GetMapping("/hslist")
+    public R<List<HospitalVo>> hslist(HospitalBo bo, PageQuery pageQuery) {
+        return R.ok(iHospitalService.queryList(bo));
+    }
     /**
     /**
      * 导出医院列表
      * 导出医院列表
      */
      */

pz-admin/src/main/java/com/pz/web/controller/system/TotalOrderController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
 
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.RandomUtil;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import javax.validation.constraints.*;
@@ -104,4 +105,13 @@ public class TotalOrderController extends BaseController {
                           @PathVariable Long[] ids) {
                           @PathVariable Long[] ids) {
         return toAjax(iTotalOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
         return toAjax(iTotalOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
     }
+
+    /**
+     * 新增第三方订单
+     */
+    @RepeatSubmit()
+    @PostMapping("/addThirdOrder")
+    public R<Void> addThirdOrder(@Validated(AddGroup.class) @RequestBody CreateOrderThirdBo bo) {
+        return toAjax(iTotalOrderService.addThirdOrder(bo));
+    }
 }
 }

pz-system/src/main/java/com/pz/merchant/service/ISonOrderService.java

 package com.pz.merchant.service;
 package com.pz.merchant.service;
 
 
 import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.merchant.domain.vo.SonOrderVo;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 
 
 /**
 /**
@@ -80,4 +81,8 @@ public interface ISonOrderService {
     default String getFinishTime(Integer totalId){
     default String getFinishTime(Integer totalId){
         throw new UnsupportedOperationException("不支持该操作");
         throw new UnsupportedOperationException("不支持该操作");
     }
     }
+
+    default Boolean insertSonOrder(CreateOrderThirdBo createOrderThirdBo){
+        throw new UnsupportedOperationException("不支持该操作");
+    }
 }
 }

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -93,7 +93,11 @@ public class EmployeesServiceImpl implements IEmployeesService {
 
 
                 // 获取用户名称
                 // 获取用户名称
                 Optional.ofNullable(sysUserMapper.selectUserById(employeesVo.getUid().longValue())).ifPresent(
                 Optional.ofNullable(sysUserMapper.selectUserById(employeesVo.getUid().longValue())).ifPresent(
-                    sysUser -> employeesVo.setUserName(sysUser.getNickName())
+                    sysUser -> {
+                        employeesVo.setUserName(sysUser.getNickName());
+                        employeesVo.setPhone(sysUser.getPhonenumber());
+                        employeesVo.setAvatar(sysUser.getAvatar());
+                    }
                 );
                 );
 
 
 
 

pz-system/src/main/java/com/pz/system/domain/TotalOrder.java

@@ -91,6 +91,10 @@ public class TotalOrder extends BaseEntity{
      */
      */
     private Date finishTime;
     private Date finishTime;
     /**
     /**
+     * 订单类型（0小程序一般用户下单1美团订单）
+     */
+    private Integer orderType;
+    /**
      * 删除标志(0代表存在 2代表删除)
      * 删除标志(0代表存在 2代表删除)
      */
      */
     @TableLogic
     @TableLogic

pz-system/src/main/java/com/pz/system/domain/bo/CreateOrderThirdBo.java

+package com.pz.system.domain.bo;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CreateOrderThirdBo extends BaseEntity {
+    private Integer id;
+    /**
+     * 用户手机号
+     */
+    private String userPhone;
+    /**
+     * 待办买药联系电话/预约陪诊联系电话
+     */
+    private String phone;
+    /**
+     *订单类型(0小程序订单1美团订单)
+     */
+    private Integer orderType;
+    /**
+     * 订单号
+     */
+    private String orderSn;
+    /**
+     * 订单id
+     */
+    private Long orderId;
+    /**
+     * 医院
+     */
+    private Integer hid;
+    /**
+     * 就诊人员
+     */
+    private Integer visitor;
+    /**
+     * 科室
+     */
+    private Integer did;
+    /**
+     * 科室名称
+     */
+    private String didName;
+    /**
+     * 就诊时间
+     */
+    private Date visitTime;
+    /**
+     * 当前状态
+     */
+    private Integer status;
+    /**
+     * 服务完成时间
+     */
+    private Date overTime;
+    /**
+     * 完成凭证
+     */
+    private String voucher;
+    /**
+     * 医生
+     */
+    private Integer doctorId;
+    /**
+     * 预约时间
+     */
+    private String timeOfAppointment;
+    /**
+     *
+     */
+    private Integer isCal;
+    /**
+     * 药品名称
+     */
+    private String ypName;
+    /**
+     * 药店地址
+     */
+    private String ydAddress;
+    /**
+     * 是否处方药
+     */
+    private Integer isCf;
+    /**
+     * 处方附件
+     */
+    private String prescriptionAttachment;
+    /**
+     * 取药方式：0-邮寄到家，1-送货上门
+     */
+    private Integer way;
+    /**
+     * 收件人
+     */
+    private String recipient;
+    /**
+     * 收获地址
+     */
+    private String address;
+    /**
+     * 详细地址
+     */
+    private String addressInfo;
+    /**
+     * 是否需要冷藏
+     */
+    private Integer isRefrigerate;
+    /**
+     * 陪诊员收货人名字
+     */
+    private String pzShr;
+    /**
+     * 陪诊员收货地址
+     */
+    private String pzAddress;
+    /**
+     * 陪诊员收货电话
+     */
+    private String pzShPhone;
+    /**
+     * 陪诊员收货备注
+     */
+    private String pzShRemake;
+    /**
+     * 主诉
+     */
+    private String chiefComplaint;
+    /**
+     * 现病史
+     */
+    private String historyOfPresentIllness;
+    /**
+     * 即往史
+     */
+    private String pastHistory;
+    /**
+     * 上次就医情况
+     */
+    private String lastMedicalTreatmentSituation;
+    /**
+     * 治疗后情况
+     */
+    private String postTreatmentCondition;
+    /**
+     * 相关报告
+     */
+    private String relatedReports;
+    /**
+     * 服务要求
+     */
+    private String serviceRequirements;
+    /**
+     * 说明
+     */
+    private String indications;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 就诊人性别0-女，1-男
+     */
+    private Integer sex;
+    /**
+     * 是否成年(0成年1未成年)
+     */
+    private Integer isAdult;
+    /**
+     * 就诊人员姓名
+     */
+    private String name;
+    /**
+     * 身份证
+     */
+    private String idcard;
+    /**
+     * 用户id
+     */
+    private Integer uid;
+    /**
+     * 接单人员
+     */
+    private Integer emId;
+    /**
+     * 城市
+     */
+    private Integer cityId;
+    /**
+     * 对应业务表id,但是0代表该订单为商城订单
+     */
+    private Integer businessId;
+    /**
+     * 服务
+     */
+    private Integer serviceId;
+    /**
+     * 订单价格
+     */
+    private Double payMoney;
+    /**
+     * 子订单状态
+     */
+    private Integer suborderStatus;
+    /**
+     * 是否好评，0-未评价，1-好评，2-差评
+     */
+    private Integer isSatisfaction;
+    /**
+     * 评价内容
+     */
+    private String evaluationContent;
+    /**
+     * 退款理由
+     */
+    private String refundReason;
+    /**
+     * 退款金额
+     */
+    private Double refundAmount;
+    /**
+     * 订单完成时间
+     */
+    private Date finishTime;
+
+}

pz-system/src/main/java/com/pz/system/domain/bo/DbghOrderBo.java

@@ -84,4 +84,17 @@ public class DbghOrderBo extends BaseEntity {
      * 结束时间
      * 结束时间
      */
      */
     private String endTime;
     private String endTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/bo/DbmyOrderBo.java

@@ -132,4 +132,17 @@ public class DbmyOrderBo extends BaseEntity {
      * 结束时间
      * 结束时间
      */
      */
     private String endTime;
     private String endTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/bo/DbwzOrderBo.java

@@ -117,4 +117,17 @@ public class DbwzOrderBo extends BaseEntity {
      * 结束时间
      * 结束时间
      */
      */
     private String endTime;
     private String endTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/bo/YypzOrderBo.java

@@ -90,4 +90,17 @@ public class YypzOrderBo extends BaseEntity {
      * 结束时间
      * 结束时间
      */
      */
     private String endTime;
     private String endTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/bo/ZqghOrderBo.java

@@ -93,4 +93,17 @@ public class ZqghOrderBo extends BaseEntity {
      * 结束时间
      * 结束时间
      */
      */
     private String endTime;
     private String endTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/bo/ZyphOrderBo.java

@@ -86,5 +86,10 @@ public class ZyphOrderBo extends BaseEntity {
 
 
     private String orderSn;
     private String orderSn;
     private Long userId;
     private Long userId;
-
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    private Integer yStatus;
+    private String receiverName;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbghOrderVo.java

@@ -139,4 +139,18 @@ public class DbghOrderVo {
     private String isSatisfaction;
     private String isSatisfaction;
 
 
     private String evaluationContent;
     private String evaluationContent;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbmyOrderVo.java

@@ -180,4 +180,18 @@ public class DbmyOrderVo {
     private Date createTime;
     private Date createTime;
 
 
     private String evaluationContent;
     private String evaluationContent;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/DbwzOrderVo.java

@@ -174,4 +174,18 @@ public class DbwzOrderVo {
     private Date createTime;
     private Date createTime;
 
 
     private String eName;
     private String eName;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/YypzOrderVo.java

@@ -146,4 +146,17 @@ public class YypzOrderVo {
     private String evaluationContent;
     private String evaluationContent;
 
 
     private Date createTime;
     private Date createTime;
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/ZqghOrderVo.java

@@ -143,4 +143,18 @@ public class ZqghOrderVo {
     private Integer num;
     private Integer num;
 
 
     private String serviceName;
     private String serviceName;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/domain/vo/ZyphOrderVo.java

@@ -154,4 +154,18 @@ public class ZyphOrderVo {
     private String evaluationContent;
     private String evaluationContent;
 
 
     private String eName;
     private String eName;
+
+    /**
+     * 订单类型
+     */
+    private Integer orderType;
+    /**
+     * 就诊人
+     */
+    private String vistorName;
+    /**
+     * 接单人
+     */
+    private String receiverName;
+    private Integer toOrderId;
 }
 }

pz-system/src/main/java/com/pz/system/service/ITotalOrderService.java

@@ -4,16 +4,13 @@ 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.pz.common.core.domain.R;
 import com.pz.common.core.domain.R;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
-import com.pz.system.domain.bo.CreateOrderBo;
-import com.pz.system.domain.bo.DataViewBo;
-import com.pz.system.domain.bo.OrderColumnarBo;
+import com.pz.system.domain.bo.*;
 import com.pz.system.domain.vo.AccompanyDemandVo;
 import com.pz.system.domain.vo.AccompanyDemandVo;
 import com.pz.system.domain.vo.DataOrderVo;
 import com.pz.system.domain.vo.DataOrderVo;
 import com.pz.system.domain.vo.DataViewVo;
 import com.pz.system.domain.vo.DataViewVo;
 import com.pz.system.domain.vo.OrderColumnarVo;
 import com.pz.system.domain.vo.OrderColumnarVo;
 import com.pz.system.domain.vo.OrderLineVo;
 import com.pz.system.domain.vo.OrderLineVo;
 import com.pz.system.domain.vo.TotalOrderVo;
 import com.pz.system.domain.vo.TotalOrderVo;
-import com.pz.system.domain.bo.TotalOrderBo;
 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 org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
@@ -177,4 +174,6 @@ public interface ITotalOrderService {
      * @return
      * @return
      */
      */
     List<OrderLineVo> findOrderColumnarVoList(OrderColumnarBo bo);
     List<OrderLineVo> findOrderColumnarVoList(OrderColumnarBo bo);
+
+    Boolean addThirdOrder(CreateOrderThirdBo createOrderThirdBo);
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/DbghOrderServiceImpl.java

@@ -20,6 +20,7 @@ import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.YypzOrder;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.UserVsitorMapper;
 import com.pz.system.mapper.UserVsitorMapper;
@@ -326,4 +327,15 @@ public class DbghOrderServiceImpl implements IDbghOrderService, ISonOrderService
     public String getFinishTime(Integer totalId) {
     public String getFinishTime(Integer totalId) {
         return baseMapper.selectFinishTime(totalId);
         return baseMapper.selectFinishTime(totalId);
     }
     }
+
+    @Override
+    public Boolean insertSonOrder(CreateOrderThirdBo bo) {
+        DbghOrder add = BeanUtil.toBean(bo, DbghOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/DbwzOrderServiceImpl.java

@@ -18,6 +18,7 @@ import com.pz.system.datastructure.OrderDelayQueue;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.DbwzOrderBo;
 import com.pz.system.domain.bo.DbwzOrderBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.vo.DbwzOrderVo;
 import com.pz.system.domain.vo.DbwzOrderVo;
@@ -326,4 +327,15 @@ public class DbwzOrderServiceImpl implements IDbwzOrderService, ISonOrderService
     public String getFinishTime(Integer totalId) {
     public String getFinishTime(Integer totalId) {
         return baseMapper.selectFinishTime(totalId);
         return baseMapper.selectFinishTime(totalId);
     }
     }
+
+    @Override
+    public Boolean insertSonOrder(CreateOrderThirdBo bo) {
+        DbwzOrder add = BeanUtil.toBean(bo, DbwzOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/HospitalServiceImpl.java

@@ -15,6 +15,7 @@ import com.pz.common.enums.HospitalType;
 import com.pz.common.utils.JsonUtils;
 import com.pz.common.utils.JsonUtils;
 import com.pz.system.domain.Business;
 import com.pz.system.domain.Business;
 import com.pz.system.domain.Department;
 import com.pz.system.domain.Department;
+import com.pz.system.domain.Services;
 import com.pz.system.domain.vo.HospitalImportVo;
 import com.pz.system.domain.vo.HospitalImportVo;
 import com.pz.system.domain.vo.SysOssVo;
 import com.pz.system.domain.vo.SysOssVo;
 import com.pz.system.mapper.BusinessMapper;
 import com.pz.system.mapper.BusinessMapper;
@@ -132,6 +133,7 @@ public class HospitalServiceImpl implements IHospitalService {
     @Override
     @Override
     public List<HospitalVo> queryList(HospitalBo bo) {
     public List<HospitalVo> queryList(HospitalBo bo) {
         LambdaQueryWrapper<Hospital> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<Hospital> lqw = buildQueryWrapper(bo);
+        lqw.select(Hospital.class, introduce -> !introduce.getColumn().equals("introduce"));
         return baseMapper.selectVoList(lqw);
         return baseMapper.selectVoList(lqw);
     }
     }
 
 

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

 package com.pz.system.service.impl;
 package com.pz.system.service.impl;
 
 
+import cn.dev33.satoken.secure.BCrypt;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.RandomUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -22,7 +25,9 @@ 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.enums.CommonOrderStatus;
 import com.pz.common.enums.CommonOrderStatus;
 import com.pz.common.enums.TotalOrderStatus;
 import com.pz.common.enums.TotalOrderStatus;
+import com.pz.common.enums.UserType;
 import com.pz.common.exception.ServiceException;
 import com.pz.common.exception.ServiceException;
+import com.pz.common.exception.user.UserException;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.utils.DateUtils;
 import com.pz.common.utils.DateUtils;
 import com.pz.common.utils.HttpUtils;
 import com.pz.common.utils.HttpUtils;
@@ -40,10 +45,7 @@ import com.pz.merchant.service.impl.SonOrderServiceBuilder;
 import com.pz.system.datastructure.OrderDelayQueue;
 import com.pz.system.datastructure.OrderDelayQueue;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.domain.*;
 import com.pz.system.domain.*;
-import com.pz.system.domain.bo.CreateOrderBo;
-import com.pz.system.domain.bo.OrderColumnarBo;
-import com.pz.system.domain.bo.DataViewBo;
-import com.pz.system.domain.bo.TotalOrderBo;
+import com.pz.system.domain.bo.*;
 import com.pz.system.domain.vo.*;
 import com.pz.system.domain.vo.*;
 import com.pz.system.mapper.*;
 import com.pz.system.mapper.*;
 import com.pz.system.service.IOrderMessageService;
 import com.pz.system.service.IOrderMessageService;
@@ -1316,6 +1318,57 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
             .collect(Collectors.toList());
             .collect(Collectors.toList());
     }
     }
 
 
+    @Override
+    public Boolean addThirdOrder(CreateOrderThirdBo createOrderThirdBo) {
+        TotalOrder totalOrder1 = baseMapper.selectOne(new LambdaQueryWrapper<TotalOrder>().eq(TotalOrder::getOrderSn, createOrderThirdBo.getOrderSn()));
+        if(!ObjectUtil.isNull(totalOrder1)){
+            throw new ServiceException("订单号重复!");
+        }
+        //查询该手机号是否存在
+        SysUser sysUser = sysUserMapper.selectOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getPhonenumber, createOrderThirdBo.getUserPhone()));
+        if(ObjectUtil.isNull(sysUser)){
+            sysUser = new SysUser();
+            // 注册用户
+            sysUser.setPhonenumber(createOrderThirdBo.getUserPhone());
+            sysUser.setUserName(createOrderThirdBo.getUserPhone());
+            String nikeName = "用户" + RandomUtil.randomString(8);
+            sysUser.setNickName(nikeName);
+            sysUser.setUserType(UserType.XCX_USER.getUserType());
+            sysUser.setSex("2");
+            // 初始密码为123456
+            sysUser.setPassword(BCrypt.hashpw("123456"));
+            if (sysUserMapper.insert(sysUser) < 1) {
+                throw new UserException("用户注册失败,请检查用户信息");
+            }
+        }
+
+        //设置订单主订单状态为已支付子订单状态为已结单
+        createOrderThirdBo.setStatus(1);
+        createOrderThirdBo.setSuborderStatus(1);
+
+        //给系统用户新增就诊人
+        UserVsitor userVsitor = new UserVsitor();
+        userVsitor.setUid(sysUser.getUserId().intValue());
+        userVsitor.setName(createOrderThirdBo.getName());
+        userVsitor.setIdcard(createOrderThirdBo.getIdcard());
+        userVsitor.setIsAdult(createOrderThirdBo.getIsAdult());
+        userVsitor.setSex(createOrderThirdBo.getSex());
+        userVsitorMapper.insert(userVsitor);
+        createOrderThirdBo.setVisitor(userVsitor.getId());
+
+        //新增主订单
+        TotalOrder totalOrder = BeanUtil.toBean(createOrderThirdBo,TotalOrder.class);
+        totalOrder.setUid(sysUser.getUserId().intValue());
+        baseMapper.insert(totalOrder);
+        createOrderThirdBo.setOrderId(totalOrder.getId());
+
+        //新增子订单订单
+        ISonOrderService orderService = serviceBuilder.getSonOrderService(createOrderThirdBo.getBusinessId());
+        Objects.requireNonNull(orderService, "订单业务属性出错");
+
+        return orderService.insertSonOrder(createOrderThirdBo);
+    }
+
     public String getOrderSn() {
     public String getOrderSn() {
         long timestamp = System.currentTimeMillis();
         long timestamp = System.currentTimeMillis();
         String timestampStr = Long.toString(timestamp);
         String timestampStr = Long.toString(timestamp);

pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java

@@ -18,6 +18,7 @@ import com.pz.system.datastructure.OrderDelayQueue;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.CityMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
@@ -327,4 +328,15 @@ public class YypzOrderServiceImpl implements IYypzOrderService, ISonOrderService
     public String getFinishTime(Integer totalId) {
     public String getFinishTime(Integer totalId) {
         return baseMapper.selectFinishTime(totalId);
         return baseMapper.selectFinishTime(totalId);
     }
     }
+
+    @Override
+    public Boolean insertSonOrder(CreateOrderThirdBo bo) {
+        YypzOrder add = BeanUtil.toBean(bo, YypzOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZqghOrderServiceImpl.java

@@ -14,6 +14,7 @@ import com.pz.merchant.domain.vo.SonOrderVo;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.merchant.service.ISonOrderService;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.TotalOrderBo;
 import com.pz.system.domain.bo.TotalOrderBo;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -185,4 +186,15 @@ public class ZqghOrderServiceImpl implements IZqghOrderService, ISonOrderService
     public String getFinishTime(Integer totalId) {
     public String getFinishTime(Integer totalId) {
         return baseMapper.selectFinishTime(totalId);
         return baseMapper.selectFinishTime(totalId);
     }
     }
+
+    @Override
+    public Boolean insertSonOrder(CreateOrderThirdBo bo) {
+        ZqghOrder add = BeanUtil.toBean(bo, ZqghOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 }
 }

pz-system/src/main/java/com/pz/system/service/impl/ZyphOrderServiceImpl.java

@@ -19,6 +19,7 @@ import com.pz.system.datastructure.TotalOrderDelayOperator;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.DbwzOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.TotalOrder;
 import com.pz.system.domain.YypzOrder;
 import com.pz.system.domain.YypzOrder;
+import com.pz.system.domain.bo.CreateOrderThirdBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.domain.bo.OrderFinishedBo;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.TotalOrderMapper;
 import com.pz.system.mapper.UserVsitorMapper;
 import com.pz.system.mapper.UserVsitorMapper;
@@ -348,4 +349,15 @@ public class ZyphOrderServiceImpl implements IZyphOrderService, ISonOrderService
     public String getFinishTime(Integer totalId) {
     public String getFinishTime(Integer totalId) {
         return baseMapper.selectFinishTime(totalId);
         return baseMapper.selectFinishTime(totalId);
     }
     }
+
+    @Override
+    public Boolean insertSonOrder(CreateOrderThirdBo bo) {
+        ZyphOrder add = BeanUtil.toBean(bo, ZyphOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
 }
 }

pz-system/src/main/resources/mapper/system/DbghOrderMapper.xml

@@ -23,12 +23,17 @@
     </resultMap>
     </resultMap>
     <select id="findDbghOrderVoPage" resultType="com.pz.system.domain.vo.DbghOrderVo">
     <select id="findDbghOrderVoPage" resultType="com.pz.system.domain.vo.DbghOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
         c.`name` AS cityName,
         c.`name` AS cityName,
         h.`name` AS hName,
         h.`name` AS hName,
-        d.title AS title,
+        CASE yyod.did
+        WHEN 0 THEN yyod.did_name
+        ELSE d.title
+        END as title,
         e.`name` AS eName,
         e.`name` AS eName,
         tlo.remark AS remark,
         tlo.remark AS remark,
         yyod.visit_time AS visitTime,
         yyod.visit_time AS visitTime,
@@ -48,16 +53,30 @@
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN company AS co ON co.id = e.company_id
         LEFT JOIN company AS co ON co.id = e.company_id
+        LEFT JOIN user_vsitor AS uv ON uv.id = yyod.visitor
         <where>
         <where>
+
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
             <if test="bo.userId != null">
             <if test="bo.userId != null">
                 and co.uid = #{bo.userId}
                 and co.uid = #{bo.userId}
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{orderType}
+            </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+            <if test="bo.vistorName != null and bo.vistorName != ''">
+                and uv.name LIKE CONCAT('%', #{vistorName}, '%')
+            </if>
+            <if test="bo.receiverName != null and bo.receiverName != ''">
+                and e.name LIKE CONCAT('%', #{receiverName}, '%')
+            </if>
             and yyod.create_time &lt; NOW()
             and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc

pz-system/src/main/resources/mapper/system/DbmyOrderMapper.xml

@@ -33,6 +33,8 @@
     </resultMap>
     </resultMap>
     <select id="findDbmyOrderVoPage" resultType="com.pz.system.domain.vo.DbmyOrderVo">
     <select id="findDbmyOrderVoPage" resultType="com.pz.system.domain.vo.DbmyOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
@@ -53,15 +55,25 @@
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN company AS co ON co.id = e.company_id
         LEFT JOIN company AS co ON co.id = e.company_id
         <where>
         <where>
+
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{orderType}
+            </if>
             <if test="bo.userId != null">
             <if test="bo.userId != null">
                 and co.uid = #{bo.userId}
                 and co.uid = #{bo.userId}
             </if>
             </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+            <if test="bo.receiverName != null and bo.receiverName != ''">
+                and e.name LIKE CONCAT('%', #{receiverName}, '%')
+            </if>
             and yyod.create_time &lt; NOW()
             and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc

pz-system/src/main/resources/mapper/system/DbwzOrderMapper.xml

@@ -30,11 +30,16 @@
     </resultMap>
     </resultMap>
     <select id="findDbwzOrderVoPage" resultType="com.pz.system.domain.vo.DbwzOrderVo">
     <select id="findDbwzOrderVoPage" resultType="com.pz.system.domain.vo.DbwzOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
         c.`name` AS cityName,
         c.`name` AS cityName,
-        d.title AS title,
+        CASE yyod.did
+        WHEN 0 THEN yyod.did_name
+        ELSE d.title
+        END as title,
         e.`name` AS eName,
         e.`name` AS eName,
         tlo.remark AS remark,
         tlo.remark AS remark,
         yyod.visit_time AS visitTime,
         yyod.visit_time AS visitTime,
@@ -53,6 +58,7 @@
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN company AS co ON co.id = e.company_id
         LEFT JOIN company AS co ON co.id = e.company_id
         <where>
         <where>
+
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
@@ -62,6 +68,15 @@
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{orderType}
+            </if>
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+            <if test="bo.receiverName != null and bo.receiverName != ''">
+                and e.name LIKE CONCAT('%', #{receiverName}, '%')
+            </if>
             and yyod.create_time &lt; NOW()
             and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc

pz-system/src/main/resources/mapper/system/YypzOrderMapper.xml

@@ -24,12 +24,17 @@
     </resultMap>
     </resultMap>
     <select id="findYypzOrderVoPage" resultType="com.pz.system.domain.vo.YypzOrderVo">
     <select id="findYypzOrderVoPage" resultType="com.pz.system.domain.vo.YypzOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
         c.`name` AS cityName,
         c.`name` AS cityName,
         h.`name` AS hName,
         h.`name` AS hName,
-        d.title AS title,
+        CASE yyod.did
+        WHEN 0 THEN yyod.did_name
+        ELSE d.title
+        END as title,
         e.`name` AS eName,
         e.`name` AS eName,
         tlo.remark AS remark,
         tlo.remark AS remark,
         yyod.visit_time AS visitTime,
         yyod.visit_time AS visitTime,
@@ -50,6 +55,7 @@
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN services AS s ON s.id = tlo.service_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN company AS co ON co.id = e.company_id
         LEFT JOIN company AS co ON co.id = e.company_id
+        LEFT JOIN user_vsitor AS uv ON uv.id = yyod.visitor
         <where>
         <where>
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
@@ -57,10 +63,22 @@
             <if test="bo.userId != null">
             <if test="bo.userId != null">
                 and co.uid = #{bo.userId}
                 and co.uid = #{bo.userId}
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{bo.orderType}
+            </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
-            yyod.create_time &lt; NOW()
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+            <if test="bo.vistorName != null and bo.vistorName != ''">
+                and uv.name LIKE CONCAT('%', #{vistorName}, '%')
+            </if>
+            <if test="bo.receiverName != null and bo.receiverName != ''">
+            and e.name LIKE CONCAT('%', #{receiverName}, '%')
+            </if>
+            and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc
     </select>
     </select>

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.xml

@@ -24,12 +24,17 @@
     </resultMap>
     </resultMap>
     <select id="findZqghOrderVoPage" resultType="com.pz.system.domain.vo.ZqghOrderVo">
     <select id="findZqghOrderVoPage" resultType="com.pz.system.domain.vo.ZqghOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         yyod.id as id,
         yyod.id as id,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
         c.`name` AS cityName,
         c.`name` AS cityName,
-        d.title AS title,
+        CASE yyod.did
+        WHEN 0 THEN yyod.did_name
+        ELSE d.title
+        END as title,
         tlo.remark AS remark,
         tlo.remark AS remark,
         yyod.`status` AS yStatus,
         yyod.`status` AS yStatus,
         h.`name` AS hName,
         h.`name` AS hName,
@@ -49,12 +54,20 @@
         LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
         LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
         LEFT JOIN sys_user as su on su.user_id = tlo.uid
         LEFT JOIN sys_user as su on su.user_id = tlo.uid
         <where>
         <where>
+
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{orderType}
+            </if>
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+
             and yyod.create_time &lt; NOW()
             and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by tlo.create_time desc
         order by tlo.create_time desc

pz-system/src/main/resources/mapper/system/ZyphOrderMapper.xml

@@ -26,11 +26,16 @@
     </resultMap>
     </resultMap>
     <select id="findZyphOrderVoPage" resultType="com.pz.system.domain.vo.ZyphOrderVo">
     <select id="findZyphOrderVoPage" resultType="com.pz.system.domain.vo.ZyphOrderVo">
         SELECT
         SELECT
+        tlo.order_type as order_type,
+        tlo.id as toOrderId,
         tlo.order_sn AS orderSn,
         tlo.order_sn AS orderSn,
         tlo.pay_money AS PayMoney,
         tlo.pay_money AS PayMoney,
         s.`name` AS serviceName,
         s.`name` AS serviceName,
         c.`name` AS cityName,
         c.`name` AS cityName,
-        d.title AS title,
+        CASE yyod.did
+        WHEN 0 THEN yyod.did_name
+        ELSE d.title
+        END as title,
         e.`name` AS eName,
         e.`name` AS eName,
         tlo.remark AS remark,
         tlo.remark AS remark,
         yyod.`status` AS yStatus,
         yyod.`status` AS yStatus,
@@ -55,15 +60,25 @@
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN employees AS e ON e.id = tlo.em_id
         LEFT JOIN company AS co ON co.id = e.company_id
         LEFT JOIN company AS co ON co.id = e.company_id
         <where>
         <where>
+
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
             <if test="bo.userId != null">
             <if test="bo.userId != null">
                 and co.uid = #{bo.userId}
                 and co.uid = #{bo.userId}
             </if>
             </if>
+            <if test="bo.orderType != null">
+                and tlo.order_type = #{orderType}
+            </if>
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
             <if test="bo.startTime != null and bo.startTime != '' and bo.endTime != null and bo.endTime != ''">
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
                 and yyod.create_time &gt; = #{bo.startTime} and yyod.create_time &lt; = #{bo.endTime}
             </if>
             </if>
+            <if test="bo.yStatus != null">
+                and yyod.`status` = #{yStatus}
+            </if>
+            <if test="bo.receiverName != null and bo.receiverName != ''">
+                and e.name LIKE CONCAT('%', #{bo.receiverName}, '%')
+            </if>
             and yyod.create_time &lt; NOW()
             and yyod.create_time &lt; NOW()
         </where>
         </where>
         order by yyod.create_time desc
         order by yyod.create_time desc