修改代码

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

+package com.pz.web.controller.system;
+
+import java.util.List;
+import java.util.Arrays;
+
+import lombok.RequiredArgsConstructor;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.pz.common.annotation.RepeatSubmit;
+import com.pz.common.annotation.Log;
+import com.pz.common.core.controller.BaseController;
+import com.pz.common.core.domain.PageQuery;
+import com.pz.common.core.domain.R;
+import com.pz.common.core.validate.AddGroup;
+import com.pz.common.core.validate.EditGroup;
+import com.pz.common.enums.BusinessType;
+import com.pz.common.utils.poi.ExcelUtil;
+import com.pz.system.domain.vo.DbmyOrderVo;
+import com.pz.system.domain.bo.DbmyOrderBo;
+import com.pz.system.service.IDbmyOrderService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 代办买药订单
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/dbmyOrder")
+public class DbmyOrderController extends BaseController {
+
+    private final IDbmyOrderService iDbmyOrderService;
+
+    /**
+     * 查询代办买药订单列表
+     */
+    @SaCheckPermission("system:dbmyOrder:list")
+    @GetMapping("/list")
+    public TableDataInfo<DbmyOrderVo> list(DbmyOrderBo bo, PageQuery pageQuery) {
+        return iDbmyOrderService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出代办买药订单列表
+     */
+    @SaCheckPermission("system:dbmyOrder:export")
+    @Log(title = "代办买药订单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DbmyOrderBo bo, HttpServletResponse response) {
+        List<DbmyOrderVo> list = iDbmyOrderService.queryList(bo);
+        ExcelUtil.exportExcel(list, "代办买药订单", DbmyOrderVo.class, response);
+    }
+
+    /**
+     * 获取代办买药订单详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:dbmyOrder:query")
+    @GetMapping("/{id}")
+    public R<DbmyOrderVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iDbmyOrderService.queryById(id));
+    }
+
+    /**
+     * 新增代办买药订单
+     */
+    @SaCheckPermission("system:dbmyOrder:add")
+    @Log(title = "代办买药订单", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DbmyOrderBo bo) {
+        return toAjax(iDbmyOrderService.insertByBo(bo));
+    }
+
+    /**
+     * 修改代办买药订单
+     */
+    @SaCheckPermission("system:dbmyOrder:edit")
+    @Log(title = "代办买药订单", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DbmyOrderBo bo) {
+        return toAjax(iDbmyOrderService.updateByBo(bo));
+    }
+
+    /**
+     * 删除代办买药订单
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:dbmyOrder:remove")
+    @Log(title = "代办买药订单", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iDbmyOrderService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 代办买药订单对象 dbmy_order
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("dbmy_order")
+public class DbmyOrder extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+    /**
+     * 药品名称
+     */
+    private String ypName;
+    /**
+     * 药店地址
+     */
+    private String ydAddress;
+    /**
+     * 是否处方药
+     */
+    private Integer isCf;
+    /**
+     * 处方附件
+     */
+    private String prescriptionAttachment;
+    /**
+     * 取药方式：0-邮寄到家，1-送货上门
+     */
+    private Integer way;
+    /**
+     * 收件人
+     */
+    private String recipient;
+    /**
+     * 收获地址
+     */
+    private String adress;
+    /**
+     * 详细地址
+     */
+    private String addressInfo;
+    /**
+     * 联系电话
+     */
+    private String phone;
+    /**
+     * 是否需要冷藏
+     */
+    private Integer isRefrigerate;
+    /**
+     * 当前状态
+     */
+    private Integer status;
+    /**
+     * 服务结束时间
+     */
+    private Date overTime;
+    /**
+     * 完成凭证
+     */
+    private String voucher;
+    /**
+     * 陪诊员收货人名字
+     */
+    private String pzShr;
+    /**
+     * 陪诊员收货地址
+     */
+    private String pzAddress;
+    /**
+     * 陪诊员收货电话
+     */
+    private String pzShPhone;
+    /**
+     * 陪诊员收货备注
+     */
+    private String pzShRemake;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

+package com.pz.system.domain.bo;
+
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 代办买药订单业务对象 dbmy_order
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class DbmyOrderBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+
+    /**
+     * 药品名称
+     */
+    private String ypName;
+
+    /**
+     * 药店地址
+     */
+    private String ydAddress;
+
+    /**
+     * 是否处方药
+     */
+    private Integer isCf;
+
+    /**
+     * 处方附件
+     */
+    private String prescriptionAttachment;
+
+    /**
+     * 取药方式：0-邮寄到家，1-送货上门
+     */
+    private Integer way;
+
+    /**
+     * 收件人
+     */
+    private String recipient;
+
+    /**
+     * 收获地址
+     */
+    private String adress;
+
+    /**
+     * 详细地址
+     */
+    private String addressInfo;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 是否需要冷藏
+     */
+    private Integer isRefrigerate;
+
+    /**
+     * 当前状态
+     */
+    private Integer status;
+
+    /**
+     * 服务结束时间
+     */
+    private Date overTime;
+
+    /**
+     * 完成凭证
+     */
+    private String voucher;
+
+    /**
+     * 陪诊员收货人名字
+     */
+    private String pzShr;
+
+    /**
+     * 陪诊员收货地址
+     */
+    private String pzAddress;
+
+    /**
+     * 陪诊员收货电话
+     */
+    private String pzShPhone;
+
+    /**
+     * 陪诊员收货备注
+     */
+    private String pzShRemake;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

@@ -117,4 +117,16 @@ public class DbghOrderVo {
      */
      */
     private UserVsitorVo userVsitorVo;
     private UserVsitorVo userVsitorVo;
 
 
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer yStatus;
+
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "订单状态")
+    private Integer tStatus;
+
 }
 }

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

