Skip to content

P
peizhen-java
Commit be941d28 by 邹磊浩
Options

修改代码

parent e20de862
Showing with 1303 additions and 58 deletions
pz-admin/src/main/java/com/pz/web/controller/system/CompanyController.java 0 → 100644
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.CompanyVo;
import com.pz.system.domain.bo.CompanyBo;
import com.pz.system.service.ICompanyService;
import com.pz.common.core.page.TableDataInfo;
/**
* 商户
*
* @author WangMin
* @date 2023-09-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/merchant/company")
public class CompanyController extends BaseController {
private final ICompanyService iCompanyService;
/**
* 查询商户列表
*/
@SaCheckPermission("merchant:company:list")
@GetMapping("/list")
public TableDataInfo<CompanyVo> list(CompanyBo bo, PageQuery pageQuery) {
return iCompanyService.queryPageList(bo, pageQuery);
}
/**
* 导出商户列表
*/
@SaCheckPermission("merchant:company:export")
@Log(title = "商户", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(CompanyBo bo, HttpServletResponse response) {
List<CompanyVo> list = iCompanyService.queryList(bo);
ExcelUtil.exportExcel(list, "商户", CompanyVo.class, response);
}
/**
* 获取商户详细信息
*
* @param id 主键
*/
@SaCheckPermission("merchant:company:query")
@GetMapping("/{id}")
public R<CompanyVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iCompanyService.queryById(id));
}
/**
* 新增商户
*/
@SaCheckPermission("merchant:company:add")
@Log(title = "商户", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody CompanyBo bo) {
return toAjax(iCompanyService.insertByBo(bo));
}
/**
* 修改商户
*/
@SaCheckPermission("merchant:company:edit")
@Log(title = "商户", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody CompanyBo bo) {
return toAjax(iCompanyService.updateByBo(bo));
}
/**
* 删除商户
*
* @param ids 主键串
*/
@SaCheckPermission("merchant:company:remove")
@Log(title = "商户", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iCompanyService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-admin/src/main/java/com/pz/web/controller/system/EmployeesController.java 0 → 100644
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.EmployeesVo;
import com.pz.system.domain.bo.EmployeesBo;
import com.pz.system.service.IEmployeesService;
import com.pz.common.core.page.TableDataInfo;
/**
* 陪诊员
*
* @author WangMin
* @date 2023-09-11
*/
@Validated
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/employees")
public class EmployeesController extends BaseController {
private final IEmployeesService iEmployeesService;
/**
* 查询陪诊员列表
*/
@SaCheckPermission("merchant:employees:list")
@GetMapping("/list")
public TableDataInfo<EmployeesVo> list(EmployeesBo bo, PageQuery pageQuery) {
return iEmployeesService.queryPageList(bo, pageQuery);
}
/**
* 导出陪诊员列表
*/
@SaCheckPermission("merchant:employees:export")
@Log(title = "陪诊员", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(EmployeesBo bo, HttpServletResponse response) {
List<EmployeesVo> list = iEmployeesService.queryList(bo);
ExcelUtil.exportExcel(list, "陪诊员", EmployeesVo.class, response);
}
/**
* 获取陪诊员详细信息
*
* @param id 主键
*/
@SaCheckPermission("merchant:employees:query")
@GetMapping("/{id}")
public R<EmployeesVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) {
return R.ok(iEmployeesService.queryById(id));
}
/**
* 新增陪诊员
*/
@SaCheckPermission("merchant:employees:add")
@Log(title = "陪诊员", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
public R<Void> add(@Validated(AddGroup.class) @RequestBody EmployeesBo bo) {
return toAjax(iEmployeesService.insertByBo(bo));
}
/**
* 修改陪诊员
*/
@SaCheckPermission("merchant:employees:edit")
@Log(title = "陪诊员", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
public R<Void> edit(@Validated(EditGroup.class) @RequestBody EmployeesBo bo) {
return toAjax(iEmployeesService.updateByBo(bo));
}
/**
* 删除陪诊员
*
* @param ids 主键串
*/
@SaCheckPermission("merchant:employees:remove")
@Log(title = "陪诊员", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空")
@PathVariable Integer[] ids) {
return toAjax(iEmployeesService.deleteWithValidByIds(Arrays.asList(ids), true));
}
}
pz-admin/src/main/java/com/pz/web/controller/system/StoreOrderController.java
...@@ -35,7 +35,7 @@ import com.pz.common.core.page.TableDataInfo; ...@@ -35,7 +35,7 @@ import com.pz.common.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/order") @RequestMapping("/system/storeOrder")
public class StoreOrderController extends BaseController { public class StoreOrderController extends BaseController {
private final IStoreOrderService iStoreOrderService; private final IStoreOrderService iStoreOrderService;
...@@ -43,7 +43,7 @@ public class StoreOrderController extends BaseController { ...@@ -43,7 +43,7 @@ public class StoreOrderController extends BaseController {
/** /**
* 查询商城订单列表 * 查询商城订单列表
*/ */
@SaCheckPermission("system:order:list") @SaCheckPermission("system:storeOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<StoreAdminOrderVo> list(StoreOrderBo bo, PageQuery pageQuery) { public TableDataInfo<StoreAdminOrderVo> list(StoreOrderBo bo, PageQuery pageQuery) {
return iStoreOrderService.queryPageList(bo, pageQuery); return iStoreOrderService.queryPageList(bo, pageQuery);
...@@ -52,7 +52,7 @@ public class StoreOrderController extends BaseController { ...@@ -52,7 +52,7 @@ public class StoreOrderController extends BaseController {
/** /**
* 导出商城订单列表 * 导出商城订单列表
*/ */
@SaCheckPermission("system:order:export") @SaCheckPermission("system:storeOrder:export")
@Log(title = "商城订单", businessType = BusinessType.EXPORT) @Log(title = "商城订单", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(StoreOrderBo bo, HttpServletResponse response) { public void export(StoreOrderBo bo, HttpServletResponse response) {
...@@ -65,7 +65,7 @@ public class StoreOrderController extends BaseController { ...@@ -65,7 +65,7 @@ public class StoreOrderController extends BaseController {
* *
* @param id 主键 * @param id 主键
*/ */
@SaCheckPermission("system:order:query") @SaCheckPermission("system:storeOrder:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<StoreOrderVo> getInfo(@NotNull(message = "主键不能为空") public R<StoreOrderVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable Integer id) { @PathVariable Integer id) {
...@@ -75,7 +75,7 @@ public class StoreOrderController extends BaseController { ...@@ -75,7 +75,7 @@ public class StoreOrderController extends BaseController {
/** /**
* 新增商城订单 * 新增商城订单
*/ */
@SaCheckPermission("system:order:add") @SaCheckPermission("system:storeOrder:add")
@Log(title = "商城订单", businessType = BusinessType.INSERT) @Log(title = "商城订单", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping() @PostMapping()
...@@ -86,7 +86,7 @@ public class StoreOrderController extends BaseController { ...@@ -86,7 +86,7 @@ public class StoreOrderController extends BaseController {
/** /**
* 修改商城订单 * 修改商城订单
*/ */
@SaCheckPermission("system:order:edit") @SaCheckPermission("system:storeOrder:edit")
@Log(title = "商城订单", businessType = BusinessType.UPDATE) @Log(title = "商城订单", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping()
...@@ -99,7 +99,7 @@ public class StoreOrderController extends BaseController { ...@@ -99,7 +99,7 @@ public class StoreOrderController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("system:order:remove") @SaCheckPermission("system:storeOrder:remove")
@Log(title = "商城订单", businessType = BusinessType.DELETE) @Log(title = "商城订单", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")
......
pz-system/src/main/java/com/pz/system/domain/Company.java 0 → 100644
package com.pz.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 商户对象 company
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("company")
public class Company extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Integer id;
/**
* 商户名称
*/
private String name;
/**
* 城市
*/
private Long cityId;
/**
* 商户电话
*/
private String tel;
/**
* 商户手机
*/
private String phone;
/**
* 商户地址
*/
private String address;
/**
* 状态：0-待审核，1-正常，2-禁用
*/
private Integer status;
/**
* 营业执照
*/
private String businessLicense;
/**
* 是否缴纳保证金：0-否，1-是
*/
private Integer isCashDeposit;
/**
* 保证金金额
*/
private String cashDeposit;
/**
* 创建人
*/
private Integer uid;
/**
* 总收益
*/
private String totalRevenue;
/**
* 当前余额
*/
private String balance;
/**
* 冻结余额
*/
private String freezeBalance;
/**
* 删除标志（0代表存在 2代表删除）
*/
@TableLogic
private String delFlag;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/Employees.java 0 → 100644
package com.pz.system.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
* 陪诊员对象 employees
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("employees")
public class Employees extends BaseEntity {
private static final long serialVersionUID=1L;
/**
*
*/
@TableId(value = "id")
private Integer id;
/**
* 陪诊员
*/
private String name;
/**
* 职业开始年份
*/
private String startYear;
/**
* 用户
*/
private Integer uid;
/**
* 工作时段
*/
private String workingHours;
/**
* 状态
*/
private Integer status;
/**
* 所属商户
*/
private Integer companyId;
/**
* 身份证正面照
*/
private String cardFront;
/**
* 身份证反面照
*/
private String cardReverse;
/**
* 健康证
*/
private String healthCertificate;
/**
* 经度
*/
private String lng;
/**
* 纬度
*/
private String lat;
/**
* 城市
*/
private Long cityId;
/**
* 当前身份
*/
private Integer nowType;
/**
* 总收益
*/
private String totalRevenue;
/**
* 当前余额
*/
private String balance;
/**
* 冻结余额
*/
private Long freezeBalance;
/**
* 取消订单次数
*/
private Integer killOrder;
/**
* 删除标志
*/
@TableLogic
private String delFlag;
}
pz-system/src/main/java/com/pz/system/domain/Services.java
...@@ -57,11 +57,12 @@ public class Services extends BaseEntity { ...@@ -57,11 +57,12 @@ public class Services extends BaseEntity {
/** /**
* 服务开始时间 * 服务开始时间
*/ */
private Date startTime; private String startTime;
/** /**
* 服务介绍时间 * 服务介绍时间
*/ */
private Date endTime; private String endTime;
/** /**
* 介绍 * 介绍
*/ */
......
pz-system/src/main/java/com/pz/system/domain/bo/CompanyBo.java 0 → 100644
package com.pz.system.domain.bo;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 商户业务对象 company
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class CompanyBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 商户名称
*/
private String name;
/**
* 城市
*/
private Long cityId;
/**
* 商户电话
*/
private String tel;
/**
* 商户手机
*/
private String phone;
/**
* 商户地址
*/
private String address;
/**
* 状态：0-待审核，1-正常，2-禁用
*/
private Integer status;
/**
* 营业执照
*/
private String businessLicense;
/**
* 是否缴纳保证金：0-否，1-是
*/
private Integer isCashDeposit;
/**
* 保证金金额
*/
private String cashDeposit;
/**
* 创建人
*/
private Integer uid;
/**
* 总收益
*/
private String totalRevenue;
/**
* 当前余额
*/
private String balance;
/**
* 冻结余额
*/
private String freezeBalance;
/**
* 备注
*/
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/bo/EmployeesBo.java 0 → 100644
package com.pz.system.domain.bo;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.*;
/**
* 陪诊员业务对象 employees
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class EmployeesBo extends BaseEntity {
/**
*
*/
private Integer id;
/**
* 陪诊员
*/
private String name;
/**
* 职业开始年份
*/
private String startYear;
/**
* 用户
*/
private Integer uid;
/**
* 工作时段
*/
private String workingHours;
/**
* 状态
*/
private Integer status;
/**
* 所属商户
*/
private Integer companyId;
/**
* 身份证正面照
*/
private String cardFront;
/**
* 身份证反面照
*/
private String cardReverse;
/**
* 健康证
*/
private String healthCertificate;
/**
* 经度
*/
private String lng;
/**
* 纬度
*/
private String lat;
/**
* 城市
*/
private Long cityId;
/**
* 当前身份
*/
private Integer nowType;
/**
* 总收益
*/
private String totalRevenue;
/**
* 当前余额
*/
private String balance;
/**
* 冻结余额
*/
private Long freezeBalance;
/**
* 取消订单次数
*/
private Integer killOrder;
}
pz-system/src/main/java/com/pz/system/domain/bo/ServicesBo.java
...@@ -62,12 +62,12 @@ public class ServicesBo extends BaseEntity { ...@@ -62,12 +62,12 @@ public class ServicesBo extends BaseEntity {
/** /**
* 服务开始时间 * 服务开始时间
*/ */
private Date startTime; private String startTime;
/** /**
* 服务介绍时间 * 服务介绍时间
*/ */
private Date endTime; private String endTime;
/** /**
* 介绍 * 介绍
......
pz-system/src/main/java/com/pz/system/domain/bo/StoreOrderBo.java
...@@ -84,5 +84,8 @@ public class StoreOrderBo extends BaseEntity { ...@@ -84,5 +84,8 @@ public class StoreOrderBo extends BaseEntity {
*/ */
private String refundLogisticsCode; private String refundLogisticsCode;
/**
* 商户名称
*/
private String title;
} }
pz-system/src/main/java/com/pz/system/domain/vo/BusinessVo.java
...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; ...@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.pz.common.annotation.ExcelDictFormat; import com.pz.common.annotation.ExcelDictFormat;
import com.pz.common.convert.ExcelDictConvert; import com.pz.common.convert.ExcelDictConvert;
import com.pz.common.core.domain.BaseEntity;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
...@@ -17,7 +18,7 @@ import java.util.List; ...@@ -17,7 +18,7 @@ import java.util.List;
*/ */
@Data @Data
@ExcelIgnoreUnannotated @ExcelIgnoreUnannotated
public class BusinessVo { public class BusinessVo extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -44,6 +45,8 @@ public class BusinessVo { ...@@ -44,6 +45,8 @@ public class BusinessVo {
*/ */
private List<String> hospitalsList; private List<String> hospitalsList;
private List<Integer> hospitalsIdsList;
/** /**
* 提供服务集 * 提供服务集
*/ */
......
pz-system/src/main/java/com/pz/system/domain/vo/CompanyVo.java 0 → 100644
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 com.pz.common.core.domain.BaseEntity;
import lombok.Data;
/**
* 商户视图对象 company
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@ExcelIgnoreUnannotated
public class CompanyVo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Integer id;
/**
* 商户名称
*/
@ExcelProperty(value = "商户名称")
private String name;
/**
* 城市
*/
@ExcelProperty(value = "城市")
private Long cityId;
/**
* 城市名称
*/
private String cityName;
/**
* 商户电话
*/
@ExcelProperty(value = "商户电话")
private String tel;
/**
* 商户手机
*/
@ExcelProperty(value = "商户手机")
private String phone;
/**
* 商户地址
*/
@ExcelProperty(value = "商户地址")
private String address;
/**
* 状态：0-待审核，1-正常，2-禁用
*/
@ExcelProperty(value = "状态：0-待审核，1-正常，2-禁用", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "company_state")
private Integer status;
/**
* 营业执照
*/
@ExcelProperty(value = "营业执照")
private String businessLicense;
/**
* 是否缴纳保证金：0-否，1-是
*/
@ExcelProperty(value = "是否缴纳保证金：0-否，1-是", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "company_is_cash_deposit")
private Integer isCashDeposit;
/**
* 保证金金额
*/
@ExcelProperty(value = "保证金金额")
private String cashDeposit;
/**
* 创建人
*/
@ExcelProperty(value = "创建人")
private Integer uid;
/**
* 总收益
*/
@ExcelProperty(value = "总收益")
private String totalRevenue;
/**
* 当前余额
*/
@ExcelProperty(value = "当前余额")
private String balance;
/**
* 冻结余额
*/
@ExcelProperty(value = "冻结余额")
private String freezeBalance;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
}
pz-system/src/main/java/com/pz/system/domain/vo/EmployeesVo.java 0 → 100644
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;
import java.util.Date;
/**
* 陪诊员视图对象 employees
*
* @author WangMin
* @date 2023-09-11
*/
@Data
@ExcelIgnoreUnannotated
public class EmployeesVo {
private static final long serialVersionUID = 1L;
/**
*
*/
@ExcelProperty(value = "")
private Integer id;
/**
* 陪诊员
*/
@ExcelProperty(value = "陪诊员 ")
private String name;
/**
* 职业开始年份
*/
@ExcelProperty(value = "职业开始年份")
private String startYear;
/**
* 用户
*/
@ExcelProperty(value = "用户")
private Integer uid;
/**
* 状态
*/
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "company_state")
private Integer status;
/**
* 所属商户
*/
@ExcelProperty(value = "所属商户")
private Integer companyId;
/**
* 身份证正面照
*/
@ExcelProperty(value = "身份证正面照")
private String cardFront;
/**
* 身份证反面照
*/
@ExcelProperty(value = "身份证反面照")
private String cardReverse;
/**
* 健康证
*/
@ExcelProperty(value = "健康证")
private String healthCertificate;
/**
* 当前身份
*/
@ExcelProperty(value = "当前身份", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "employee_status")
private Integer nowType;
/**
* 总收益
*/
@ExcelProperty(value = "总收益")
private String totalRevenue;
/**
* 当前余额
*/
@ExcelProperty(value = "当前余额")
private String balance;
/**
* 注册时间
*/
@ExcelProperty(value = "注册时间")
private Date createTime;
}
pz-system/src/main/java/com/pz/system/domain/vo/ServicesVo.java
package com.pz.system.domain.vo; package com.pz.system.domain.vo;
import java.math.BigDecimal;
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;
...@@ -64,6 +65,11 @@ public class ServicesVo { ...@@ -64,6 +65,11 @@ public class ServicesVo {
private Integer duration; private Integer duration;
/** /**
* 高价
*/
private BigDecimal highPrice;
/**
* 超时计费，每30分钟 * 超时计费，每30分钟
*/ */
@ExcelProperty(value = "超时计费，每30分钟") @ExcelProperty(value = "超时计费，每30分钟")
...@@ -72,14 +78,12 @@ public class ServicesVo { ...@@ -72,14 +78,12 @@ public class ServicesVo {
/** /**
* 服务开始时间 * 服务开始时间
*/ */
@ExcelProperty(value = "服务开始时间") private String startTime;
private Date startTime;
/** /**
* 服务介绍时间 * 服务介绍时间
*/ */
@ExcelProperty(value = "服务介绍时间") private String endTime;
private Date endTime;
/** /**
* 介绍 * 介绍
......
pz-system/src/main/java/com/pz/system/domain/vo/StoreAdminOrderVo.java
...@@ -44,9 +44,14 @@ public class StoreAdminOrderVo implements Serializable { ...@@ -44,9 +44,14 @@ public class StoreAdminOrderVo implements Serializable {
private String userName; private String userName;
/** /**
* 流程状态
*/
private Integer orderStatus;
/**
* 订单状态 * 订单状态
*/ */
private Integer status; private Integer toStatus;
/** /**
* 创建时间 * 创建时间
......
pz-system/src/main/java/com/pz/system/domain/vo/StoreIncomeVo.java
...@@ -33,6 +33,11 @@ public class StoreIncomeVo extends BaseEntity { ...@@ -33,6 +33,11 @@ public class StoreIncomeVo extends BaseEntity {
private Integer storeId; private Integer storeId;
/** /**
* 商户名称
*/
private String storeName;
/**
* 金额 * 金额
*/ */
@ExcelProperty(value = "金额") @ExcelProperty(value = "金额")
......
pz-system/src/main/java/com/pz/system/domain/vo/StoreInfoVo.java
...@@ -32,7 +32,7 @@ public class StoreInfoVo { ...@@ -32,7 +32,7 @@ public class StoreInfoVo {
private Integer storeId; private Integer storeId;
/** /**
* * 商户名称
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String name; private String name;
...@@ -44,79 +44,79 @@ public class StoreInfoVo { ...@@ -44,79 +44,79 @@ public class StoreInfoVo {
private Integer cityId; private Integer cityId;
/** /**
* * 联系方式
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String tel; private String tel;
/** /**
* * 邮箱
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String email; private String email;
/** /**
* * 地址
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String address; private String address;
/** /**
* * 业务许可证
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String businessLicense; private String businessLicense;
/** /**
* * 食品业务许可证
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String foodBusinessLicense; private String foodBusinessLicense;
/** /**
* * 药品经营许可证
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String drugBusinessLicense; private String drugBusinessLicense;
/** /**
* * 医疗许可证
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String medicalBusinessLicense; private String medicalBusinessLicense;
/** /**
* * 二级医疗许可证
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private String twoMedicalBusinessLicense; private String twoMedicalBusinessLicense;
/** /**
* * 是否缴纳保证金
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Integer isCashDeposit; private Integer isCashDeposit;
/** /**
* * 保证金
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Long cashDeposit; private Long cashDeposit;
/** /**
* * 总收入
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Long totalRevenue; private Long totalRevenue;
/** /**
* * 余额
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Long balance; private Long balance;
/** /**
* * 冻结余额
*/ */
@ExcelProperty(value = "") @ExcelProperty(value = "")
private Long freezeBalance; private Long freezeBalance;
......
pz-system/src/main/java/com/pz/system/mapper/CompanyMapper.java 0 → 100644
package com.pz.system.mapper;
import com.pz.system.domain.Company;
import com.pz.system.domain.vo.CompanyVo;
import com.pz.common.core.mapper.BaseMapperPlus;
/**
* 商户Mapper接口
*
* @author WangMin
* @date 2023-09-11
*/
public interface CompanyMapper extends BaseMapperPlus<CompanyMapper, Company, CompanyVo> {
}
pz-system/src/main/java/com/pz/system/mapper/EmployeesMapper.java 0 → 100644
package com.pz.system.mapper;
import com.pz.system.domain.Employees;
import com.pz.system.domain.vo.EmployeesVo;
import com.pz.common.core.mapper.BaseMapperPlus;
/**
* 陪诊员Mapper接口
*
* @author WangMin
* @date 2023-09-11
*/
public interface EmployeesMapper extends BaseMapperPlus<EmployeesMapper, Employees, EmployeesVo> {
}
pz-system/src/main/java/com/pz/system/service/ICompanyService.java 0 → 100644
package com.pz.system.service;
import com.pz.system.domain.Company;
import com.pz.system.domain.vo.CompanyVo;
import com.pz.system.domain.bo.CompanyBo;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import java.util.Collection;
import java.util.List;
/**
* 商户Service接口
*
* @author WangMin
* @date 2023-09-11
*/
public interface ICompanyService {
/**
* 查询商户
*/
CompanyVo queryById(Integer id);
/**
* 查询商户列表
*/
TableDataInfo<CompanyVo> queryPageList(CompanyBo bo, PageQuery pageQuery);
/**
* 查询商户列表
*/
List<CompanyVo> queryList(CompanyBo bo);
/**
* 新增商户
*/
Boolean insertByBo(CompanyBo bo);
/**
* 修改商户
*/
Boolean updateByBo(CompanyBo bo);
/**
* 校验并批量删除商户信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/IEmployeesService.java 0 → 100644
package com.pz.system.service;
import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery;
import com.pz.system.domain.bo.EmployeesBo;
import com.pz.system.domain.vo.EmployeesVo;
import java.util.Collection;
import java.util.List;
/**
* 陪诊员Service接口
*
* @author WangMin
* @date 2023-09-11
*/
public interface IEmployeesService {
/**
* 查询陪诊员
*/
EmployeesVo queryById(Integer id);
/**
* 查询陪诊员列表
*/
TableDataInfo<EmployeesVo> queryPageList(EmployeesBo bo, PageQuery pageQuery);
/**
* 查询陪诊员列表
*/
List<EmployeesVo> queryList(EmployeesBo bo);
/**
* 新增陪诊员
*/
Boolean insertByBo(EmployeesBo bo);
/**
* 修改陪诊员
*/
Boolean updateByBo(EmployeesBo bo);
/**
* 校验并批量删除陪诊员信息
*/
Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid);
}
pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java
...@@ -61,7 +61,7 @@ public class ArticleServiceImpl implements IArticleService { ...@@ -61,7 +61,7 @@ public class ArticleServiceImpl implements IArticleService {
Optional.ofNullable(result.getRecords()).ifPresent(articleVos -> { Optional.ofNullable(result.getRecords()).ifPresent(articleVos -> {
// 获取所有文章id集合 // 获取所有文章id集合
List<Integer> articleIds = articleVos.stream() List<Integer> articleIds = articleVos.stream()
.map(ArticleVo::getId) .map(ArticleVo::getCityId)
.collect(Collectors.toList()); .collect(Collectors.toList());
// 查询城市名称 // 查询城市名称
......
pz-system/src/main/java/com/pz/system/service/impl/BusinessServiceImpl.java
...@@ -49,7 +49,12 @@ public class BusinessServiceImpl implements IBusinessService { ...@@ -49,7 +49,12 @@ public class BusinessServiceImpl implements IBusinessService {
*/ */
@Override @Override
public BusinessVo queryById(Long id) { public BusinessVo queryById(Long id) {
return baseMapper.selectVoById(id); BusinessVo businessVo = baseMapper.selectVoById(id);
if (StringUtils.isNotBlank(businessVo.getHospitals())) {
List<Integer> ids = JsonUtils.parseArray(businessVo.getHospitals(), Integer.class);
businessVo.setHospitalsIdsList(ids);
}
return businessVo;
} }
/** /**
......
pz-system/src/main/java/com/pz/system/service/impl/CompanyServiceImpl.java 0 → 100644
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.system.mapper.CityMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.CompanyBo;
import com.pz.system.domain.vo.CompanyVo;
import com.pz.system.domain.Company;
import com.pz.system.mapper.CompanyMapper;
import com.pz.system.service.ICompanyService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Optional;
/**
* 商户Service业务层处理
*
* @author WangMin
* @date 2023-09-11
*/
@RequiredArgsConstructor
@Service
public class CompanyServiceImpl implements ICompanyService {
private final CompanyMapper baseMapper;
private final CityMapper cityMapper;
/**
* 查询商户
*/
@Override
public CompanyVo queryById(Integer id) {
return baseMapper.selectVoById(id);
}
/**
* 查询商户列表
*/
@Override
public TableDataInfo<CompanyVo> queryPageList(CompanyBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Company> lqw = buildQueryWrapper(bo);
Page<CompanyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(
companyVos -> {
companyVos.forEach(companyVo -> {
Optional.ofNullable(cityMapper.selectVoById(companyVo.getCityId()))
.ifPresent(cityVo -> {
companyVo.setCityName(cityVo.getName());
});
});
}
);
return TableDataInfo.build(result);
}
/**
* 查询商户列表
*/
@Override
public List<CompanyVo> queryList(CompanyBo bo) {
LambdaQueryWrapper<Company> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<Company> buildQueryWrapper(CompanyBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Company> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getName()), Company::getName, bo.getName());
lqw.eq(bo.getCityId() != null, Company::getCityId, bo.getCityId());
lqw.eq(StringUtils.isNotBlank(bo.getTel()), Company::getTel, bo.getTel());
lqw.eq(StringUtils.isNotBlank(bo.getPhone()), Company::getPhone, bo.getPhone());
lqw.eq(StringUtils.isNotBlank(bo.getAddress()), Company::getAddress, bo.getAddress());
lqw.eq(bo.getStatus() != null, Company::getStatus, bo.getStatus());
lqw.eq(StringUtils.isNotBlank(bo.getBusinessLicense()), Company::getBusinessLicense, bo.getBusinessLicense());
lqw.eq(bo.getIsCashDeposit() != null, Company::getIsCashDeposit, bo.getIsCashDeposit());
lqw.eq(StringUtils.isNotBlank(bo.getCashDeposit()), Company::getCashDeposit, bo.getCashDeposit());
lqw.eq(bo.getUid() != null, Company::getUid, bo.getUid());
lqw.eq(StringUtils.isNotBlank(bo.getTotalRevenue()), Company::getTotalRevenue, bo.getTotalRevenue());
lqw.eq(StringUtils.isNotBlank(bo.getBalance()), Company::getBalance, bo.getBalance());
lqw.eq(StringUtils.isNotBlank(bo.getFreezeBalance()), Company::getFreezeBalance, bo.getFreezeBalance());
return lqw;
}
/**
* 新增商户
*/
@Override
public Boolean insertByBo(CompanyBo bo) {
Company add = BeanUtil.toBean(bo, Company.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改商户
*/
@Override
public Boolean updateByBo(CompanyBo bo) {
Company update = BeanUtil.toBean(bo, Company.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(Company 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/EmployeesServiceImpl.java 0 → 100644
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.EmployeesBo;
import com.pz.system.domain.vo.EmployeesVo;
import com.pz.system.domain.Employees;
import com.pz.system.mapper.EmployeesMapper;
import com.pz.system.service.IEmployeesService;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 陪诊员Service业务层处理
*
* @author WangMin
* @date 2023-09-11
*/
@RequiredArgsConstructor
@Service
public class EmployeesServiceImpl implements IEmployeesService {
private final EmployeesMapper baseMapper;
/**
* 查询陪诊员
*/
@Override
public EmployeesVo queryById(Integer id){
return baseMapper.selectVoById(id);
}
/**
* 查询陪诊员列表
*/
@Override
public TableDataInfo<EmployeesVo> queryPageList(EmployeesBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Employees> lqw = buildQueryWrapper(bo);
Page<EmployeesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
/**
* 查询陪诊员列表
*/
@Override
public List<EmployeesVo> queryList(EmployeesBo bo) {
LambdaQueryWrapper<Employees> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<Employees> buildQueryWrapper(EmployeesBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<Employees> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getName()), Employees::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getStartYear()), Employees::getStartYear, bo.getStartYear());
lqw.eq(bo.getUid() != null, Employees::getUid, bo.getUid());
lqw.eq(bo.getStatus() != null, Employees::getStatus, bo.getStatus());
lqw.eq(bo.getNowType() != null, Employees::getNowType, bo.getNowType());
return lqw;
}
/**
* 新增陪诊员
*/
@Override
public Boolean insertByBo(EmployeesBo bo) {
Employees add = BeanUtil.toBean(bo, Employees.class);
validEntityBeforeSave(add);
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setId(add.getId());
}
return flag;
}
/**
* 修改陪诊员
*/
@Override
public Boolean updateByBo(EmployeesBo bo) {
Employees update = BeanUtil.toBean(bo, Employees.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
/**
* 保存前的数据校验
*/
private void validEntityBeforeSave(Employees 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/StoreIncomeServiceImpl.java
...@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery; ...@@ -7,6 +7,8 @@ import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.pz.system.domain.vo.StoreInfoVo;
import com.pz.system.mapper.StoreInfoMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.StoreIncomeBo; import com.pz.system.domain.bo.StoreIncomeBo;
...@@ -15,9 +17,8 @@ import com.pz.system.domain.StoreIncome; ...@@ -15,9 +17,8 @@ import com.pz.system.domain.StoreIncome;
import com.pz.system.mapper.StoreIncomeMapper; import com.pz.system.mapper.StoreIncomeMapper;
import com.pz.system.service.IStoreIncomeService; import com.pz.system.service.IStoreIncomeService;
import java.util.List; import java.util.*;
import java.util.Map; import java.util.stream.Collectors;
import java.util.Collection;
/** /**
* 商城提现审批Service业务层处理 * 商城提现审批Service业务层处理
...@@ -31,11 +32,13 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService { ...@@ -31,11 +32,13 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService {
private final StoreIncomeMapper baseMapper; private final StoreIncomeMapper baseMapper;
private final StoreInfoMapper storeInfoMapper;
/** /**
* 查询商城提现审批 * 查询商城提现审批
*/ */
@Override @Override
public StoreIncomeVo queryById(Integer id){ public StoreIncomeVo queryById(Integer id) {
return baseMapper.selectVoById(id); return baseMapper.selectVoById(id);
} }
...@@ -46,6 +49,24 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService { ...@@ -46,6 +49,24 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService {
public TableDataInfo<StoreIncomeVo> queryPageList(StoreIncomeBo bo, PageQuery pageQuery) { public TableDataInfo<StoreIncomeVo> queryPageList(StoreIncomeBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<StoreIncome> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<StoreIncome> lqw = buildQueryWrapper(bo);
Page<StoreIncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<StoreIncomeVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
List<Integer> storeIds = Optional.ofNullable(result.getRecords())
.orElse(Collections.emptyList())
.stream()
.map(StoreIncomeVo::getStoreId)
.collect(Collectors.toList());
List<StoreInfoVo> storeInfoVos = storeInfoMapper.selectVoBatchIds(storeIds);
Optional.ofNullable(result.getRecords())
.ifPresent(storeIncomeVos -> storeIncomeVos.parallelStream()
.forEach(storeIncomeVo -> {
Optional<StoreInfoVo> storeInfoVoOptional = storeInfoVos.stream()
.filter(storeInfoVo -> Objects.equals(storeInfoVo.getId(), storeIncomeVo.getStoreId()))
.findFirst();
//商户名称
storeInfoVoOptional.ifPresent(storeInfoVo -> storeIncomeVo.setStoreName(storeInfoVo.getName()));
}));
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
...@@ -96,7 +117,7 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService { ...@@ -96,7 +117,7 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(StoreIncome entity){ private void validEntityBeforeSave(StoreIncome entity) {
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
...@@ -105,7 +126,7 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService { ...@@ -105,7 +126,7 @@ public class StoreIncomeServiceImpl implements IStoreIncomeService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if(isValid){ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
......
pz-system/src/main/java/com/pz/system/service/impl/UserVsitorServiceImpl.java
package com.pz.system.service.impl; package com.pz.system.service.impl;
import cn.hutool.core.bean.BeanUtil; 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.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
......
pz-system/src/main/java/com/pz/system/service/impl/YypzOrderServiceImpl.java
...@@ -52,23 +52,7 @@ public class YypzOrderServiceImpl implements IYypzOrderService { ...@@ -52,23 +52,7 @@ public class YypzOrderServiceImpl implements IYypzOrderService {
*/ */
@Override @Override
public TableDataInfo<YypzOrderVo> queryPageList(YypzOrderBo bo, PageQuery pageQuery) { public TableDataInfo<YypzOrderVo> queryPageList(YypzOrderBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<YypzOrder> lqw = buildQueryWrapper(bo); Page<YypzOrderVo> result = baseMapper.findYypzOrderVoPage(pageQuery.build(), bo);
Page<YypzOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(
yypzOrderVos -> {
//关联主表订单
yypzOrderVos.forEach(yypzOrderVo -> {
Optional.ofNullable(totalOrderMapper.selectById(yypzOrderVo.getOrderId()))
.ifPresent(totalOrder -> {
yypzOrderVo.setOrderSn(totalOrder.getOrderSn());
yypzOrderVo.setPayMoney(new BigDecimal(totalOrder.getPayMoney()));
//获取城市名称
yypzOrderVo.setCityName(cityMapper.selectVoById(totalOrder.getCityId()).getName());
});
});
}
);
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
......
pz-system/src/main/resources/mapper/system/StoreOrderMapper.xml
...@@ -33,7 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -33,7 +33,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
si.name AS sName, si.name AS sName,
su.user_name AS userName, su.user_name AS userName,
so.`status` AS orderStatus, so.`status` AS orderStatus,
so.create_time AS createTime so.create_time AS createTime,
tao.status as toStatus
FROM FROM
store_order AS so store_order AS so
LEFT JOIN total_order AS tao ON tao.id = so.order_id LEFT JOIN total_order AS tao ON tao.id = so.order_id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment