Skip to content

P
peizhen-java
Commit 0e8de985 by sdif
Options

用户端代码提交

parent 3f92dad6
Showing with 28 additions and 7 deletions
pz-system/src/main/java/com/pz/system/mapper/CityMapper.java
...@@ -4,6 +4,7 @@ import com.pz.system.domain.City; ...@@ -4,6 +4,7 @@ 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; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -15,5 +16,5 @@ import java.util.List; ...@@ -15,5 +16,5 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface CityMapper extends BaseMapperPlus<CityMapper, City, CityVo> { public interface CityMapper extends BaseMapperPlus<CityMapper, City, CityVo> {
List<CityVo> selectAppCity(); List<CityVo> selectAppCity(@Param("name") String name);
} }
pz-system/src/main/java/com/pz/system/service/impl/CityServiceImpl.java
...@@ -60,9 +60,9 @@ public class CityServiceImpl implements ICityService { ...@@ -60,9 +60,9 @@ public class CityServiceImpl implements ICityService {
@Override @Override
public List<CityVo> queryAppList(CityBo bo) { public List<CityVo> queryAppList(CityBo bo) {
List<CityVo> cityVos = baseMapper.selectAppCity(); List<CityVo> cityVos = baseMapper.selectAppCity(bo.getName());
for (CityVo cityVo : cityVos) { for (CityVo cityVo : cityVos) {
cityVo.setCityVo(baseMapper.selectVoList(new LambdaQueryWrapper<City>().eq(City::getSy,cityVo.getSy()))); cityVo.setCityVo(baseMapper.selectVoList(new LambdaQueryWrapper<City>().eq(City::getSy,cityVo.getSy()).eq(City::getName,cityVo.getName())));
} }
return cityVos; return cityVos;
} }
......
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
...@@ -28,10 +28,12 @@ import com.pz.common.exception.ServiceException; ...@@ -28,10 +28,12 @@ import com.pz.common.exception.ServiceException;
import com.pz.common.utils.HttpUtils; import com.pz.common.utils.HttpUtils;
import com.pz.merchant.domain.Company; import com.pz.merchant.domain.Company;
import com.pz.merchant.domain.Employees; import com.pz.merchant.domain.Employees;
import com.pz.merchant.domain.EmployeesDivide;
import com.pz.merchant.domain.vo.EmployeesVo; import com.pz.merchant.domain.vo.EmployeesVo;
import com.pz.common.utils.JsonUtils; import com.pz.common.utils.JsonUtils;
import com.pz.merchant.domain.vo.SonOrderVo; import com.pz.merchant.domain.vo.SonOrderVo;
import com.pz.merchant.mapper.CompanyMapper; import com.pz.merchant.mapper.CompanyMapper;
import com.pz.merchant.mapper.EmployeesDivideMapper;
import com.pz.merchant.mapper.EmployeesMapper; import com.pz.merchant.mapper.EmployeesMapper;
import com.pz.merchant.service.ISonOrderService; import com.pz.merchant.service.ISonOrderService;
import com.pz.merchant.service.impl.SonOrderServiceBuilder; import com.pz.merchant.service.impl.SonOrderServiceBuilder;
...@@ -114,6 +116,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -114,6 +116,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
private final EmployeesMapper employeesMapper; private final EmployeesMapper employeesMapper;
private final EmployeesDivideMapper employeesDivideMapper;
private final PaymentRecordMapper paymentRecordMapper; private final PaymentRecordMapper paymentRecordMapper;
private final OrderDelayQueue delayQueue; private final OrderDelayQueue delayQueue;
...@@ -602,6 +606,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -602,6 +606,11 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
//除了商城订单和诊前挂号不需要给陪诊员和商户分成 //除了商城订单和诊前挂号不需要给陪诊员和商户分成
if(totalOrder1.getBusinessId() != 0 && totalOrder1.getBusinessId() != 6){ if(totalOrder1.getBusinessId() != 0 && totalOrder1.getBusinessId() != 6){
Services services = servicesMapper.selectById(totalOrder1.getServiceId()); Services services = servicesMapper.selectById(totalOrder1.getServiceId());
//添加订单分成记录
EmployeesDivide employeesDivide = new EmployeesDivide();
employeesDivide.setOrderId(totalOrder1.getId().intValue());
employeesDivide.setOrderPrice(totalOrder1.getPayMoney()+"");
if(services.getFenmo() != 0){ if(services.getFenmo() != 0){
double money = 0; double money = 0;
Employees employees = employeesMapper.selectById(totalOrder1.getEmId()); Employees employees = employeesMapper.selectById(totalOrder1.getEmId());
...@@ -612,7 +621,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -612,7 +621,8 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
double fenmo = (double) services.getFenmo() / 100; double fenmo = (double) services.getFenmo() / 100;
double v = totalOrder1.getPayMoney() * fenmo; double v = totalOrder1.getPayMoney() * fenmo;
employeesDivide.setProportion(services.getFenmo());
employeesDivide.setEmId(employees.getId());
money = v; money = v;
if(employees.getCompanyId() != 0){ if(employees.getCompanyId() != 0){
...@@ -620,16 +630,21 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -620,16 +630,21 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
Company company = companyMapper.selectById(employees.getCompanyId()); Company company = companyMapper.selectById(employees.getCompanyId());
company.setTotalRevenue((Double.parseDouble(company.getTotalRevenue()) + money) + ""); company.setTotalRevenue((Double.parseDouble(company.getTotalRevenue()) + money) + "");
company.setBalance((Double.parseDouble(company.getBalance()) + money) +""); company.setBalance((Double.parseDouble(company.getBalance()) + money) +"");
employeesDivide.setCompanyId(employees.getCompanyId());
companyMapper.updateById(company); companyMapper.updateById(company);
employeesDivide.setDividePrice(money+"");
}else { }else {
employees.setTotalRevenue((Double.parseDouble(employees.getTotalRevenue()) + money) + ""); employees.setTotalRevenue((Double.parseDouble(employees.getTotalRevenue()) + money) + "");
employees.setBalance((Double.parseDouble(employees.getBalance()) + money) +""); employees.setBalance((Double.parseDouble(employees.getBalance()) + money) +"");
employeesMapper.updateById(employees);
employeesMapper.updateById(employees);
employeesDivide.setDividePrice(money+"");
} }
employeesDivideMapper.insert(employeesDivide);
} }
} }
......
pz-system/src/main/resources/mapper/system/CityMapper.xml
...@@ -3,6 +3,11 @@ ...@@ -3,6 +3,11 @@
<mapper namespace="com.pz.system.mapper.CityMapper"> <mapper namespace="com.pz.system.mapper.CityMapper">
<select id="selectAppCity" resultType="com.pz.system.domain.vo.CityVo"> <select id="selectAppCity" resultType="com.pz.system.domain.vo.CityVo">
SELECT * FROM city GROUP BY sy SELECT * FROM city sy
<if test="name != null and name != ''">
where sy.name LIKE CONCAT('%', #{name}, '%')
</if>
GROUP BY sy
</select> </select>
</mapper> </mapper>
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