+package com.pz.system.domain.vo;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.pz.common.annotation.ExcelDictFormat;
+import com.pz.common.convert.ExcelDictConvert;
+import lombok.Data;
+
+
+/**
+ * 代办买药订单视图对象 dbmy_order
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class DbmyOrderVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 主订单
+     */
+    @ExcelProperty(value = "主订单")
+    private Integer orderId;
+
+    /**
+     * 药品名称
+     */
+    @ExcelProperty(value = "药品名称")
+    private String ypName;
+
+    /**
+     * 药店地址
+     */
+    @ExcelProperty(value = "药店地址")
+    private String ydAddress;
+
+    /**
+     * 是否处方药
+     */
+    @ExcelProperty(value = "是否处方药")
+    private Integer isCf;
+
+    /**
+     * 城市
+     */
+    private String cityName;
+
+    /**
+     * 医院
+     */
+    private String hName;
+
+    /**
+     * 订单号
+     */
+    private String orderSn;
+
+    /**
+     * 订单价格
+     */
+    private BigDecimal payMoney;
+
+    /**
+     * 处方附件
+     */
+    @ExcelProperty(value = "处方附件")
+    private String prescriptionAttachment;
+
+    /**
+     * 取药方式：0-邮寄到家，1-送货上门
+     */
+    @ExcelProperty(value = "取药方式：0-邮寄到家，1-送货上门")
+    private Integer way;
+
+    /**
+     * 收件人
+     */
+    @ExcelProperty(value = "收件人")
+    private String recipient;
+
+    /**
+     * 收获地址
+     */
+    @ExcelProperty(value = "收获地址")
+    private String adress;
+
+    /**
+     * 详细地址
+     */
+    @ExcelProperty(value = "详细地址")
+    private String addressInfo;
+
+    /**
+     * 联系电话
+     */
+    @ExcelProperty(value = "联系电话")
+    private String phone;
+
+    /**
+     * 是否需要冷藏
+     */
+    @ExcelProperty(value = "是否需要冷藏")
+    private Integer isRefrigerate;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer status;
+
+    /**
+     * 服务结束时间
+     */
+    @ExcelProperty(value = "服务结束时间")
+    private Date overTime;
+
+    /**
+     * 完成凭证
+     */
+    @ExcelProperty(value = "完成凭证")
+    private String voucher;
+
+    /**
+     * 陪诊员收货人名字
+     */
+    @ExcelProperty(value = "陪诊员收货人名字")
+    private String pzShr;
+
+    /**
+     * 陪诊员收货地址
+     */
+    @ExcelProperty(value = "陪诊员收货地址")
+    private String pzAddress;
+
+    /**
+     * 陪诊员收货电话
+     */
+    @ExcelProperty(value = "陪诊员收货电话")
+    private String pzShPhone;
+
+    /**
+     * 陪诊员收货备注
+     */
+    @ExcelProperty(value = "陪诊员收货备注")
+    private String pzShRemake;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer yStatus;
+
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "订单状态")
+    private Integer tStatus;
+}

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

