Merge branch 'dev' into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/constant/CommonConstants.java

@@ -24,4 +24,19 @@ public class CommonConstants {
     public static final String CONTEXT_KEY_USER_TOKEN = "currentUserToken";
     public static final String JWT_KEY_USER_ID = "userId";
     public static final String JWT_KEY_NAME = "name";
+
+    // 时间相关
+    public static final String DEFAULT = "yyyy/MM/dd";
+    public static final String YM = "yyyy/MM";
+    public static final String YMR_SLASH = "yyyy-MM-dd";
+    public static final String NO_SLASH = "yyyyMMdd";
+    public static final String YM_NO_SLASH = "yyyyMM";
+    public static final String DATE_TIME = "yyyy/MM/dd HH:mm:ss";
+    public static final String DATE_TIME_NO_SLASH = "yyyyMMddHHmmss";
+    public static final String DATE_HM = "yyyy/MM/dd HH:mm";
+    public static final String TIME = "HH:mm:ss";
+    public static final String HM = "HH:mm";
+    public static final String LONG_TIME = "HHmmss";
+    public static final String SHORT_TIME = "HHmm";
+    public static final String DATE_TIME_LINE = "yyyy-MM-dd HH:mm:ss";
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -293,31 +293,37 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ResponseBody
     public ObjectRestResponse<OrderPageVO> changeVehicle(@RequestBody ChangeVehicleDTO dto) {
         checkAdminUser();
-//        //根据订单号获取订单
-//        //查询列表数据
-//        Query query = baseOrderBiz.initQuery(dto.getNo());
-//        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
-//        OrderPageVO orderPageVO = page.getData().get(0);
-//        if(null == orderPageVO) {
-//            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("订单不存在"));
-//        }
-//            //预约新的车辆
-//        RentVehicleBO bo = BeanUtil.toBean(orderPageVO.getOrderRentVehicleDetail(), RentVehicleBO.class);
-//        bo.setOrder(orderPageVO);
-//        bo.setBookVehicleVO(new BookVehicleVO(){{
-//            setBookStartDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-//            setBookEndDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
-//        }});
-//
-//        List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem(){{
-//            setOrderId(orderPageVO.getId());
-//            setType(ItemTypeEnum.ACCOMPANY.getCode());
-//        }}).getDetail()), OrderAccompanyDTO.class);
-//        bo.setAccompanyItems(oads);
-//        orderRentVehicleService.acquireVehicle(bo);
-//        //如果成功则取消旧车的预约
-//
-//        orderRentVehicle
+        //根据订单号获取订单
+        //查询列表数据
+        Query query = baseOrderBiz.initQuery(dto.getNo());
+        PageDataVO<OrderPageVO> page = PageDataVO.pageInfo(query, () -> baseOrderBiz.pageByParm(query.getSuper()));
+        OrderPageVO orderPageVO = page.getData().get(0);
+        if(null == orderPageVO) {
+            throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE, Sets.newSet("订单不存在"));
+        }
+            //预约新的车辆
+        RentVehicleBO bo = BeanUtil.toBean(orderPageVO.getOrderRentVehicleDetail(), RentVehicleBO.class);
+        bo.setOrder(orderPageVO);
+        bo.setBookVehicleVO(new BookVehicleVO(){{
+            setBookStartDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
+            setBookEndDate(DEFAULT_DATE_TIME_FORMATTER.format(LocalDateTime.ofInstant(Instant.ofEpochMilli(bo.getStartTime()), ZoneOffset.ofHours(8))));
+        }});
+
+        List<OrderAccompanyDTO> oads = JSONUtil.toList(JSONUtil.parseArray(orderItemBiz.selectOne(new OrderItem(){{
+            setOrderId(orderPageVO.getId());
+            setType(ItemTypeEnum.ACCOMPANY.getCode());
+        }}).getDetail()), OrderAccompanyDTO.class);
+        bo.setAccompanyItems(oads);
+        Long oldBookRecordId = bo.getBookRecordId();
+        orderRentVehicleService.acquireVehicle(bo);
+        //如果成功则取消旧车的预约
+        vehicleFeign.rentUnbookVehicle(oldBookRecordId);
+        //设置新的vehicleId 和 record
+        orderRentVehicleBiz.updateSelectiveByIdRe(new OrderRentVehicleDetail(){{
+            setId(bo.getId());
+            setVehicleId(bo.getVehicleId());
+            setBookRecordId(bo.getBookRecordId());
+        }});
         return ObjectRestResponse.succ();
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
+import com.xxfc.platform.vehicle.entity.Area;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
@@ -65,6 +66,9 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     @Autowired
     UserFeign userFeign;
 
+    @Autowired
+    private AreaBiz areaBiz;
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -152,17 +156,35 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     }
 
     public PageDataVO<BranchCompany> getAll(Integer page, Integer limit, Integer addrProvince, Integer addrCity,
-                                            Integer addrTown, UserDTO userDTO) {
+                                            Integer addrTown,Integer zoneId, UserDTO userDTO) {
         Example example = new Example(BranchCompany.class);
         Example.Criteria criteria = example.createCriteria();
-        if (addrProvince != null) {
-            criteria.andCondition(" addr_province = '" + addrProvince + "'");
+        String provinceIds="";
+        if (Objects.nonNull(zoneId)){
+            Area area = areaBiz.selectById(zoneId);
+             provinceIds = area.getProvinceIds();
+        }
+        if (StringUtils.isNotEmpty(provinceIds)){
+            List<String> provinceIdList = Arrays.asList(provinceIds.split(","));
+            if (Objects.nonNull(addrProvince)){
+                if (provinceIdList.contains(String.valueOf(addrProvince))){
+                    criteria.andEqualTo("addrProvince",addrProvince);
+                }else {
+                  return   new PageDataVO<BranchCompany>();
+                }
+            }else {
+                criteria.andIn("addrProvince",provinceIdList);
+            }
+        }else {
+            if (addrProvince != null) {
+                criteria.andEqualTo("addrProvince",addrProvince);
+            }
         }
         if (addrCity != null) {
-            criteria.andCondition(" addr_city = '" + addrCity + "'");
+            criteria.andEqualTo("addrCity",addrCity);
         }
         if (addrTown != null) {
-            criteria.andCondition(" addr_town = '" + addrTown + "'");
+            criteria.andEqualTo("addrTown",addrTown);
         }
         if (userDTO != null && DATA_ALL_FALSE.equals(userDTO.getDataAll())) {
             if (StringUtils.isNotBlank(userDTO.getDataZone())) {

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -415,7 +415,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
-        DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(),DATE_TIME_FORMATTER);
+        DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(), DATE_TIME_FORMATTER);
         DateTime endDay =DateTime.parse(bookVehicleVo.getBookEndDate(), DATE_TIME_FORMATTER);
         //转换日期范围为列表，并检查是否合法
         fillDateList4DatePeriod(yearMonthAndDate,startDay,endDay);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -52,9 +52,9 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     @RequestMapping(value ="/page",method = RequestMethod.GET)
     public RestResponse<PageDataVO<BranchCompany>> page(@RequestParam Integer page, @RequestParam Integer limit,
                                                         @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
-                                                        @RequestParam(required = false) Integer addrTown, @RequestParam(required = false) String location) {
+                                                        @RequestParam(required = false) Integer addrTown, @RequestParam(required = false) Integer zoneId) {
         UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
-        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, userDTO));
+        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, zoneId,userDTO));
     }
 
     @IgnoreUserToken
