yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(order):投递、清运订单统计后端代码提交;

Browse Source
master
jiyufei 4 months ago
parent 5f76932204
commit 30ac54d0b8
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File

11
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleCleanOrderServiceImpl.java
Unescape View File

@ -376,12 +376,17 @@ public class RecycleCleanOrderServiceImpl extends ServiceImpl<RecycleCleanOrderM
@Override
public List<OrderStatisticsResponse> cleanCount(OrderStatisticsRequest request) {
log.info("查询清运统计，request:{}", request);
if (StringUtils.isBlank(request.getCompanyId())) {
List<String> finalDeviceCodes = Lists.newArrayList();
if (StringUtils.isBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
//获取当前商户id
List<String> stationIds = recycleDeviceService.getStationByCompanyId(userProvider.get().getOrganizeId());
if (CollectionUtils.isEmpty(stationIds)) {
return Collections.emptyList();
}
List<String> finalDeviceCodes = Lists.newArrayList();
List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
finalDeviceCodes.addAll(deviceCodes);
} else if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
//只勾选了商户 则查询商户底下的所有设备编码
if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
List<String> stationIds = recycleDeviceService.getStationByCompanyId(request.getCompanyId());
List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
finalDeviceCodes.addAll(deviceCodes);

9
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/RecycleDeliveryOrderServiceImpl.java
Unescape View File

@ -657,11 +657,16 @@ public class RecycleDeliveryOrderServiceImpl extends ServiceImpl<RecycleDelivery
public List<OrderStatisticsResponse> deliveryCount(OrderStatisticsRequest request) {
log.info("查询投递统计，request:{}", request);
List<String> finalDeviceCodes = Lists.newArrayList();
if (StringUtils.isBlank(request.getCompanyId())) {
if (StringUtils.isBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
//获取当前商户id
List<String> stationIds = recycleDeviceService.getStationByCompanyId(userProvider.get().getOrganizeId());
if (CollectionUtils.isEmpty(stationIds)) {
return Collections.emptyList();
}
List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
finalDeviceCodes.addAll(deviceCodes);
} else if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
//只勾选了商户 则查询商户底下的所有设备编码
if (StringUtils.isNoneBlank(request.getCompanyId()) && CollectionUtils.isEmpty(request.getStationIds()) && CollectionUtils.isEmpty(request.getDeviceCodes())) {
List<String> stationIds = recycleDeviceService.getStationByCompanyId(request.getCompanyId());
List<String> deviceCodes = recycleDeviceService.getCodeByStationIds(stationIds);
finalDeviceCodes.addAll(deviceCodes);

Write Preview
Loading…
Cancel
Save