@@ -154,5 +154,15 @@ public class DbwzOrderVo {
      */
      */
     private UserVsitorVo userVsitorVo;
     private UserVsitorVo userVsitorVo;
 
 
+    /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer yStatus;
 
 
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "订单状态")
+    private Integer tStatus;
 }
 }

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

 package com.pz.system.domain.vo;
 package com.pz.system.domain.vo;
 
 
 import java.util.Date;
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -70,9 +71,9 @@ public class StoreApplyVo extends BaseEntity {
     private String address;
     private String address;
 
 
     /**
     /**
-     * 业务许可证
+     * 营业执照
      */
      */
-    @ExcelProperty(value = "业务许可证")
+    @ExcelProperty(value = "营业执照")
     private String businessLicense;
     private String businessLicense;
 
 
     /**
     /**
@@ -101,7 +102,6 @@ public class StoreApplyVo extends BaseEntity {
 
 
     /**
     /**
      * 是否缴纳保证金
      * 是否缴纳保证金
-
      */
      */
     @ExcelProperty(value = "是否缴纳保证金")
     @ExcelProperty(value = "是否缴纳保证金")
     private Integer isCashDeposit;
     private Integer isCashDeposit;

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

@@ -7,6 +7,8 @@ import com.pz.common.convert.ExcelDictConvert;
 import com.pz.common.core.domain.BaseEntity;
 import com.pz.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 
 
+import java.util.Date;
+
 
 
 /**
 /**
  * 商城提现审批视图对象 store_income
  * 商城提现审批视图对象 store_income
@@ -66,6 +68,4 @@ public class StoreIncomeVo extends BaseEntity {
      */
      */
     @ExcelProperty(value = "备注")
     @ExcelProperty(value = "备注")
     private String remark;
     private String remark;
-
-
 }
 }

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

@@ -98,7 +98,13 @@ public class YypzOrderVo {
      * 当前状态
      * 当前状态
      */
      */
     @ExcelProperty(value = "当前状态")
     @ExcelProperty(value = "当前状态")
-    private Integer status;
+    private Integer yStatus;
+
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "订单状态")
+    private Integer tStatus;
 
 
     /**
     /**
      * 服务完成时间
      * 服务完成时间
@@ -122,4 +128,19 @@ public class YypzOrderVo {
      * 就诊人员
      * 就诊人员
      */
      */
     private UserVsitorVo userVsitorVo;
     private UserVsitorVo userVsitorVo;
+
+    /**
+     * 接单人员
+     */
+    private String eName;
+
+    /**
+     * 是否好评0-未评价，1-好评，2-差评
+     */
+    private Integer isSatisfaction;
+
+    /**
+     * 评价内容
+     */
+    private String evaluationContent;
 }
 }

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

