|
|
|
@ -59,6 +59,8 @@ import com.yxt.anrui.flowable.api.utils.ProcessStateEnum; |
|
|
|
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; |
|
|
|
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign; |
|
|
|
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUser; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
@ -101,6 +103,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp |
|
|
|
@Autowired |
|
|
|
private SysStaffOrgFeign sysStaffOrgFeign; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SysOrganizationFeign sysOrganizationFeign; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private DictCommonFeign dictCommonFeign; |
|
|
|
|
|
|
|
@ -587,11 +592,9 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp |
|
|
|
pagerQuery.getParams().setStaffSid(staffSid); |
|
|
|
QueryWrapper<AppBusMainDepositVo> qw = aaQueryWrapper(pagerQuery.getParams()); |
|
|
|
AppBusMainDepositQuery params = pagerQuery.getParams(); |
|
|
|
IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw,params.getName()); |
|
|
|
IPage<AppBusMainDepositVo> iPage = baseMapper.getVirtualOrders(page, qw, params.getName()); |
|
|
|
for (AppBusMainDepositVo record : iPage.getRecords()) { |
|
|
|
String virtualOrderSid = record.getVirtualOrderSid(); |
|
|
|
int count = baseMapper.selByBillSidCount(virtualOrderSid); |
|
|
|
record.setCarNumber(String.valueOf(count)); |
|
|
|
if (record.getVirtualOrderType().equals("01")) { |
|
|
|
AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid); |
|
|
|
record.setPayName(vo.getPayName()); |
|
|
|
@ -600,6 +603,8 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp |
|
|
|
record.setCarNumber(vo.getCarNumber()); |
|
|
|
} else if (record.getVirtualOrderType().equals("02")) { |
|
|
|
BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(virtualOrderSid); |
|
|
|
int count = baseMapper.selByBillSidCount(virtualOrderSid); |
|
|
|
record.setCarNumber(String.valueOf(count)); |
|
|
|
record.setCustomerSid(busDepositVehicleCustomer.getCustomerSid()); |
|
|
|
record.setCustomerName(busDepositVehicleCustomer.getCustomerName()); |
|
|
|
record.setMobile(busDepositVehicleCustomer.getCustomerMobile()); |
|
|
|
@ -652,18 +657,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp |
|
|
|
public ResultBean |
|
|
|
saveDepositInfo(AppBusDepositBuscenterDto dto) { |
|
|
|
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); |
|
|
|
Date date = new Date(); |
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
//判断订单sid是否有值(无值 新增 有值 修改)
|
|
|
|
if (StringUtils.isBlank(dto.getVirtualOrderSid())) { //新增
|
|
|
|
BusMainDeposit busMainDeposit = new BusMainDeposit(); |
|
|
|
busMainDeposit.setNodeState("待提交"); |
|
|
|
busMainDeposit.setSid(UUID.randomUUID().toString()); |
|
|
|
Map<String, String> map = generateBillNo(dto.getUserSid()); |
|
|
|
busMainDeposit.setBillNo(map.get("billNo_Num")); |
|
|
|
busMainDeposit.setStaffSid(data.getStaffSid()); |
|
|
|
busMainDeposit.setStaffName(data.getStaffName()); |
|
|
|
busMainDeposit.setOrgSid(data.getOrgSid()); |
|
|
|
busMainDeposit.setOrgName(data.getOrgName()); |
|
|
|
busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + data.getOrgName()); |
|
|
|
busMainDeposit.setDepositBillType("订金收取"); |
|
|
|
busMainDeposit.setDepositBillTypeKey("01"); |
|
|
|
busMainDeposit.setCreateDate(dateFormat.format(date)); |
|
|
|
@ -1075,18 +1082,20 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp |
|
|
|
*/ |
|
|
|
@Transactional(rollbackFor = Exception.class) |
|
|
|
public ResultBean reserveCarInfo(AppBusDepositVehicleDto dto) { |
|
|
|
AppUserOrgInfoVo data = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); |
|
|
|
AppUserOrgInfoVo appUserOrgInfoVo = sysUserFeign.getUserOrgInfoByUserSid(dto.getUserSid()).getData(); |
|
|
|
SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.getUseOrgByUserSid(dto.getUserSid()).getData(); |
|
|
|
Date date = new Date(); |
|
|
|
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
|
|
|
if (StringUtils.isBlank(dto.getVirtualOrderSid())) {//新增
|
|
|
|
BusMainDeposit busMainDeposit = new BusMainDeposit(); |
|
|
|
busMainDeposit.setNodeState("待提交"); |
|
|
|
busMainDeposit.setSid(UUID.randomUUID().toString()); |
|
|
|
Map<String, String> map = generateBillNo(dto.getUserSid()); |
|
|
|
busMainDeposit.setBillNo(map.get("billNo_Num")); |
|
|
|
busMainDeposit.setStaffSid(data.getStaffSid()); |
|
|
|
busMainDeposit.setStaffName(data.getStaffName()); |
|
|
|
busMainDeposit.setOrgSid(data.getOrgSid()); |
|
|
|
busMainDeposit.setOrgName(data.getOrgName()); |
|
|
|
busMainDeposit.setStaffSid(appUserOrgInfoVo.getStaffSid()); |
|
|
|
busMainDeposit.setStaffName(appUserOrgInfoVo.getStaffName()); |
|
|
|
busMainDeposit.setOrgSid(appUserOrgInfoVo.getOrgSid()); |
|
|
|
busMainDeposit.setOrgName(sysOrganizationVo.getName() + "-" + appUserOrgInfoVo.getOrgName()); |
|
|
|
busMainDeposit.setDepositBillType("车辆预订"); |
|
|
|
busMainDeposit.setDepositBillTypeKey("02"); |
|
|
|
busMainDeposit.setCreateDate(dateFormat.format(date)); |
|
|
|
|
hanlinghao
3 years ago