Skip to content

P
peizhen-java
Commit 90d90668 by Wangmin
Options

删除重复生成代码

parent 3f27173d
Showing with 58 additions and 1229 deletions
pz-admin/src/main/java/com/pz/web/controller/system/CompanyController.java deleted 100644 → 0
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 deleted 100644 → 0
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-merchant/src/main/java/com/pz/merchant/controller/applet/CompanyController.java
...@@ -5,16 +5,14 @@ import com.pz.common.core.controller.BaseController; ...@@ -5,16 +5,14 @@ import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R; import com.pz.common.core.domain.R;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.validate.AddGroup;
import com.pz.common.core.validate.EditGroup; import com.pz.common.core.validate.EditGroup;
import com.pz.merchant.domain.bo.CompanyBo;
import com.pz.merchant.domain.bo.EmployeesListBo; import com.pz.merchant.domain.bo.EmployeesListBo;
import com.pz.merchant.domain.bo.SetEmployeeWorkingHourBo; import com.pz.merchant.domain.bo.SetEmployeeWorkingHourBo;
import com.pz.merchant.domain.vo.CompanyVo;
import com.pz.merchant.domain.vo.EmployeesListVo; import com.pz.merchant.domain.vo.EmployeesListVo;
import com.pz.merchant.service.ICompanyService; import com.pz.merchant.service.ICompanyService;
import com.pz.merchant.service.IEmployeesService; import com.pz.merchant.service.IEmployeesService;
import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
...@@ -25,23 +23,33 @@ import org.springframework.web.bind.annotation.*; ...@@ -25,23 +23,33 @@ import org.springframework.web.bind.annotation.*;
* @date 2023-09-11 * @date 2023-09-11
*/ */
@Validated @Validated
@RequiredArgsConstructor
@RestController("AppCompanyController") @RestController("AppCompanyController")
@RequestMapping("/merchant/app/company") @RequestMapping("/merchant/app/company")
@SaIgnore @SaIgnore
public class CompanyController extends BaseController { public class CompanyController extends BaseController {
private final ICompanyService iCompanyService; private ICompanyService companyService;
private final IEmployeesService iEmployeesService; private IEmployeesService employeesService;
@Autowired
@Qualifier("merchantCompanyService")
public void setCompanyService(ICompanyService companyService) {
this.companyService = companyService;
}
@Autowired
@Qualifier("merchantEmployeesService")
public void setEmployeesService(IEmployeesService employeesService) {
this.employeesService = employeesService;
}
/** /**
* 查询陪诊员列表 * 查询陪诊员列表
*/ */
@GetMapping("/employee/list") @GetMapping("/employee/list")
public TableDataInfo<EmployeesListVo> employeesList(EmployeesListBo bo, PageQuery pageQuery) { public TableDataInfo<EmployeesListVo> employeesList(EmployeesListBo bo, PageQuery pageQuery) {
return iEmployeesService.employeesList(bo, pageQuery); return employeesService.employeesList(bo, pageQuery);
} }
/** /**
...@@ -52,7 +60,7 @@ public class CompanyController extends BaseController { ...@@ -52,7 +60,7 @@ public class CompanyController extends BaseController {
*/ */
@PutMapping("/employee/setWorkHour") @PutMapping("/employee/setWorkHour")
public R<Boolean> setEmployeesWorkHour(@RequestBody @Validated(EditGroup.class) SetEmployeeWorkingHourBo bo) { public R<Boolean> setEmployeesWorkHour(@RequestBody @Validated(EditGroup.class) SetEmployeeWorkingHourBo bo) {
return R.ok(iEmployeesService.setEmployeesWorkHours(bo)); return R.ok(employeesService.setEmployeesWorkHours(bo));
} }
} }
pz-merchant/src/main/java/com/pz/merchant/controller/pc/CompanyController.java
...@@ -31,7 +31,7 @@ import com.pz.common.utils.poi.ExcelUtil; ...@@ -31,7 +31,7 @@ import com.pz.common.utils.poi.ExcelUtil;
*/ */
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController()
@RequestMapping("/merchant/company") @RequestMapping("/merchant/company")
public class CompanyController extends BaseController { public class CompanyController extends BaseController {
......
pz-merchant/src/main/java/com/pz/merchant/controller/pc/EmployeesController.java
...@@ -31,7 +31,7 @@ import com.pz.common.core.page.TableDataInfo; ...@@ -31,7 +31,7 @@ import com.pz.common.core.page.TableDataInfo;
*/ */
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController()
@RequestMapping("/merchant/employees") @RequestMapping("/merchant/employees")
public class EmployeesController extends BaseController { public class EmployeesController extends BaseController {
......
pz-system/src/main/java/com/pz/merchant/domain/vo/CompanyVo.java
...@@ -41,6 +41,11 @@ public class CompanyVo implements Serializable { ...@@ -41,6 +41,11 @@ public class CompanyVo implements Serializable {
private Long cityId; private Long cityId;
/** /**
* 城市名称
*/
private String cityName;
/**
* 商户电话 * 商户电话
*/ */
@ExcelProperty(value = "商户电话") @ExcelProperty(value = "商户电话")
...@@ -59,7 +64,7 @@ public class CompanyVo implements Serializable { ...@@ -59,7 +64,7 @@ public class CompanyVo implements Serializable {
private String address; private String address;
/** /**
* 状态 * 状态 0-待审核，1-正常，2-禁用
*/ */
@ExcelProperty(value = "状态", converter = ExcelDictConvert.class) @ExcelProperty(value = "状态", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "company_state") @ExcelDictFormat(dictType = "company_state")
...@@ -72,7 +77,7 @@ public class CompanyVo implements Serializable { ...@@ -72,7 +77,7 @@ public class CompanyVo implements Serializable {
private String businessLicense; private String businessLicense;
/** /**
* 是否缴纳保证金 * 是否缴纳保证金 0-否，1-是
*/ */
@ExcelProperty(value = "是否缴纳保证金", converter = ExcelDictConvert.class) @ExcelProperty(value = "是否缴纳保证金", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "company_is_cash_deposit") @ExcelDictFormat(dictType = "company_is_cash_deposit")
...@@ -101,6 +106,11 @@ public class CompanyVo implements Serializable { ...@@ -101,6 +106,11 @@ public class CompanyVo implements Serializable {
*/ */
@ExcelProperty(value = "当前余额") @ExcelProperty(value = "当前余额")
private String balance; private String balance;
/**
* 冻结余额
*/
@ExcelProperty(value = "冻结余额")
private String freezeBalance;
/** /**
* 注册时间 * 注册时间
...@@ -108,5 +118,11 @@ public class CompanyVo implements Serializable { ...@@ -108,5 +118,11 @@ public class CompanyVo implements Serializable {
@ExcelProperty(value = "注册时间") @ExcelProperty(value = "注册时间")
private Date createTime; private Date createTime;
/**
* 备注
*/
@ExcelProperty(value = "备注")
private String remark;
} }
pz-system/src/main/java/com/pz/merchant/mapper/CompanyMapper.java
...@@ -4,6 +4,7 @@ package com.pz.merchant.mapper; ...@@ -4,6 +4,7 @@ package com.pz.merchant.mapper;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import com.pz.merchant.domain.Company; import com.pz.merchant.domain.Company;
import com.pz.merchant.domain.vo.CompanyVo; import com.pz.merchant.domain.vo.CompanyVo;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 商户Mapper接口 * 商户Mapper接口
...@@ -11,6 +12,7 @@ import com.pz.merchant.domain.vo.CompanyVo; ...@@ -11,6 +12,7 @@ import com.pz.merchant.domain.vo.CompanyVo;
* @author WangMin * @author WangMin
* @date 2023-09-11 * @date 2023-09-11
*/ */
@Mapper
public interface CompanyMapper extends BaseMapperPlus<CompanyMapper, Company, CompanyVo> { public interface CompanyMapper extends BaseMapperPlus<CompanyMapper, Company, CompanyVo> {
} }
pz-system/src/main/java/com/pz/merchant/mapper/EmployeesMapper.java
...@@ -23,7 +23,7 @@ import java.util.List; ...@@ -23,7 +23,7 @@ import java.util.List;
* @author WangMin * @author WangMin
* @date 2023-09-11 * @date 2023-09-11
*/ */
@Mapper @Mapper()
public interface EmployeesMapper extends BaseMapperPlus<EmployeesMapper, Employees, EmployeesVo> { public interface EmployeesMapper extends BaseMapperPlus<EmployeesMapper, Employees, EmployeesVo> {
/** /**
......
pz-system/src/main/java/com/pz/merchant/service/impl/CompanyServiceImpl.java
...@@ -12,6 +12,7 @@ import com.pz.merchant.domain.bo.CompanyBo; ...@@ -12,6 +12,7 @@ import com.pz.merchant.domain.bo.CompanyBo;
import com.pz.merchant.domain.vo.CompanyVo; import com.pz.merchant.domain.vo.CompanyVo;
import com.pz.merchant.mapper.CompanyMapper; import com.pz.merchant.mapper.CompanyMapper;
import com.pz.merchant.service.ICompanyService; import com.pz.merchant.service.ICompanyService;
import com.pz.system.mapper.CityMapper;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service; ...@@ -19,6 +20,7 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Collection; import java.util.Collection;
import java.util.Optional;
/** /**
* 商户Service业务层处理 * 商户Service业务层处理
...@@ -27,11 +29,13 @@ import java.util.Collection; ...@@ -27,11 +29,13 @@ import java.util.Collection;
* @date 2023-09-11 * @date 2023-09-11
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service("merchantCompanyService")
public class CompanyServiceImpl implements ICompanyService { public class CompanyServiceImpl implements ICompanyService {
private final CompanyMapper baseMapper; private final CompanyMapper baseMapper;
private final CityMapper cityMapper;
/** /**
* 查询商户 * 查询商户
*/ */
...@@ -47,6 +51,16 @@ public class CompanyServiceImpl implements ICompanyService { ...@@ -47,6 +51,16 @@ public class CompanyServiceImpl implements ICompanyService {
public TableDataInfo<CompanyVo> queryPageList(CompanyBo bo, PageQuery pageQuery) { public TableDataInfo<CompanyVo> queryPageList(CompanyBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Company> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<Company> lqw = buildQueryWrapper(bo);
Page<CompanyVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); 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); return TableDataInfo.build(result);
} }
......
pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java
...@@ -36,7 +36,7 @@ import java.util.Objects; ...@@ -36,7 +36,7 @@ import java.util.Objects;
* @date 2023-09-11 * @date 2023-09-11
*/ */
@RequiredArgsConstructor @RequiredArgsConstructor
@Service @Service("merchantEmployeesService")
public class EmployeesServiceImpl implements IEmployeesService { public class EmployeesServiceImpl implements IEmployeesService {
private final EmployeesMapper baseMapper; private final EmployeesMapper baseMapper;
......
pz-system/src/main/java/com/pz/system/domain/Company.java deleted 100644 → 0
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 deleted 100644 → 0
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/bo/CompanyBo.java deleted 100644 → 0
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 deleted 100644 → 0
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/vo/CompanyVo.java deleted 100644 → 0
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 deleted 100644 → 0
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/mapper/CityMapper.java
...@@ -3,6 +3,7 @@ package com.pz.system.mapper; ...@@ -3,6 +3,7 @@ package com.pz.system.mapper;
import com.pz.system.domain.City; import com.pz.system.domain.City;
import com.pz.system.domain.vo.CityVo; import com.pz.system.domain.vo.CityVo;
import com.pz.common.core.mapper.BaseMapperPlus; import com.pz.common.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Mapper;
/** /**
* 城市Mapper接口 * 城市Mapper接口
...@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus; ...@@ -10,6 +11,7 @@ import com.pz.common.core.mapper.BaseMapperPlus;
* @author ruoyi * @author ruoyi
* @date 2023-09-07 * @date 2023-09-07
*/ */
@Mapper
public interface CityMapper extends BaseMapperPlus<CityMapper, City, CityVo> { public interface CityMapper extends BaseMapperPlus<CityMapper, City, CityVo> {
} }
pz-system/src/main/java/com/pz/system/mapper/CompanyMapper.java deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
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 deleted 100644 → 0
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/CompanyServiceImpl.java deleted 100644 → 0
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 deleted 100644 → 0
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/UserVsitorServiceImpl.java
...@@ -7,7 +7,6 @@ import com.pz.common.core.domain.PageQuery; ...@@ -7,7 +7,6 @@ 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.common.utils.StringUtils;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.pz.system.domain.bo.UserVsitorBo; import com.pz.system.domain.bo.UserVsitorBo;
......
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