Skip to content

C
cloud-platform
Commit 089b4d28 authored by libin's avatar libin
Browse files
Options

Merge remote-tracking branch 'origin/base-modify' into base-modify

parents 54ecaa93 4c202f50
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 182 additions and 100 deletions
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookHourInfo.java
View file @ 089b4d28
......@@ -27,7 +27,4 @@ public class VehicleBookHourInfo {
@Column(name = "update_time")
private Date updateTime;
@Column(name = "book_record_id")
private Long bookRecordId;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/CompanyVo.java
View file @ 089b4d28
......@@ -25,6 +25,8 @@ public class CompanyVo extends PageParam {
String images;
@ApiModelProperty("片区id")
Integer zoneId;
@ApiModelProperty("片区名称")
String zoneName;
@ApiModelProperty("公司简介")
String describes;
@ApiModelProperty("详情")
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/CompanyBaseBiz.java
View file @ 089b4d28
......@@ -44,40 +44,75 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
@Autowired
SysRegionMapper sysRegionMapper;
@Autowired
AreaBiz areaBiz;
@Value("${branchCompanyPic.url}")
private String companyUrl;
//临时数据同步
public ObjectRestResponse synchro(){
List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
if (list.size()>0){
for (BranchCompanyStockInfo companyStockInfo:list){
List<BranchCompanyStockInfo> list= stockInfoMapper.selectAll();
if (list.size()>0){
for (BranchCompanyStockInfo companyStockInfo:list){
int num=0;
String companyName=companyStockInfo.getCompanyName();
Integer balance=companyStockInfo.getBalance();
Integer total=companyStockInfo.getTotal();
BigDecimal price=companyStockInfo.getPrice();
CompanyBase companyBase=new CompanyBase();
companyBase.setAddrCity(companyStockInfo.getAddrCity());
companyBase.setAddrProvince(companyStockInfo.getAddrProvince());
companyBase.setName(companyName);
companyBase.setCover(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
companyBase.setImages(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
insertSelective(companyBase);
Integer companyBaseId=companyBase.getId();
if (companyBaseId!=null){
String companyName=companyStockInfo.getCompanyName();
Integer balance=companyStockInfo.getBalance();
Integer total=companyStockInfo.getTotal();
BigDecimal price=companyStockInfo.getPrice();
CompanyBase companyBase=new CompanyBase();
companyBase.setAddrCity(companyStockInfo.getAddrCity());
companyBase.setAddrProvince(companyStockInfo.getAddrProvince());
companyBase.setName(companyName);
companyBase.setCover(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
companyBase.setImages(companyUrl+"/image/admin/upload"+companyStockInfo.getCompanyPic());
insertSelective(companyBase);
Integer companyBaseId=companyBase.getId();
if (companyBaseId!=null){
BranchCompanyStockRight branchCompanyStockRight=new BranchCompanyStockRight();
branchCompanyStockRight.setBalance(balance);
branchCompanyStockRight.setPrice(price);
branchCompanyStockRight.setTotal(total);
branchCompanyStockRight.setCompanyBaseId(companyBaseId);
branchCompanyStockRight.setStockState(2);
stockRightBiz.insertSelective(branchCompanyStockRight);
}
num++;
log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
}
}
branchCompanyStockRight.setBalance(balance);
branchCompanyStockRight.setPrice(price);
branchCompanyStockRight.setTotal(total);
branchCompanyStockRight.setCompanyBaseId(companyBaseId);
branchCompanyStockRight.setStockState(2);
stockRightBiz.insertSelective(branchCompanyStockRight);
}
num++;
log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
}
}
return ObjectRestResponse.succ();
}
//临时数据同步2
public ObjectRestResponse synchro2(){
List<BranchCompany> list= branchCompanyBiz.selectListAll();
if (list.size()>0){
int num=0;
for (BranchCompany branchCompany:list){
Integer companyBaseId=branchCompany.getCompanyBaseId();
Integer id=branchCompany.getId();
if (companyBaseId!=null||companyBaseId!=0){
CompanyBase companyBase=selectById(companyBaseId);
if (companyBase!=null){
branchCompany=new BranchCompany();
branchCompany.setId(id);
branchCompany.setAddrProvince(companyBase.getAddrProvince());
branchCompany.setProvinceName(companyBase.getProvinceName());
branchCompany.setAddrCity(companyBase.getAddrCity());
branchCompany.setCityName(companyBase.getCityName());
branchCompany.setAddrTown(companyBase.getAddrTown());
branchCompany.setTownName(companyBase.getTownName());
branchCompanyBiz.updateSelectiveById(branchCompany);
num++;
log.info("----成功---num=="+num+"---companyBaseId==="+companyBaseId);
}
}
}
}
return ObjectRestResponse.succ();
}
......@@ -125,18 +160,35 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
Integer companyBaseId=companyVo.getId();
Integer companyId=companyVo.getCompanyId();
Integer stockId=companyVo.getStockId();
String name="";
String companyName="";
String zoneName="";
if (companyBaseId!=null&&companyBaseId>0){
CompanyBase companyBase=selectById(companyBaseId);
BeanUtils.copyProperties(companyBase,companyVo);
name=companyBase.getName();
Integer zoneId=companyBase.getZoneId();
if (zoneId!=null){
Area area=areaBiz.selectById(zoneId);
if (area!=null){
zoneName=area.getName();
}
}
}
if (companyId!=null&&companyId>0){
BranchCompany branchCompany=branchCompanyBiz.selectById(companyId);
BeanUtils.copyProperties(branchCompany,companyVo);
companyName=branchCompany.getName();
}
if (stockId!=null&&stockId>0){
BranchCompanyStockRight stockRight=stockRightBiz.selectById(stockId);
BeanUtils.copyProperties(stockRight,companyVo);
}
companyVo.setId(companyBaseId);
companyVo.setName(name);
companyVo.setCompanyName(companyName);
companyVo.setZoneName(zoneName);
return ObjectRestResponse.succ(companyVo);
}
......@@ -160,6 +212,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
BeanUtils.copyProperties(companyVo,right);
if (stockId==null||stockId==0){
right.setId(null);
right.setCompanyBaseId(companyBaseId);
stockRightBiz.insertSelective(right);
}else {
right.setId(stockId);
......@@ -168,7 +221,7 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
return ObjectRestResponse.succ();
}
//设置基础信息
//设置基础详情
public ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
if (companyVo==null){
return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
......@@ -178,21 +231,9 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase> {
Integer companyBaseId=companyVo.getId();
if (companyBaseId==null||companyBaseId==0){
insertSelective(companyBase);
companyBaseId=companyBase.getId();
}else {
updateSelectiveById(companyBase);
}
BranchCompany branchCompany=new BranchCompany();
BeanUtils.copyProperties(companyVo,branchCompany);
branchCompany.setCompanyBaseId(companyBaseId);
Integer companyId=companyVo.getCompanyId();
if (companyId==null||companyId==0){
branchCompany.setId(null);
branchCompanyBiz.insertSelective(branchCompany);
}else {
branchCompany.setId(companyId);
branchCompanyBiz.updateSelectiveById(branchCompany);
}
return ObjectRestResponse.succ();
}
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @ 089b4d28
......@@ -231,6 +231,25 @@ public class VehicleActiveService {
throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
}
DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
DateTime actualArrivalDate = new DateTime(new Date());
if(actualArrivalDate.compareTo(arrivalDate) < 0) { //实际还车时间小于预计还车时间，需要释放后面的时间
BookVehicleVO bookVehicleVo = new BookVehicleVO();
BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
bookVehicleVo.setBookStartDate(null);
bookVehicleVo.setBookEndDate(null);
bookVehicleVo.setUnbookStartDate(actualArrivalDate.toString(DATE_TIME_FORMATTER));
bookVehicleVo.setUnbookEndDate(arrivalDate.toString(DATE_TIME_FORMATTER));
try {
Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
if(!hasSuc){
throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
}
} catch ( Exception e) {
e.printStackTrace();
}
}
departureLog.setMileageEnd(arrivalVo.getMileage());
departureLog.setRecycleMan(arrivalVo.getRecycleMan());
departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
View file @ 089b4d28
......@@ -538,10 +538,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
public boolean filterHourInfoBooked(String vehicleId, Map<String, Integer> hourInfo) {
if(MapUtils.isEmpty(hourInfo)) {
return false;
}
for(Map.Entry<String, Integer> entry : hourInfo.entrySet()) {
VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
vehicleBookHourInfoDto.setVehicleId(vehicleId);
if(entry.getValue() == 0) {//0点 查询是否有已经预约的记录
Map<String, Object> param = new HashMap<>();
param.put("vehicleId", vehicleId);
......@@ -551,6 +551,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
return false;
}
}
VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
vehicleBookHourInfoDto.setYearMonthDay(entry.getKey());
vehicleBookHourInfoDto.setVehicleId(vehicleId);
List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定
......
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/admin/CompanyController.java
View file @ 089b4d28
......@@ -25,6 +25,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
return baseBiz.synchro();
}
@ApiOperation("同步分公司地址")
@PostMapping("synchro2")
public ObjectRestResponse<String> synchro2() {
return baseBiz.synchro2();
}
@ApiOperation("查询公司列表")
@RequestMapping(value = "/list", method = RequestMethod.GET)
......@@ -52,12 +58,12 @@ public class CompanyController extends BaseController<CompanyBaseBiz> {
@ApiOperation("设置股权信息")
@RequestMapping(value = "/updStockInfo", method = RequestMethod.POST)
public ObjectRestResponse updStockInfo(CompanyVo companyVo){
public ObjectRestResponse updStockInfo(@RequestBody CompanyVo companyVo){
return baseBiz.updStockInfo(companyVo);
}
@ApiOperation("设置详情")
@RequestMapping(value = "/updCompanyDetail", method = RequestMethod.POST)
public ObjectRestResponse updCompanyDetail(CompanyVo companyVo){
public ObjectRestResponse updCompanyDetail(@RequestBody CompanyVo companyVo){
return baseBiz.updCompanyDetail(companyVo);
}
......
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockApplyInfoMapper.xml
View file @ 089b4d28
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.xxfc.platform.vehicle.mapper.BranchCompanyStockApplyInfoMapper" >
<resultMap id="BaseResultMap" type="com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo" >
<!--
WARNING - @mbg.generated
-->
<id column="id" property="id" jdbcType="INTEGER" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="tel" property="tel" jdbcType="VARCHAR" />
<result column="company_id" property="companyId" jdbcType="INTEGER" />
<result column="count" property="count" jdbcType="INTEGER" />
<result column="state" property="state" jdbcType="INTEGER" />
<result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
</resultMap>
<select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo">
select a.*, b.company_name
select a.*, b.`name` as companyName,r.id as companyId
from branch_company_stock_apply_info a
left join `company_base` b on a.company_id = b.id
left join branch_company_stock_info_right r on a.company_base_id=r.id
left join company_base b on b.id=r.company_base_id
order by a.create_time desc
</select>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml
View file @ 089b4d28
......@@ -8,6 +8,7 @@
c.`name` as companyName,
c.addr_detail as addrDetail,
c.state,
c.status,
c.leader,
c.leader_contact_info as leaderContactInfo,
c.latitude,
......@@ -15,6 +16,7 @@
c.vehice_service_phone as vehiceServicePhone,
c.tour_service_phone as tourServicePhone,
c.zone_id as zoneId,
a.name as zoneName,
c.addr_province as addrProvince,
c.province_name as provinceName,
c.addr_city as addrCity,
......@@ -34,6 +36,7 @@
FROM branch_company c
LEFT JOIN company_base b ON c.company_base_id=b.id
LEFT JOIN branch_company_stock_info_right r ON c.company_base_id=r.company_base_id
LEFT JOIN area a ON c.zone_id=a.id
<where>
b.is_del=0
<if test="zoneId != null and zoneId !='' ">
......
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