qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-平台端经营分析

Browse Source
This commit is contained in:
xl
2024-07-23 13:49:19 +08:00
parent ce2a07fb98
commit ae3063d918
4 changed files with 40 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lxk-admin/src/main/java/com/zbkj/admin/controller/merchant/MerchantBusinessAnalysisController.java Normal file
View File

@@ -0,0 +1,35 @@
package com.zbkj.admin.controller.merchant;
import com.zbkj.admin.service.HomeService;
import com.zbkj.common.model.admin.SystemAdmin;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.response.BusinessAnalysisResponse;
import com.zbkj.common.result.CommonResult;
import com.zbkj.common.utils.SecurityUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@Slf4j
@RestController
@RequestMapping("api/admin/merchant/business/analysis")
@Api(tags = "汽车系统-维修PC-经营分析控制器")
public class MerchantBusinessAnalysisController {
@Autowired
private HomeService homeService;
@PreAuthorize("hasAuthority('merchant:business:analysis:lattice')")
@ApiOperation(value = "经营分析各个成本数据")
@RequestMapping(value = "/lattice", method = RequestMethod.POST)
public CommonResult<BusinessAnalysisResponse> indexDate(@RequestBody BusinessAnalysisRequest request) {
SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
request.setMerId(systemAdmin.getMerId());
return CommonResult.success(homeService.getBusiness(request));
}
}

1
lxk-admin/src/main/java/com/zbkj/admin/controller/platform/PlatformBusinessAnalysisController.java
View File

@@ -26,7 +26,6 @@ public class PlatformBusinessAnalysisController {
@ApiOperation(value = "经营分析各个成本数据")
@RequestMapping(value = "/lattice", method = RequestMethod.POST)
public CommonResult<BusinessAnalysisResponse> indexDate(@RequestBody BusinessAnalysisRequest request) {
//SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
return CommonResult.success(homeService.getBusiness(request));
}
}

6
lxk-service/src/main/java/com/zbkj/service/service/impl/CarReservationInfoServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.zbkj.common.constants.DateConstants;
import com.zbkj.common.model.car.CarReservationInfo;
import com.zbkj.common.request.BusinessAnalysisRequest;
import com.zbkj.common.utils.LxkDateUtil;
import com.zbkj.common.utils.LxkUtil;
import com.zbkj.common.vo.BusinessAnalysisVo;
import com.zbkj.common.vo.DateLimitUtilVo;
import com.zbkj.service.dao.car.CarReservationInfoDao;
@@ -84,9 +85,10 @@ public class CarReservationInfoServiceImpl extends ServiceImpl<CarReservationInf
CompletableFuture.allOf(current, year, month).join();
try {
//当前数据
vo.setCurrentData(current.get());
vo.setYearOnYear(year.get());
vo.setLinkRelativeRatio(month.get());
vo.setYearOnYear(LxkUtil.getRateBig(current.get(), year.get()));
vo.setLinkRelativeRatio(LxkUtil.getRateBig(current.get(), month.get()));
} catch (InterruptedException | ExecutionException e) {
e.printStackTrace();
vo = null;

2
lxk-service/src/main/java/com/zbkj/service/service/impl/ReservationOrderCashDeskServiceImpl.java
View File

@@ -394,7 +394,7 @@ public class ReservationOrderCashDeskServiceImpl extends ServiceImpl<Reservation
}
List<String> deskSn = list.stream().map(ReservationOrderCashDesk::getCashDeskSn).collect(Collectors.toList());
LambdaQueryWrapper<ReservationOrderCashDeskItem> item = new LambdaQueryWrapper<>();
item.eq(ReservationOrderCashDeskItem::getCashDeskSn, deskSn);
item.in(ReservationOrderCashDeskItem::getCashDeskSn, deskSn);
List<ReservationOrderCashDeskItem> items = reservationOrderCashDeskItemService.list(item);
List<Integer> orderIds = items.stream().map(ReservationOrderCashDeskItem::getOrderId).distinct().collect(Collectors.toList());
QueryWrapper<CarReservationInfo> qw = new QueryWrapper<>();