修改代码

pz-admin/src/main/java/com/pz/web/controller/system/IncomeController.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.IncomeVo;
+import com.pz.system.domain.bo.IncomeBo;
+import com.pz.system.service.IIncomeService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 陪诊员/商户提现
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/income")
+public class IncomeController extends BaseController {
+
+    private final IIncomeService iIncomeService;
+
+    /**
+     * 查询陪诊员/商户提现列表
+     */
+    @SaCheckPermission("system:income:list")
+    @GetMapping("/list")
+    public TableDataInfo<IncomeVo> list(IncomeBo bo, PageQuery pageQuery) {
+        return iIncomeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出陪诊员/商户提现列表
+     */
+    @SaCheckPermission("system:income:export")
+    @Log(title = "陪诊员/商户提现", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(IncomeBo bo, HttpServletResponse response) {
+        List<IncomeVo> list = iIncomeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "陪诊员/商户提现", IncomeVo.class, response);
+    }
+
+    /**
+     * 获取陪诊员/商户提现详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:income:query")
+    @GetMapping("/{id}")
+    public R<IncomeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iIncomeService.queryById(id));
+    }
+
+    /**
+     * 新增陪诊员/商户提现
+     */
+    @SaCheckPermission("system:income:add")
+    @Log(title = "陪诊员/商户提现", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody IncomeBo bo) {
+        return toAjax(iIncomeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改陪诊员/商户提现
+     */
+    @SaCheckPermission("system:income:edit")
+    @Log(title = "陪诊员/商户提现", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody IncomeBo bo) {
+        return toAjax(iIncomeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除陪诊员/商户提现
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:income:remove")
+    @Log(title = "陪诊员/商户提现", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iIncomeService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

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

@@ -32,7 +32,7 @@ import com.pz.common.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/system/income")
+@RequestMapping("/system/storeIncome")
 public class StoreIncomeController extends BaseController {
 
     private final IStoreIncomeService iStoreIncomeService;
@@ -40,7 +40,7 @@ public class StoreIncomeController extends BaseController {
     /**
      * 查询商城提现审批列表
      */
-    @SaCheckPermission("system:income:list")
+    @SaCheckPermission("system:storeIncome:list")
     @GetMapping("/list")
     public TableDataInfo<StoreIncomeVo> list(StoreIncomeBo bo, PageQuery pageQuery) {
         return iStoreIncomeService.queryPageList(bo, pageQuery);
@@ -49,7 +49,7 @@ public class StoreIncomeController extends BaseController {
     /**
      * 导出商城提现审批列表
      */
-    @SaCheckPermission("system:income:export")
+    @SaCheckPermission("system:storeIncome:export")
     @Log(title = "商城提现审批", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreIncomeBo bo, HttpServletResponse response) {
@@ -62,7 +62,7 @@ public class StoreIncomeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:income:query")
+    @SaCheckPermission("system:storeIncome:query")
     @GetMapping("/{id}")
     public R<StoreIncomeVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
@@ -72,7 +72,7 @@ public class StoreIncomeController extends BaseController {
     /**
      * 新增商城提现审批
      */
-    @SaCheckPermission("system:income:add")
+    @SaCheckPermission("system:storeIncome:add")
     @Log(title = "商城提现审批", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -83,7 +83,7 @@ public class StoreIncomeController extends BaseController {
     /**
      * 修改商城提现审批
      */
-    @SaCheckPermission("system:income:edit")
+    @SaCheckPermission("system:storeIncome:edit")
     @Log(title = "商城提现审批", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -96,7 +96,7 @@ public class StoreIncomeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:income:remove")
+    @SaCheckPermission("system:storeIncome:remove")
     @Log(title = "商城提现审批", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

pz-admin/src/main/java/com/pz/web/controller/system/UserRefundController.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.UserRefundVo;
+import com.pz.system.domain.bo.UserRefundBo;
+import com.pz.system.service.IUserRefundService;
+import com.pz.common.core.page.TableDataInfo;
+
+/**
+ * 用户退款
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/system/userRefund")
+public class UserRefundController extends BaseController {
+
+    private final IUserRefundService iUserRefundService;
+
+    /**
+     * 查询用户退款列表
+     */
+    @SaCheckPermission("system:userRefund:list")
+    @GetMapping("/list")
+    public TableDataInfo<UserRefundVo> list(UserRefundBo bo, PageQuery pageQuery) {
+        return iUserRefundService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出用户退款列表
+     */
+    @SaCheckPermission("system:userRefund:export")
+    @Log(title = "用户退款", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(UserRefundBo bo, HttpServletResponse response) {
+        List<UserRefundVo> list = iUserRefundService.queryList(bo);
+        ExcelUtil.exportExcel(list, "用户退款", UserRefundVo.class, response);
+    }
+
+    /**
+     * 获取用户退款详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("system:userRefund:query")
+    @GetMapping("/{id}")
+    public R<UserRefundVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Integer id) {
+        return R.ok(iUserRefundService.queryById(id));
+    }
+
+    /**
+     * 新增用户退款
+     */
+    @SaCheckPermission("system:userRefund:add")
+    @Log(title = "用户退款", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody UserRefundBo bo) {
+        return toAjax(iUserRefundService.insertByBo(bo));
+    }
+
+    /**
+     * 修改用户退款
+     */
+    @SaCheckPermission("system:userRefund:edit")
+    @Log(title = "用户退款", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserRefundBo bo) {
+        return toAjax(iUserRefundService.updateByBo(bo));
+    }
+
+    /**
+     * 删除用户退款
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("system:userRefund:remove")
+    @Log(title = "用户退款", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Integer[] ids) {
+        return toAjax(iUserRefundService.deleteWithValidByIds(Arrays.asList(ids), true));
+    }
+}

pz-admin/src/main/resources/application.yml

@@ -281,8 +281,8 @@ management:
 --- # 小程序设置
 wechat:
   applet:
-    appid: wxe9c227afec04271d
-    secret: 1edb961b25799225b894e2e6f6989651
+    appid: wx6cc2fd1bca9472ae
+    secret: 2edf95828b1a19fc5149f6650cde71f1
     token: #微信小程序消息服务器配置的token
     aesKey: #微信小程序消息服务器配置的EncodingAESKey
     msgDataFormat: JSON

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

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 陪诊员/商户提现对象 income
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("income")
+public class Income extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     * 提现人员类型：1-陪诊员，2-商户
+     */
+    private Integer userType;
+    /**
+     * 提现人员ID
+     */
+    private Integer ecId;
+    /**
+     * 提现人员OPENTID
+     */
+    private String openid;
+    /**
+     * 提现单号
+     */
+    private String partnerTradeNo;
+    /**
+     * 提现金额
+     */
+    private Long amount;
+    /**
+     * 提现状态 0-待审核，1-成功提现，2-拒绝提现
+     */
+    private Integer status;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

+package com.pz.system.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+/**
+ * 用户退款对象 user_refund
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("user_refund")
+public class UserRefund extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     *
+     */
+    @TableId(value = "id")
+    private Integer id;
+    /**
+     * 退款单号
+     */
+    private String refundNo;
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+    /**
+     * 业务类型
+     */
+    private Integer businessId;
+    /**
+     * 子订单
+     */
+    private Integer sonOrderId;
+    /**
+     * 申请退款时子订单状态
+     */
+    private Integer sonOrderStatus;
+    /**
+     * 联系手机
+     */
+    private String phone;
+    /**
+     * 退款状态 0-待审核，1-完成退款，2-取消退款
+     */
+    private Integer status;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

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

+package com.pz.system.domain.bo;
+
+import com.pz.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+
+/**
+ * 陪诊员/商户提现业务对象 income
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class IncomeBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 提现人员类型：1-陪诊员，2-商户
+     */
+    private Integer userType;
+
+    /**
+     * 提现人员ID
+     */
+    private Integer ecId;
+
+    /**
+     * 提现人员OPENTID
+     */
+    private String openid;
+
+    /**
+     * 提现单号
+     */
+    private String partnerTradeNo;
+
+    /**
+     * 提现金额
+     */
+    private Long amount;
+
+    /**
+     * 提现状态 0-待审核，1-成功提现，2-拒绝提现
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

pz-system/src/main/java/com/pz/system/domain/bo/UserRefundBo.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.math.BigDecimal;
+
+
+/**
+ * 用户退款业务对象 user_refund
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class UserRefundBo extends BaseEntity {
+
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     * 退款单号
+     */
+    private String refundNo;
+
+    /**
+     * 主订单
+     */
+    private Integer orderId;
+
+    /**
+     * 业务类型
+     */
+    private Integer businessId;
+
+    /**
+     * 子订单
+     */
+    private Integer sonOrderId;
+
+    /**
+     * 申请退款时子订单状态
+     */
+    private Integer sonOrderStatus;
+
+    /**
+     * 联系手机
+     */
+    private String phone;
+
+    /**
+     * 退款状态 0-待审核，1-完成退款，2-取消退款
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 订单号
+     */
+    private String orderSn;
+
+    /**
+     * 业务名称
+     */
+    private String serviceName;
+
+    /**
+     * 应退金额
+     */
+    private BigDecimal payMoney;
+}

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

+package com.pz.system.domain.vo;
+
+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;
+
+
+/**
+ * 陪诊员/商户提现视图对象 income
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class IncomeVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     *
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 提现人员类型：1-陪诊员，2-商户
+     */
+    @ExcelProperty(value = "提现人员类型：1-陪诊员，2-商户")
+    private Integer userType;
+
+    /**
+     * 提现人员ID
+     */
+    @ExcelProperty(value = "提现人员ID")
+    private Integer ecId;
+
+    /**
+     * 提现人员OPENTID
+     */
+    @ExcelProperty(value = "提现人员OPENTID")
+    private String openid;
+
+    /**
+     * 提现单号
+     */
+    @ExcelProperty(value = "提现单号")
+    private String partnerTradeNo;
+
+    /**
+     * 提现金额
+     */
+    @ExcelProperty(value = "提现金额")
+    private Long amount;
+
+    /**
+     * 提现状态 0-待审核，1-成功提现，2-拒绝提现
+     */
+    @ExcelProperty(value = "提现状态 0-待审核，1-成功提现，2-拒绝提现")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 提现人员名称
+     */
+    private String userName;
+
+}

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

+package com.pz.system.domain.vo;
+
+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;
+
+
+/**
+ * 用户退款视图对象 user_refund
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class UserRefundVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    @ExcelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 退款单号
+     */
+    @ExcelProperty(value = "退款单号")
+    private String refundNo;
+
+    /**
+     * 主订单
+     */
+    @ExcelProperty(value = "主订单")
+    private Integer orderId;
+
+    /**
+     * 业务类型
+     */
+    @ExcelProperty(value = "业务类型")
+    private Integer businessId;
+
+    /**
+     * 子订单
+     */
+    @ExcelProperty(value = "子订单")
+    private Integer sonOrderId;
+
+    /**
+     * 申请退款时子订单状态
+     */
+    @ExcelProperty(value = "申请退款时子订单状态")
+    private Integer sonOrderStatus;
+
+    /**
+     * 联系手机
+     */
+    @ExcelProperty(value = "联系手机")
+    private String phone;
+
+    /**
+     * 退款状态 0-待审核，1-完成退款，2-取消退款
+     */
+    @ExcelProperty(value = "退款状态 0-待审核，1-完成退款，2-取消退款")
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

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

+package com.pz.system.mapper;
+
+import com.pz.system.domain.Income;
+import com.pz.system.domain.vo.IncomeVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 陪诊员/商户提现Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface IncomeMapper extends BaseMapperPlus<IncomeMapper, Income, IncomeVo> {
+
+}

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

+package com.pz.system.mapper;
+
+import com.pz.system.domain.UserRefund;
+import com.pz.system.domain.vo.UserRefundVo;
+import com.pz.common.core.mapper.BaseMapperPlus;
+
+/**
+ * 用户退款Mapper接口
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+public interface UserRefundMapper extends BaseMapperPlus<UserRefundMapper, UserRefund, UserRefundVo> {
+
+}

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

+package com.pz.system.service;
+
+import com.pz.system.domain.Income;
+import com.pz.system.domain.vo.IncomeVo;
+import com.pz.system.domain.bo.IncomeBo;
+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-12
+ */
+public interface IIncomeService {
+
+    /**
+     * 查询陪诊员/商户提现
+     */
+    IncomeVo queryById(Integer id);
+
+    /**
+     * 查询陪诊员/商户提现列表
+     */
+    TableDataInfo<IncomeVo> queryPageList(IncomeBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询陪诊员/商户提现列表
+     */
+    List<IncomeVo> queryList(IncomeBo bo);
+
+    /**
+     * 新增陪诊员/商户提现
+     */
+    Boolean insertByBo(IncomeBo bo);
+
+    /**
+     * 修改陪诊员/商户提现
+     */
+    Boolean updateByBo(IncomeBo bo);
+
+    /**
+     * 校验并批量删除陪诊员/商户提现信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

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

+package com.pz.system.service;
+
+import com.pz.system.domain.UserRefund;
+import com.pz.system.domain.vo.UserRefundVo;
+import com.pz.system.domain.bo.UserRefundBo;
+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-12
+ */
+public interface IUserRefundService {
+
+    /**
+     * 查询用户退款
+     */
+    UserRefundVo queryById(Integer id);
+
+    /**
+     * 查询用户退款列表
+     */
+    TableDataInfo<UserRefundVo> queryPageList(UserRefundBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询用户退款列表
+     */
+    List<UserRefundVo> queryList(UserRefundBo bo);
+
+    /**
+     * 新增用户退款
+     */
+    Boolean insertByBo(UserRefundBo bo);
+
+    /**
+     * 修改用户退款
+     */
+    Boolean updateByBo(UserRefundBo bo);
+
+    /**
+     * 校验并批量删除用户退款信息
+     */
+    Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
+}

pz-system/src/main/java/com/pz/system/service/impl/IncomeServiceImpl.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 com.pz.merchant.mapper.CompanyMapper;
+import com.pz.merchant.mapper.EmployeesMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.pz.system.domain.bo.IncomeBo;
+import com.pz.system.domain.vo.IncomeVo;
+import com.pz.system.domain.Income;
+import com.pz.system.mapper.IncomeMapper;
+import com.pz.system.service.IIncomeService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * 陪诊员/商户提现Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class IncomeServiceImpl implements IIncomeService {
+
+    private final IncomeMapper baseMapper;
+
+    private final EmployeesMapper employeesMapper;
+
+    private final CompanyMapper companyMapper;
+
+    /**
+     * 查询陪诊员/商户提现
+     */
+    @Override
+    public IncomeVo queryById(Integer id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询陪诊员/商户提现列表
+     */
+    @Override
+    public TableDataInfo<IncomeVo> queryPageList(IncomeBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<Income> lqw = buildQueryWrapper(bo);
+        Page<IncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Optional.ofNullable(result.getRecords()).ifPresent(incomeVos -> {
+            incomeVos.forEach(incomeVo -> {
+                AtomicReference<String> userName = new AtomicReference<>("");
+                //判断是陪诊员还是商户
+                if (incomeVo.getUserType() == 1) {
+                    //获取陪诊员表
+                    Optional.ofNullable(employeesMapper.selectEmployeesById(incomeVo.getEcId()))
+                        .ifPresent(employeesVo -> {
+                            userName.set(employeesVo.getUserName());
+                        });
+                } else {
+                    Optional.ofNullable(companyMapper.selectVoById(incomeVo.getEcId()))
+                        .ifPresent(companyVo -> {
+                            userName.set(companyVo.getName());
+                        });
+                }
+                incomeVo.setUserName(userName.get());
+            });
+        });
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询陪诊员/商户提现列表
+     */
+    @Override
+    public List<IncomeVo> queryList(IncomeBo bo) {
+        LambdaQueryWrapper<Income> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<Income> buildQueryWrapper(IncomeBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<Income> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getUserType() != null, Income::getUserType, bo.getUserType());
+        lqw.eq(bo.getEcId() != null, Income::getEcId, bo.getEcId());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpenid()), Income::getOpenid, bo.getOpenid());
+        lqw.eq(StringUtils.isNotBlank(bo.getPartnerTradeNo()), Income::getPartnerTradeNo, bo.getPartnerTradeNo());
+        lqw.eq(bo.getAmount() != null, Income::getAmount, bo.getAmount());
+        lqw.eq(bo.getStatus() != null, Income::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增陪诊员/商户提现
+     */
+    @Override
+    public Boolean insertByBo(IncomeBo bo) {
+        Income add = BeanUtil.toBean(bo, Income.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改陪诊员/商户提现
+     */
+    @Override
+    public Boolean updateByBo(IncomeBo bo) {
+        Income update = BeanUtil.toBean(bo, Income.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(Income 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/UserRefundServiceImpl.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.UserRefundBo;
+import com.pz.system.domain.vo.UserRefundVo;
+import com.pz.system.domain.UserRefund;
+import com.pz.system.mapper.UserRefundMapper;
+import com.pz.system.service.IUserRefundService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 用户退款Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2023-09-12
+ */
+@RequiredArgsConstructor
+@Service
+public class UserRefundServiceImpl implements IUserRefundService {
+
+    private final UserRefundMapper baseMapper;
+
+    /**
+     * 查询用户退款
+     */
+    @Override
+    public UserRefundVo queryById(Integer id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询用户退款列表
+     */
+    @Override
+    public TableDataInfo<UserRefundVo> queryPageList(UserRefundBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<UserRefund> lqw = buildQueryWrapper(bo);
+        Page<UserRefundVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询用户退款列表
+     */
+    @Override
+    public List<UserRefundVo> queryList(UserRefundBo bo) {
+        LambdaQueryWrapper<UserRefund> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<UserRefund> buildQueryWrapper(UserRefundBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<UserRefund> lqw = Wrappers.lambdaQuery();
+        lqw.eq(StringUtils.isNotBlank(bo.getRefundNo()), UserRefund::getRefundNo, bo.getRefundNo());
+        lqw.eq(bo.getOrderId() != null, UserRefund::getOrderId, bo.getOrderId());
+        lqw.eq(bo.getBusinessId() != null, UserRefund::getBusinessId, bo.getBusinessId());
+        lqw.eq(bo.getSonOrderId() != null, UserRefund::getSonOrderId, bo.getSonOrderId());
+        lqw.eq(bo.getSonOrderStatus() != null, UserRefund::getSonOrderStatus, bo.getSonOrderStatus());
+        lqw.eq(StringUtils.isNotBlank(bo.getPhone()), UserRefund::getPhone, bo.getPhone());
+        lqw.eq(bo.getStatus() != null, UserRefund::getStatus, bo.getStatus());
+        return lqw;
+    }
+
+    /**
+     * 新增用户退款
+     */
+    @Override
+    public Boolean insertByBo(UserRefundBo bo) {
+        UserRefund add = BeanUtil.toBean(bo, UserRefund.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改用户退款
+     */
+    @Override
+    public Boolean updateByBo(UserRefundBo bo) {
+        UserRefund update = BeanUtil.toBean(bo, UserRefund.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(UserRefund entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除用户退款
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+}

pz-system/src/main/resources/mapper/system/UserRefundMapper.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.UserRefundMapper">
+
+    <resultMap type="com.pz.system.domain.UserRefund" id="UserRefundResult">
+        <result property="id" column="id"/>
+        <result property="refundNo" column="refund_no"/>
+        <result property="orderId" column="order_id"/>
+        <result property="businessId" column="business_id"/>
+        <result property="sonOrderId" column="son_order_id"/>
+        <result property="sonOrderStatus" column="son_order_status"/>
+        <result property="phone" column="phone"/>
+        <result property="status" column="status"/>
+        <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>
+
+
+</mapper>

pz-system/src/main/resources/mapper/system/ZqghOrderMapper.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.ZqghOrderMapper">
+
+    <resultMap type="com.pz.system.domain.ZqghOrder" id="ZqghOrderResult">
+        <result property="id" column="id"/>
+        <result property="orderId" column="order_id"/>
+        <result property="hid" column="hid"/>
+        <result property="did" column="did"/>
+        <result property="doctorId" column="doctor_id"/>
+        <result property="timeOfAppointment" column="time_of_appointment"/>
+        <result property="status" column="status"/>
+        <result property="overTime" column="over_time"/>
+        <result property="voucher" column="voucher"/>
+        <result property="isCal" column="is_cal"/>
+        <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="findZqghOrderVoPage" resultType="com.pz.system.domain.vo.ZqghOrderVo">
+        SELECT
+        yyod.id as id,
+        tlo.order_sn AS orderSn,
+        tlo.pay_money AS PayMoney,
+        s.`name` AS serviceName,
+        c.`name` AS cityName,
+        d.title AS title,
+        tlo.remark AS remark,
+        yyod.`status` AS yStatus,
+        h.`name` AS hName,
+        tlo.`status` AS tStatus,
+        tlo.is_satisfaction AS isSatisfaction,
+        tlo.evaluation_content AS evaluationContent,
+        yyod.over_time AS overtime,
+        yyod.voucher AS voucher,
+        su.user_name AS userName,
+        yyod.create_Time as createTime
+        FROM zqgh_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 hospital AS h ON h.id = yyod.hid
+        LEFT JOIN department AS d ON d.id = yyod.did
+        LEFT JOIN doctor AS s ON s.id = yyod.doctor_id
+        LEFT JOIN sys_user as su on su.user_id = tlo.uid
+        <!--        <if test="bo.orderSn != null and bo.orderSn != ''">-->
+        <!--            where tlo.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')-->
+        <!--        </if>-->
+    </select>
+
+
+</mapper>