@@ -62,7 +62,7 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
     public RestResponse<PageDataVO<BranchCompany>> allPage(@RequestParam Integer page, @RequestParam Integer limit,
                                                            @RequestParam(required = false) Integer addrProvince, @RequestParam(required = false) Integer addrCity,
                                                            @RequestParam(required = false) Integer addrTown) {
-        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, null));
+        return RestResponse.data(baseBiz.getAll(page,limit,addrProvince,  addrCity, addrTown, null,null));
     }
 
     @RequestMapping(value ="/search",method = RequestMethod.GET)

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

 package com.xxfc.platform.vehicle.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
@@ -25,8 +26,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.HashSet;
 
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.DATE_TIME_LINE;
+import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
 
@@ -156,7 +163,13 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
                 add("可用车辆不存在");
             }});
         }
-        dto.setBookStartDate(dto.getBookStartDate()+ " 00:00:00");
+        //判断是否为今天，如果是则设置为一分钟后开始
+        if(DateUtil.today().equals(dto.getBookStartDate())) {
+            LocalDateTime ldt = LocalDateTime.ofInstant(Instant.ofEpochMilli(System.currentTimeMillis()), ZoneOffset.ofHours(8)).plusSeconds(30L);
+            dto.setBookStartDate(DateTimeFormatter.ofPattern(DATE_TIME_LINE).format(ldt));
+        }else {
+            dto.setBookStartDate(dto.getBookStartDate()+ " 00:00:00");
+        }
         dto.setBookEndDate(dto.getBookEndDate()+ " 23:59:59");
         BookVehicleVO bookVehicleVo = BeanUtil.toBean(dto, BookVehicleVO.class);
         bookVehicleVo.setBookType(BookType.USER_RENT.getCode());

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -637,6 +637,8 @@
                 and v.park_branch_company_id = #{parkBranchCompanyId}
             </if>
             and v.is_del = 0
+            and v.status != 3
+            and v.use_type = 1
         </where>
     </sql>