yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

简易订单接口修改

master
hp 2 years ago
parent
e35ac5dd6d
commit
07feca51e5
2 changed files with 41 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
  2. 67
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

4
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositvehicle/BusDepositVehicleService.java
View File

@ -3,9 +3,11 @@ package com.yxt.anrui.buscenter.biz.busdepositvehicle;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.common.enums.DictCommonEnum;
import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomerVo;
import com.yxt.anrui.buscenter.api.busdepositvehicle.*;
import com.yxt.anrui.buscenter.api.busdepositvehiclecustomer.BusDepositVehicleCustomerVo;
import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
import com.yxt.anrui.buscenter.biz.busdepositcustomer.BusDepositCustomerService;
import com.yxt.anrui.buscenter.biz.busdepositvehiclecustomer.BusDepositVehicleCustomerService;
import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
@ -51,6 +53,8 @@ public class BusDepositVehicleService extends MybatisBaseService<BusDepositVehic
@Autowired
private BusDepositVehicleCustomerService busDepositVehicleCustomerService;
@Autowired
private BusDepositCustomerService busDepositCustomerService;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
SysStaffOrgFeign sysStaffOrgFeign;

67
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
View File

@ -42,6 +42,7 @@ import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBusDetailsVo;
import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListDto;
import com.yxt.anrui.buscenter.api.busdepositcustomer.BusDepositCustomer;
@ -240,7 +241,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
for (BusMainDepositListVo vo : list) {
if (vo.getDepositBillTypeKey().equals("02")) {
BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(vo.getSid());
if (busDepositVehicleCustomer != null){
if (busDepositVehicleCustomer != null) {
int count = baseMapper.selByBillSidCount(vo.getSid());
vo.setDepositVehicle(String.valueOf(count));
vo.setCustomerSid(busDepositVehicleCustomer.getCustomerSid());
@ -1232,22 +1233,24 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
* @param dto
*/
public void appSetBusDepositVehicle(AppBusDepositVehicleDto dto, BusMainDeposit busMainDeposit) {
for (AppBusDepositVehicleCarListDto carListDto : dto.getCarList()) {
BusDepositVehicle busDepositVehicle = new BusDepositVehicle();
busDepositVehicle.setBillSid(busMainDeposit.getSid());
busDepositVehicle.setBrandName(carListDto.getBrand());
busDepositVehicle.setModelName(carListDto.getModel());
busDepositVehicle.setRemarks(carListDto.getRemarks());
busDepositVehicle.setReserve_deposit_date(carListDto.getDepositDate());
busDepositVehicle.setReserve_position(carListDto.getLocation());
busDepositVehicle.setReserve_price(carListDto.getPrice());
busDepositVehicle.setModelConfigSid(carListDto.getConfigSid());
busDepositVehicle.setModelSid(carListDto.getModelSid());
busDepositVehicle.setVehicleSid(carListDto.getCarSid());
busDepositVehicle.setCreateBySid(dto.getUserSid());
busDepositVehicle.setColour(carListDto.getColour());
busDepositVehicle.setVinNo(carListDto.getVin());
busDepositVehicleService.insert(busDepositVehicle);
if (dto.getCarList().size() > 0) {
for (AppBusDepositVehicleCarListDto carListDto : dto.getCarList()) {
BusDepositVehicle busDepositVehicle = new BusDepositVehicle();
busDepositVehicle.setBillSid(busMainDeposit.getSid());
busDepositVehicle.setBrandName(carListDto.getBrand());
busDepositVehicle.setModelName(carListDto.getModel());
busDepositVehicle.setRemarks(carListDto.getRemarks());
busDepositVehicle.setReserve_deposit_date(carListDto.getDepositDate());
busDepositVehicle.setReserve_position(carListDto.getLocation());
busDepositVehicle.setReserve_price(carListDto.getPrice());
busDepositVehicle.setModelConfigSid(carListDto.getConfigSid());
busDepositVehicle.setModelSid(carListDto.getModelSid());
busDepositVehicle.setVehicleSid(carListDto.getCarSid());
busDepositVehicle.setCreateBySid(dto.getUserSid());
busDepositVehicle.setColour(carListDto.getColour());
busDepositVehicle.setVinNo(carListDto.getVin());
busDepositVehicleService.insert(busDepositVehicle);
}
}
}
@ -1681,9 +1684,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
qw.eq("bmd.depositBillTypeKey", "01");
//查询已审核通过的款项确认
ResultBean<List<String>> stringList = finCollectionConfirmationFeign.billeNoList();
if(stringList.getSuccess()){
if(!stringList.getData().isEmpty()){
qw.in("bmd.billNo",stringList.getData());
if (stringList.getSuccess()) {
if (!stringList.getData().isEmpty()) {
qw.in("bmd.billNo", stringList.getData());
}
}
qw.eq("bmd.nodeState", FlowComment.SETTLE.getRemark());//已办结
@ -1890,7 +1893,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
if (dto.getCarList().size() <= 0) {
return rb.setMsg("请补充车辆信息");
}
if (r != 2) {
if (r == 1) {
List<AppBusDepositVehicleCarListDto> carList = dto.getCarList();
for (AppBusDepositVehicleCarListDto carListDto : carList) {
String carSid = carListDto.getCarSid();
@ -2252,15 +2255,19 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
if (DictCommonEnum.DepositBillType.JYDD_DC.getCode().equals(busMainDeposit.getDepositBillTypeKey())) {
if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busMainDeposit.getCreateBySid())) {
//更新已选择的车架号的状态为未锁定
AppBusDepositVehicleDetailVo appBusDepositVehicleDetailVo = busDepositVehicleService.getReserveCarDetails(query.getBusinessSid()).getData();
if (appBusDepositVehicleDetailVo != null) {
List<String> list = appBusDepositVehicleDetailVo.getVehicleList().stream().map(AppBusDepositVehicleListVo::getCarSid).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());
BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
busMainDepositUpdateQuery.setVinSidList(list);
busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.UN_LOCK.getCode());
busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.UN_LOCK.getRemarks());
baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
}
}
}
return rb.success().setData(resultBean.getData());
}

Write Preview
Loading…
Cancel
Save