Skip to content

P
peizhen-java
Commit e218a74d by 邹磊浩
Options

修改代码

parent 9144c2a3
Showing with 47 additions and 31 deletions
pz-admin/src/main/java/com/pz/web/task/InsertTestOrderTask.java
...@@ -66,13 +66,13 @@ public class InsertTestOrderTask { ...@@ -66,13 +66,13 @@ public class InsertTestOrderTask {
private final EmployeesDivideMapper employeesDivideMapper; private final EmployeesDivideMapper employeesDivideMapper;
public static List<Integer> businessIds = Arrays.asList(0, 1, 2, 3, 4, 5, 6); public static List<Integer> businessIds = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
@Scheduled(cron = "0 0 0 * * ?") // 凌晨12点执行
@Scheduled(cron = "0 57 13 * * ?") // 凌晨12点执行
public void insertOrder() throws InterruptedException { public void insertOrder() throws InterruptedException {
// 就诊人员 // 就诊人员
List<UserVsitor> userVsitors = userVsitorMapper.selectList(Wrappers.<UserVsitor>lambdaQuery().last("limit 20")); List<UserVsitor> userVsitors = userVsitorMapper.selectList(Wrappers.<UserVsitor>lambdaQuery().last("limit 20"));
UserVsitor randomElement = getRandomElement(userVsitors);
// 查询固定机构 // 查询固定机构
List<Company> companies = companyMapper.selectList(Wrappers.<Company>lambdaQuery().in(Company::getId, 5, 14, 15, 16, 17,18,19)); List<Company> companies = companyMapper.selectList(Wrappers.<Company>lambdaQuery().in(Company::getId, 5, 14, 15, 16, 17, 18, 19));
// 加入线程池并发执行 // 加入线程池并发执行
ExecutorService executorService = Executors.newFixedThreadPool(10); ExecutorService executorService = Executors.newFixedThreadPool(10);
for (Company company : companies) { for (Company company : companies) {
...@@ -81,10 +81,15 @@ public class InsertTestOrderTask { ...@@ -81,10 +81,15 @@ public class InsertTestOrderTask {
List<Hospital> hospitals = hospitalMapper.selectList(Wrappers.<Hospital>lambdaQuery().eq(Hospital::getCityId, employees.getCityId()).last("limit 10")); List<Hospital> hospitals = hospitalMapper.selectList(Wrappers.<Hospital>lambdaQuery().eq(Hospital::getCityId, employees.getCityId()).last("limit 10"));
Hospital hospital = getRandomElement(hospitals); Hospital hospital = getRandomElement(hospitals);
for (Integer businessId : businessIds) { for (Integer businessId : businessIds) {
//获取服务价格
List<Services> services = servicesMapper.selectList(Wrappers.<Services>lambdaQuery().eq(Services::getBid, businessId).eq(Services::getCityId, employees.getCityId()));
// 每日单量 // 每日单量
Integer num = RandomUtil.randomInt(30, 50); Integer num = RandomUtil.randomInt(30, 50);
for (int i = 0; i <= num; i++) { for (int i = 0; i <= num; i++) {
Long orderId = saveTotalOrder(businessId, employees.getId(), employees.getCityId().intValue(), company.getId()); //接单人员
UserVsitor randomElement = getRandomElement(userVsitors);
for (Services service : services) {
Long orderId = saveTotalOrder(businessId, employees.getId(), employees.getCityId().intValue(), company.getId(), service);
switch (businessId) { switch (businessId) {
case 0: case 0:
StoreOrder storeOrder = new StoreOrder(); StoreOrder storeOrder = new StoreOrder();
...@@ -165,19 +170,16 @@ public class InsertTestOrderTask { ...@@ -165,19 +170,16 @@ public class InsertTestOrderTask {
} }
} }
} }
}
}); });
} }
executorService.shutdown(); executorService.shutdown();
executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS); executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);
} }
public Long saveTotalOrder(Integer businessId, Integer emId, Integer cityId, Integer companyId) { public Long saveTotalOrder(Integer businessId, Integer emId, Integer cityId, Integer companyId, Services services) {
//随机服务id
Integer serviceId = RandomUtil.randomInt(1, 12);
//随机评价 //随机评价
Integer i = RandomUtil.randomInt(0, 1); Integer i = RandomUtil.randomInt(0, 1);
//获取服务价格
Services services = servicesMapper.selectById(serviceId);
//创建主订单 //创建主订单
TotalOrder totalOrder = new TotalOrder(); TotalOrder totalOrder = new TotalOrder();
totalOrder.setStatus(2); totalOrder.setStatus(2);
...@@ -186,7 +188,7 @@ public class InsertTestOrderTask { ...@@ -186,7 +188,7 @@ public class InsertTestOrderTask {
totalOrder.setIsSatisfaction(i); totalOrder.setIsSatisfaction(i);
totalOrder.setBusinessId(businessId); totalOrder.setBusinessId(businessId);
totalOrder.setFinishTime(new Date()); totalOrder.setFinishTime(new Date());
totalOrder.setServiceId(serviceId); totalOrder.setServiceId(services.getId());
totalOrder.setCityId(cityId); totalOrder.setCityId(cityId);
totalOrder.setOrderSn(RandomUtil.randomNumbers(21)); totalOrder.setOrderSn(RandomUtil.randomNumbers(21));
totalOrder.setEmId(emId); totalOrder.setEmId(emId);
......
pz-system/src/main/java/com/pz/system/domain/bo/OrderColumnarBo.java
...@@ -28,4 +28,14 @@ public class OrderColumnarBo implements Serializable { ...@@ -28,4 +28,14 @@ public class OrderColumnarBo implements Serializable {
* 陪诊员ids * 陪诊员ids
*/ */
private List<Integer> emIds; private List<Integer> emIds;
/**
* 城市id
*/
private Long cityId;
/**
* 机构id
*/
private Long companyId;
} }
pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java
...@@ -1248,20 +1248,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -1248,20 +1248,6 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
public List<OrderLineVo> findOrderColumnarVoList(OrderColumnarBo bo) { public List<OrderLineVo> findOrderColumnarVoList(OrderColumnarBo bo) {
Long roleId = LoginHelper.getLoginUser().getRoleId(); Long roleId = LoginHelper.getLoginUser().getRoleId();
Long userId = LoginHelper.getUserId(); Long userId = LoginHelper.getUserId();
//商户
if (roleId == 3L) {
//查找该商户
Optional.ofNullable(companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, userId).eq(Company::getStatus, 1)))
.ifPresent(company -> {
//获取该商户下所有陪诊员
List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().eq(Employees::getCompanyId, company.getId()));
if (CollectionUtils.isNotEmpty(employees)) {
bo.setEmIds(employees.stream().map(Employees::getId).collect(Collectors.toList()));
} else {
bo.setEmIds(Arrays.asList(999999));
}
});
}
List<OrderLineVo> list = new ArrayList<>(); List<OrderLineVo> list = new ArrayList<>();
List<String> recentDates; List<String> recentDates;
switch (bo.getType()) { switch (bo.getType()) {
...@@ -1277,16 +1263,34 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -1277,16 +1263,34 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
default: default:
return list; return list;
} }
// 获取商户和陪诊员信息
if (roleId == 3L) {
Optional.ofNullable(companyMapper.selectOne(Wrappers.<Company>lambdaQuery().eq(Company::getUid, userId).eq(Company::getStatus, 1)))
.ifPresent(company -> {
List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().eq(Employees::getCompanyId, company.getId()));
bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
});
}
// 获取该城市下所有陪诊员信息
if (bo.getCityId() != null) {
List<Company> companies = companyMapper.selectList(Wrappers.<Company>lambdaQuery().eq(Company::getCityId, bo.getCityId()).eq(null != bo.getCompanyId(), Company::getId, bo.getCompanyId()).eq(Company::getStatus, 1));
if (CollectionUtils.isNotEmpty(companies)) {
List<Employees> employees = employeesMapper.selectList(Wrappers.<Employees>lambdaQuery().in(Employees::getCompanyId, companies.stream().map(Company::getId).collect(Collectors.toList())));
bo.setEmIds(CollectionUtils.isNotEmpty(employees) ? employees.stream().map(Employees::getId).collect(Collectors.toList()) : Arrays.asList(999999));
}
}
// 使用一个 Map 来缓存已经查询过的订单列列表 // 使用一个 Map 来缓存已经查询过的订单列列表
Map<String, List<OrderColumnarVo>> orderMap = new HashMap<>(); Map<String, List<OrderColumnarVo>> orderMap = new HashMap<>();
for (String time : recentDates) { for (String time : recentDates) {
List<OrderColumnarVo> orderColumnarVoList = orderMap.get(time); List<OrderColumnarVo> orderColumnarVoList = orderMap.computeIfAbsent(time, k -> {
if (orderColumnarVoList == null) { List<OrderColumnarVo> columnarVoList = baseMapper.findOrderColumnarVoList(time, bo.getEmIds());
orderColumnarVoList = baseMapper.findOrderColumnarVoList(time, bo.getEmIds());
OrderColumnarVo orderColumnarVo = baseMapper.findStoreOrderVoList(time, bo.getEmIds()); OrderColumnarVo orderColumnarVo = baseMapper.findStoreOrderVoList(time, bo.getEmIds());
orderColumnarVoList.add(orderColumnarVo); columnarVoList.add(orderColumnarVo);
orderMap.put(time, orderColumnarVoList); return columnarVoList;
} });
OrderLineVo orderLineVo = new OrderLineVo(); OrderLineVo orderLineVo = new OrderLineVo();
orderLineVo.setKey(time); orderLineVo.setKey(time);
orderLineVo.setList(orderColumnarVoList); orderLineVo.setList(orderColumnarVoList);
...@@ -1437,7 +1441,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService { ...@@ -1437,7 +1441,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
@Override @Override
public DataOrderVo platformRevenue(DataViewBo dataViewBo) { public DataOrderVo platformRevenue(DataViewBo dataViewBo) {
if(null != dataViewBo.getUserId()){ if (null != dataViewBo.getUserId()) {
Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, dataViewBo.getUserId())); Company company = companyMapper.selectOne(new LambdaQueryWrapper<Company>().eq(Company::getUid, dataViewBo.getUserId()));
dataViewBo.setUserId(company.getId().longValue()); dataViewBo.setUserId(company.getId().longValue());
return baseMapper.selectPlatformCom(dataViewBo); return baseMapper.selectPlatformCom(dataViewBo);
......
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