Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -16,6 +16,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
 @Transactional
 @DependsOn("appUserPositionBiz")
 @Service
+@Slf4j
 public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, AppUserPositionTemp> implements InitializingBean {
 
     @Autowired
@@ -299,4 +301,38 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
     }
 
 
+    public  void   setPostionIdByPhone(String phone){
+        try {
+            Example example = new Example(AppUserPositionTemp.class);
+            example.createCriteria().andEqualTo("phone", phone).andEqualTo("isDel", 0);
+            List<AppUserPositionTemp> list = selectByExample(example);
+            if (CollectionUtils.isEmpty(list)){
+                log.info("----用户无身份----phone==="+phone);
+                return;
+            }
+            AppUserPositionTemp positionTemp=list.get(0);
+            if (positionTemp.getUserId()>0){
+                log.info("----用户已存在身份----phone==="+phone);
+                return;
+            }
+            //根据手机号查询userId
+            AppUserLogin userLogin = loginBiz.checkeUserLogin(phone);
+            if (userLogin==null) {
+                log.info("----用户不存在----phone==="+phone);
+                return;
+            }
+            Integer userId=userLogin.getId();
+            positionTemp.setUserId(userId);
+            int num=updateSelectiveByIdRe(positionTemp);
+            if (num>0){
+                Integer postionId=positionTemp.getPositionId();
+                log.info("----用户---postionId===="+postionId+"----phone==="+phone);
+                detailBiz.updateUserPositionByUserId(userId, postionId);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -111,6 +111,9 @@ public class AppPermissionService {
     @Autowired
     private  AppUserPhoneNotesBiz notesBiz;
 
+    @Autowired
+    private  AppUserPositionTempBiz positionTempBiz;
+
 
     public AppUserInfo validate(String username, String password) {
         AppUserInfo info = new AppUserInfo();
@@ -331,6 +334,8 @@ public class AppPermissionService {
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
             log.info("注册：创建钱包： " + userid+"---time===="+System.currentTimeMillis()/1000L);
+            //临时身份绑定
+            positionTempBiz.setPostionIdByPhone(username);
             // 登录结果要做做统一处理
             JSONObject data = autoLogin(userid, username, headimgurl, nickname,code,activityCode,1);
 
@@ -967,6 +972,8 @@ public class AppPermissionService {
             log.error("注册：新增用户详情： " + userid);
             //创建钱包
             walletBiz.createWalletByUserId(appUserLogin.getId());
+            //临时身份绑定
+            positionTempBiz.setPostionIdByPhone(username);
             //临时会员绑定
             insertUserMemberByUserIdAndPhone(userid, username);
             //上线绑定

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

@@ -62,10 +62,12 @@ public class VehicleActiveService {
         log.info("出车参数： departureVo = {}", departureVo.toString());
         Vehicle vehicle = vehicleBiz.selectById(departureVo.getVehicleId());
         if (vehicle == null) {
+            log.info("出车异常，车辆不存在！");
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
         if (StringUtils.isBlank(departureVo.getCheckMan()) || StringUtils.isBlank(departureVo.getCheckManTel())) {
+            log.error("出车  核销人姓名不能为空！");
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
@@ -74,7 +76,11 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_STATUS_IS_NOT_NORMAL.getCode());
         }
         //添加出车时间过滤 再出车开始时间前一天至结束时间内可以出车,并且预定记录为已审核状态
-        checkDateInvalid(departureVo);
+        try {
+            checkDateInvalid(departureVo);
+        } catch (BaseException b) {
+            throw new BaseException(b.getMessage(), b.getStatus());
+        }
         Integer MileageLift = vehicle.getMileageLastUpdate();
         Integer MileageLift1 = departureVo.getMileage();
         if (MileageLift1 == null) {
@@ -259,7 +265,7 @@ public class VehicleActiveService {
                         throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
                     }
                 } catch (Exception e) {
-                    log.info("提前还车失败，bookVehicleVo = {}", bookVehicleVo.toString());
+                    log.error("提前还车失败，bookVehicleVo = {}", bookVehicleVo.toString());
                     e.printStackTrace();
                 }
             } else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
@@ -339,6 +345,7 @@ public class VehicleActiveService {
                     }
                 }
                 if (!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
+                    log.error("出车过滤，有正常未还车记录，请按照预定的日期出车");
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                 }

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

@@ -251,14 +251,18 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if(vehicleBookRecord != null) {
             vehicleBookRecord.setRetCompany(bookRecordUpdateLog.getNewRetCompanyId());
             int a = updateSelectiveByIdRe(vehicleBookRecord);
-            log.info("修改停靠分公司后预定记录： {}" + vehicleBookRecord.toString());
+            log.info(vehicleBookRecord.toString());
             if(a <= 0) {
                 return ObjectRestResponse.createDefaultFail();
             }
-            Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
-            if (vehicle != null) {
-                vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
-                vehicleBiz.updateSelectiveByIdRe(vehicle);
+            //出行中才修改车辆停靠分公司
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
+                if (vehicle != null) {
+                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+                }
             }
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);
         } else {

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

@@ -78,6 +78,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     BookRecordUpdateLogBiz bookRecordUpdateLogBiz;
 
+    @Autowired
+    VehicleDepartureService vehicleDepartureService;
+
 
     public UserFeign getUserFeign() {
         return userFeign;
@@ -335,10 +338,13 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());
             bookRecordUpdateLog.setCreateTime(new Date());
-            Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
-            if (vehicle != null) {
-                vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
-                vehicleBiz.updateSelectiveByIdRe(vehicle);
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
+            if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
+                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
+                if (vehicle != null) {
+                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
+                    vehicleBiz.updateSelectiveByIdRe(vehicle);
+                }
             }
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
             return bookRecordUpdateLogBiz.save(bookRecordUpdateLog);