@@ -113,6 +113,18 @@ public class ZyphOrderVo {
     private Integer status;
     private Integer status;
 
 
     /**
     /**
+     * 当前状态
+     */
+    @ExcelProperty(value = "当前状态")
+    private Integer yStatus;
+
+    /**
+     * 订单状态
+     */
+    @ExcelProperty(value = "订单状态")
+    private Integer tStatus;
+
+    /**
      * 服务完成时间
      * 服务完成时间
      */
      */
     @ExcelProperty(value = "服务完成时间")
     @ExcelProperty(value = "服务完成时间")

pz-system/src/main/java/com/pz/system/mapper/DbmyOrderMapper.java

+package com.pz.system.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.pz.system.domain.DbmyOrder;
+import com.pz.system.domain.DbwzOrder;
+import com.pz.system.domain.bo.DbmyOrderBo;
+import com.pz.system.domain.bo.DbwzOrderBo;
+import com.pz.system.domain.vo.DbmyOrderVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+import com.pz.system.domain.vo.DbwzOrderVo;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 代办买药订单Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface DbmyOrderMapper extends BaseMapperPlus<DbmyOrderMapper, DbmyOrder, DbmyOrderVo> {
+    Page<DbmyOrderVo> findDbmyOrderVoPage(IPage<DbmyOrder> iPage, @Param("bo") DbmyOrderBo bo);
+}

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

+package com.pz.system.service;
+
+import com.pz.system.domain.DbmyOrder;
+import com.pz.system.domain.vo.DbmyOrderVo;
+import com.pz.system.domain.bo.DbmyOrderBo;
+import com.pz.common.core.page.TableDataInfo;
+import com.pz.common.core.domain.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 代办买药订单Service接口
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+public interface IDbmyOrderService {
+
+    /**
+     * 查询代办买药订单
+     */
+    DbmyOrderVo queryById(Integer id);
+
+    /**
+     * 查询代办买药订单列表
+     */
+    TableDataInfo<DbmyOrderVo> queryPageList(DbmyOrderBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询代办买药订单列表
+     */
+    List<DbmyOrderVo> queryList(DbmyOrderBo bo);
+
+    /**
+     * 新增代办买药订单
+     */
+    Boolean insertByBo(DbmyOrderBo bo);
+
+    /**
+     * 修改代办买药订单
+     */
+    Boolean updateByBo(DbmyOrderBo bo);
+
+    /**
+     * 校验并批量删除代办买药订单信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

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

+package com.pz.system.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.pz.common.core.page.TableDataInfo;
+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.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.pz.system.domain.bo.DbmyOrderBo;
+import com.pz.system.domain.vo.DbmyOrderVo;
+import com.pz.system.domain.DbmyOrder;
+import com.pz.system.mapper.DbmyOrderMapper;
+import com.pz.system.service.IDbmyOrderService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 代办买药订单Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-11
+ */
+@RequiredArgsConstructor
+@Service
+public class DbmyOrderServiceImpl implements IDbmyOrderService {
+
+    private final DbmyOrderMapper baseMapper;
+
+    /**
+     * 查询代办买药订单
+     */
+    @Override
+    public DbmyOrderVo queryById(Integer id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询代办买药订单列表
+     */
+    @Override
+    public TableDataInfo<DbmyOrderVo> queryPageList(DbmyOrderBo bo, PageQuery pageQuery) {
+        Page<DbmyOrderVo> result = baseMapper.findDbmyOrderVoPage(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询代办买药订单列表
+     */
+    @Override
+    public List<DbmyOrderVo> queryList(DbmyOrderBo bo) {
+        LambdaQueryWrapper<DbmyOrder> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DbmyOrder> buildQueryWrapper(DbmyOrderBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DbmyOrder> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getOrderId() != null, DbmyOrder::getOrderId, bo.getOrderId());
+        lqw.like(StringUtils.isNotBlank(bo.getYpName()), DbmyOrder::getYpName, bo.getYpName());
+        lqw.eq(StringUtils.isNotBlank(bo.getYdAddress()), DbmyOrder::getYdAddress, bo.getYdAddress());
+        lqw.eq(bo.getIsCf() != null, DbmyOrder::getIsCf, bo.getIsCf());
+        lqw.eq(StringUtils.isNotBlank(bo.getPrescriptionAttachment()), DbmyOrder::getPrescriptionAttachment, bo.getPrescriptionAttachment());
+        lqw.eq(bo.getWay() != null, DbmyOrder::getWay, bo.getWay());
+        lqw.eq(StringUtils.isNotBlank(bo.getRecipient()), DbmyOrder::getRecipient, bo.getRecipient());
+        lqw.eq(StringUtils.isNotBlank(bo.getAdress()), DbmyOrder::getAdress, bo.getAdress());
+        lqw.eq(StringUtils.isNotBlank(bo.getAddressInfo()), DbmyOrder::getAddressInfo, bo.getAddressInfo());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), DbmyOrder::getPhone, bo.getPhone());
+        lqw.eq(bo.getIsRefrigerate() != null, DbmyOrder::getIsRefrigerate, bo.getIsRefrigerate());
+        lqw.eq(bo.getStatus() != null, DbmyOrder::getStatus, bo.getStatus());
+        lqw.eq(bo.getOverTime() != null, DbmyOrder::getOverTime, bo.getOverTime());
+        lqw.eq(StringUtils.isNotBlank(bo.getVoucher()), DbmyOrder::getVoucher, bo.getVoucher());
+        lqw.eq(StringUtils.isNotBlank(bo.getPzShr()), DbmyOrder::getPzShr, bo.getPzShr());
+        lqw.eq(StringUtils.isNotBlank(bo.getPzAddress()), DbmyOrder::getPzAddress, bo.getPzAddress());
+        lqw.eq(StringUtils.isNotBlank(bo.getPzShPhone()), DbmyOrder::getPzShPhone, bo.getPzShPhone());
+        lqw.eq(StringUtils.isNotBlank(bo.getPzShRemake()), DbmyOrder::getPzShRemake, bo.getPzShRemake());
+        return lqw;
+    }
+
+    /**
+     * 新增代办买药订单
+     */
+    @Override
+    public Boolean insertByBo(DbmyOrderBo bo) {
+        DbmyOrder add = BeanUtil.toBean(bo, DbmyOrder.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改代办买药订单
+     */
+    @Override
+    public Boolean updateByBo(DbmyOrderBo bo) {
+        DbmyOrder update = BeanUtil.toBean(bo, DbmyOrder.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DbmyOrder entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除代办买药订单
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

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

@@ -58,6 +58,7 @@ public class StoreApplyServiceImpl implements IStoreApplyService {
     @Override
     @Override
     public TableDataInfo<StoreApplyVo> queryPageList(StoreApplyBo bo, PageQuery pageQuery) {
     public TableDataInfo<StoreApplyVo> queryPageList(StoreApplyBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<StoreApply> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<StoreApply> lqw = buildQueryWrapper(bo);
+
         Page<StoreApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<StoreApplyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Optional.ofNullable(result.getRecords())
         Optional.ofNullable(result.getRecords())
             .map(List::stream)
             .map(List::stream)

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

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pz.system.mapper.DbmyOrderMapper">
+
+    <resultMap type="com.pz.system.domain.DbmyOrder" id="DbmyOrderResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="ypName" column="yp_name"/>
+        <result property="ydAddress" column="yd_address"/>
+        <result property="isCf" column="is_cf"/>
+        <result property="prescriptionAttachment" column="prescription_attachment"/>
+        <result property="way" column="way"/>
+        <result property="recipient" column="recipient"/>
+        <result property="adress" column="adress"/>
+        <result property="addressInfo" column="address_info"/>
+        <result property="phone" column="phone"/>
+        <result property="isRefrigerate" column="is_refrigerate"/>
+        <result property="status" column="status"/>
+        <result property="overTime" column="over_time"/>
+        <result property="voucher" column="voucher"/>
+        <result property="pzShr" column="pz_shr"/>
+        <result property="pzAddress" column="pz_address"/>
+        <result property="pzShPhone" column="pz_sh_phone"/>
+        <result property="pzShRemake" column="pz_sh_remake"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+    <select id="findDbmyOrderVoPage" resultType="com.pz.system.domain.vo.DbmyOrderVo">
+        SELECT
+            tlo.order_sn AS orderSn,
+            tlo.pay_money AS PayMoney,
+            s.`name` AS serviceName,
+            c.`name` AS cityName,
+            e.`name` AS eName,
+            tlo.remark AS remark,
+            yyod.`status` AS yStatus,
+            tlo.`status` AS tStatus,
+            tlo.is_satisfaction AS isSatisfaction,
+            tlo.evaluation_content AS evaluationContent,
+            yyod.*
+        FROM
+            dbmy_order AS yyod
+                LEFT JOIN total_order AS tlo ON yyod.order_id = tlo.id
+                LEFT JOIN city AS c ON c.id = tlo.city_id
+                LEFT JOIN services AS s ON s.id = tlo.service_id
+                LEFT JOIN employees AS e ON e.id = tlo.em_id
+    </select>
+
+
+</mapper>