Skip to content

P
peizhen-java
Commit 481f00d6 by sdif
Options

用户端代码提交

parent a6969eb5
Showing with 26 additions and 15 deletions
pz-system/src/main/java/com/pz/merchant/domain/Company.java
...@@ -67,15 +67,15 @@ public class Company extends BaseEntity { ...@@ -67,15 +67,15 @@ public class Company extends BaseEntity {
/** /**
* 总收益 * 总收益
*/ */
private double totalRevenue; private String totalRevenue;
/** /**
* 当前余额 * 当前余额
*/ */
private double balance; private String balance;
/** /**
* 冻结余额 * 冻结余额
*/ */
private double freezeBalance; private String freezeBalance;
/** /**
* 删除标志(0代表存在 2代表删除) * 删除标志(0代表存在 2代表删除)
*/ */
......
pz-system/src/main/java/com/pz/merchant/domain/Employees.java
...@@ -79,15 +79,15 @@ public class Employees extends BaseEntity { ...@@ -79,15 +79,15 @@ public class Employees extends BaseEntity {
/** /**
* 总收益 * 总收益
*/ */
private double totalRevenue; private String totalRevenue;
/** /**
* 当前余额 * 当前余额
*/ */
private double balance; private String balance;
/** /**
* 冻结余额 * 冻结余额
*/ */
private double freezeBalance; private String freezeBalance;
/** /**
* 取消订单次数 * 取消订单次数
*/ */
......
pz-system/src/main/java/com/pz/system/service/impl/DepartmentServiceImpl.java
...@@ -92,8 +92,18 @@ public class DepartmentServiceImpl implements IDepartmentService { ...@@ -92,8 +92,18 @@ public class DepartmentServiceImpl implements IDepartmentService {
@Override @Override
public List<DepartmentVo> departmentByHospitalId(Integer hospitalId) { public List<DepartmentVo> departmentByHospitalId(Integer hospitalId) {
Hospital hospital = hospitalMapper.selectById(hospitalId); Hospital hospital = hospitalMapper.selectById(hospitalId);
List<Integer> ids = JsonUtils.parseArray(hospital.getDepartments(), Integer.class); // 移除字符串中的方括号和双引号
List<DepartmentVo> departments = baseMapper.selectVoList(new LambdaQueryWrapper<Department>().in(Department::getId, ids)); String trimmedString = hospital.getDepartments().substring(1, hospital.getDepartments().length() - 1).replace("\"", "");
// 拆分字符串为数组
String[] numberStrings = trimmedString.split(",");
// 将字符串数组转为整数列表
List<Integer> integerList = new ArrayList<>();
for (String numberString : numberStrings) {
integerList.add(Integer.parseInt(numberString));
}
List<DepartmentVo> departments = baseMapper.selectVoList(new LambdaQueryWrapper<Department>().in(Department::getId, integerList));
if (CollectionUtils.isNotEmpty(departments)) { if (CollectionUtils.isNotEmpty(departments)) {
//查询所有菜单 //查询所有菜单
List<DepartmentVo> allMenu = departments; List<DepartmentVo> allMenu = departments;
......
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
...@@ -618,15 +618,15 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -618,15 +618,15 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
if(employees.getCompanyId() != 0){ if(employees.getCompanyId() != 0){
Company company = companyMapper.selectById(employees.getCompanyId()); Company company = companyMapper.selectById(employees.getCompanyId());
company.setTotalRevenue(company.getTotalRevenue() + money); company.setTotalRevenue((Double.parseDouble(company.getTotalRevenue()) + money) + "");
company.setBalance(company.getBalance() + money); company.setBalance((Double.parseDouble(company.getBalance()) + money) +"");
companyMapper.updateById(company); companyMapper.updateById(company);
}else { }else {
employees.setTotalRevenue(employees.getTotalRevenue()); employees.setTotalRevenue((Double.parseDouble(employees.getTotalRevenue()) + money) + "");
employees.setBalance(employees.getBalance()); employees.setBalance((Double.parseDouble(employees.getBalance()) + money) +"");
employeesMapper.updateById(employees); employeesMapper.updateById(employees);
} }
...@@ -722,15 +722,16 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -722,15 +722,16 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
if(employees.getCompanyId() != 0){ if(employees.getCompanyId() != 0){
Company company = companyMapper.selectById(employees.getCompanyId()); Company company = companyMapper.selectById(employees.getCompanyId());
company.setTotalRevenue(company.getTotalRevenue() - money); company.setTotalRevenue((Double.parseDouble(company.getTotalRevenue()) - money) + "");
company.setBalance(company.getBalance() - money); company.setBalance((Double.parseDouble(company.getBalance()) - money) +"");
companyMapper.updateById(company); companyMapper.updateById(company);
}else { }else {
employees.setTotalRevenue(employees.getTotalRevenue()); employees.setTotalRevenue(employees.getTotalRevenue());
employees.setBalance(employees.getBalance()); employees.setTotalRevenue((Double.parseDouble(employees.getTotalRevenue()) - money) + "");
employees.setBalance((Double.parseDouble(employees.getBalance()) - money) +"");
employeesMapper.updateById(employees); employeesMapper.updateById(employees);
} }
......
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