Merge branch 'dev' into hz_dev

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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/BaseUserMemberController.java

@@ -5,11 +5,18 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberVO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 /**
  * 用户会员
@@ -17,20 +24,45 @@ import java.lang.reflect.InvocationTargetException;
  */
 @RestController
 @RequestMapping("baseUserMember")
+@Api(tags = "后台获取和修改用户会员信息")
 public class BaseUserMemberController extends BaseController<BaseUserMemberBiz, BaseUserMember> {
 
+    @Autowired
+    private UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
     /**
      * 获取用户会员
      * @param userId
      * @return
      */
+    @ApiOperation(value = "根据用户id获取用户会员信息")
     @RequestMapping("/findOne/{userId}")
     public ObjectRestResponse<BaseUserMemberVO> findOneByUserId(@PathVariable Integer userId){
-
         return  ObjectRestResponse.succ(baseBiz.findOneByUserId(userId));
     }
 
 
+    /**
+     * 根据token获取用户会员信息
+     * @return
+     */
+
+    @RequestMapping("/getUserMember")
+    @ApiOperation(value = "根据token获取用户会员信息")
+    public ObjectRestResponse<BaseUserMemberVO> findOneByToken(){
+        try {
+            AppUserDTO user = userFeign.userDetailByToken(userAuthConfig.getToken(request)).getData();
+            return  ObjectRestResponse.succ(baseBiz.findOneByUserId(user.getUserid()));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+
+
+    }
 
 //    /**
 //     * 设置用户会员
@@ -51,12 +83,21 @@ public class BaseUserMemberController extends BaseController<BaseUserMemberBiz,
      * @return
      */
     @PutMapping("/setUserMember")
+    @ApiOperation(value = "修改用户会员信息")
     public ObjectRestResponse UpdateUserMember(@RequestBody UserMemberDTO userMemberDTO)
             throws Exception {
-        if (userMemberDTO==null||userMemberDTO.getRentFreeDays()<0||userMemberDTO.getTotalNumber()<0) {
+
+        if (userMemberDTO==null) {
             return ObjectRestResponse.createDefaultFail();
         }
 
+        if (Objects.nonNull(userMemberDTO.getRentFreeDays())&&userMemberDTO.getRentFreeDays()<0){
+            return ObjectRestResponse.createDefaultFail();
+        }
+
+        if (Objects.nonNull(userMemberDTO.getTotalNumber())&& userMemberDTO.getTotalNumber()<0){
+            return ObjectRestResponse.createDefaultFail();
+        }
 
         baseBiz.UpdateUserMember(userMemberDTO);
         return ObjectRestResponse.succ();

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -75,7 +75,8 @@
         from
         app_user_login l
         inner join
-        (select * from app_user_detail where 1=1 <if test="postionState != null">
+        (select * from app_user_detail where 1=1
+        <if test="postionState != null">
             <choose>
                 <when test="postionState == 6">
                     and `position_id`=#{postionState}
@@ -84,7 +85,8 @@
                     and <![CDATA[`position_id`<>6]]>
                 </otherwise>
             </choose>
-    </if>) d
+        </if>
+        ) d
         on
         d.userid = l.id
         left join
@@ -134,7 +136,7 @@
         order by l.id ASC
     </select>
 
-<update id="updateUserMemberStatusByUserId">
+    <update id="updateUserMemberStatusByUserId">
     update `app_user_detail` set `is_member`={status}  where `userid`=#{userId}
 </update>
     <update id="updateUserPositionByUserId">

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberMapper.xml

@@ -49,6 +49,8 @@
          m.user_id=#{userId}
          and
          m.is_del=0
+
+        limit 1
     </select>
 
 </mapper>
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

@@ -31,6 +31,11 @@ public class OrderPageVO extends BaseOrder {
 
     private String telephone;
 
+    /**
+     * 車輛編碼
+     */
+    private Integer code;
+
     /**
      * 是否是用户匹配公司
      */

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -163,16 +164,16 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
        if(orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
-           boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime());
+           boolean flag = getTodayTime(orderRentVehicleDetail.getEndTime());
            if (!flag) {
-               return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+               return ObjectRestResponse.createFailedResult(3502, "今日不是交车日期");
            }
            if(userDTO.getCompanyId() != orderRentVehicleDetail.getStartCompanyId()) {
                return ObjectRestResponse.createFailedResult(3501, "无交车权限");
            }
        } else {
            if(userDTO.getCompanyId() != orderRentVehicleDetail.getEndCompanyId()) {
-               return ObjectRestResponse.createFailedResult(3501, "无收车权限");
+               return ObjectRestResponse.createFailedResult(3503, "无收车权限");
            }
        }
         if(baseOrder.getStatus() != -1) {
@@ -193,7 +194,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 }
 
         }
-
+        AppUserDTO appUserDTO = userFeign.userDetailById(baseOrder.getUserId()).getData();
         //调用车辆管理的出车还车
         //出车
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) { //交车
@@ -203,27 +204,36 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
             vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
+           if(appUserDTO != null) {
+               vehicleDepartureVo.setUser(appUserDTO.getNickname());
+               vehicleDepartureVo.setUserTel(appUserDTO.getUsername());
+           } else {
+               vehicleDepartureVo.setUser("APP用戶");
+               vehicleDepartureVo.setUserTel("13656235623");
+           }
             vehicleDepartureVo.setUse("用户租车");
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
-            vehicleDepartureVo.setUser(userDTO.getUsername());
-            vehicleDepartureVo.setUserTel(userDTO.getTelPhone());
             vehicleDepartureVo.setCheckMan(orderVehicleCrosstownDto.getLicenseName());
             vehicleDepartureVo.setCheckManTel(orderVehicleCrosstownDto.getLicensePhone());
             try {
-                vehicleFeign.departureBySmall(vehicleDepartureVo);
+                RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
+                log.info("返回信息： " + restResponse);
             } catch (Exception e) {
                 e.printStackTrace();
-                return ObjectRestResponse.createFailedResult(500, e.getMessage());
+                return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
-
         } else if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.ARRIVE.getCode() || orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //还车
-
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
             vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
             vehicleArrivalVo.setRecycleMan(userDTO.getName());
-            vehicleArrivalVo.setRecycleManTel(userDTO.getTelPhone());
+            vehicleArrivalVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
+            if(appUserDTO != null) {
+                vehicleArrivalVo.setRecycleManTel(appUserDTO.getUsername());
+            } else {
+                vehicleArrivalVo.setRecycleManTel("13565235623");
+            }
             try {
                 vehicleFeign.arrivalBySmall(vehicleArrivalVo);
             } catch (Exception e) {
@@ -262,7 +272,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
             getOrderLicense(orderVehicleCrosstownDto);
-
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, orderVehicleCrosstown);
@@ -367,8 +376,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
 
     public boolean getTodayTime(Long time) {
         long current = System.currentTimeMillis();
-        long startTime = current / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset();
-        if (time >= startTime && time <= startTime + 24 * 60 * 60 * 1000 - 1) {
+        if (current <= (time / (1000 * 3600 * 24) * (1000 * 3600 * 24) - TimeZone.getDefault().getRawOffset() )+ 24 * 60 * 60 * 1000 -1) {
             return true;
         }
         return false;

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

@@ -235,6 +235,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                 log.info("获取车辆信息返回消息：{}", restResponse.getMessage());
                 if (restResponse.getData() != null) {
                     orderPageVO.setVehicalNumberPlat(restResponse.getData().getNumberPlate());
+                    orderPageVO.setCode(restResponse.getData().getCode());
                 }
             }
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -28,6 +28,7 @@ public enum ResCode {
     USERNAME_AND_TELE_NOT_NULL(104000, "使用人和电话不能为空"),
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
     VEHICLE_DEPARTURE_VEHICLE_DISABLE(104002,"车辆不可用"),
+    VEHICLE_DEPARTURE_VEHICLE_DELETE(104007,"车辆已下架"),
     VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE(104003,"车辆未出车"),
     VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED(104006,"车辆不在出车范围内，请按照预定日期出车！"),
 

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

@@ -21,7 +21,9 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class VehicleActiveService {
@@ -212,7 +214,9 @@ public class VehicleActiveService {
 
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(Mileagerest1);
+            if(vehicleBookRecord != null) {
                 vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
@@ -285,13 +289,19 @@ public class VehicleActiveService {
             if(vehicleBookRecord != null) {
                 DateTime startDate = new DateTime(vehicleBookRecord.getBookStartDate());
                 DateTime endDate = new DateTime(vehicleBookRecord.getBookEndDate());
-                if(!startDate.plusDays(-1).isBefore(DateTime.now()) && DateTime.now().isBefore(endDate) && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode()) {
+                if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode())) {
+                    Map<String, Object> param = new HashMap<>();
+                    param.put("vehicleId", vehicleBookRecord.getVehicleId());
+                    param.put("time", vehicleBookRecord.getBookStartDate());
+                    List<VehicleBookRecord> list = vehicleBookRecordBiz.selectByVehicleIdAndTime(param);
+                    if(list != null && list.size() > 0) {
                         throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                                 ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                     }
                 }
             }
         }
+    }
 
 
     public void updateBookRecordStatus(VehicleBookRecord vehicleBookRecord, Integer type) {

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

@@ -416,10 +416,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(), ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
+        if (vehicle.getIsDel() == 1) {
+            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getDesc(),
+                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DELETE.getCode());
+        }
         if(StringUtils.isBlank(bookVehicleVo.getBookStartDate()) || StringUtils.isBlank(bookVehicleVo.getBookEndDate())) {
             throw new BaseException(ResultCode.DATE_TIME_IS_NULL);
         }
@@ -521,7 +525,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if(vehicleBookHourInfos != null && vehicleBookHourInfos.size() >0) {
-                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) == entry.getValue()) { // 已经被预定
+                if((vehicleBookHourInfos.get(0).getBookedHour() & entry.getValue()) != 0) { // 已经被预定
                     log.info(entry.getKey() + "预定的时间段已经被预约！");
                     return Boolean.FALSE;
                 }
@@ -757,7 +761,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(vehicle == null) {
             return false;
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
+        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
@@ -783,13 +787,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 stringBuilder.append("保养");
                 break;
         }
-        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
-        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-            stringBuilder.append("中，使用人：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
-            stringBuilder.append(" 使用人电话：");
-            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
-        }
+//        List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
+//        if(vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
+//            stringBuilder.append("中，使用人：");
+//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUsername());
+//            stringBuilder.append(" 使用人电话：");
+//            stringBuilder.append(vehicleBookRecordVos.get(0).getVehicleUserPhone());
+//        }
         return stringBuilder.toString();
     }
 
@@ -899,25 +903,23 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             vehicleBookHourInfoDto.setVehicleId(vehicleId);
             List<VehicleBookHourInfo> vehicleBookHourInfos = vehicleBookHourInfoBiz.selectByVehicleAndDate(vehicleBookHourInfoDto);
             if (vehicleBookHourInfos != null && vehicleBookHourInfos.size() > 0) {
-               if((vehicleBookHourInfos.get(0).getBookedHour() | 0) == 0) {
-                   if(!flag) {
+                   vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
+                   if((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()) == 0) {
+                       if(!flag) { //解决重复执行的问题
                            Integer effected = vehicleBookInfoMapper.updateBookedInfo(params);
                            if (effected < 1) {
                                return Boolean.FALSE;
-                       } else {
+                           }
                            flag = true;
-                           continue;
                        }
+
                    }
-               } else {
-                   vehicleBookHourInfos.get(0).setBookedHour((vehicleBookHourInfos.get(0).getBookedHour() & ~entry.getValue()));
                    int effect = vehicleBookHourInfoBiz.updateByIdRe(vehicleBookHourInfos.get(0));
-                   if (effect < 1) {
+                   if (effect < 0) {
                        return Boolean.FALSE;
                    } else {
                        continue;
                    }
-               }
             } else {
                 return Boolean.FALSE;
             }

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

@@ -147,8 +147,8 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     }
 
     public static void main(String[] args) throws Exception{
-        int b = 16744448;
-        Integer a = b | 48;
+        int b = 24;
+        Integer a = b & 4;
         System.out.println(a);
     }
 

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

@@ -87,6 +87,10 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         insertSelectiveRe(vehicleBookRecord);
     }
 
+    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param) {
+        return mapper.selectByVehicleIdAndTime(param);
+    }
+
     public int changeRecordStatus(Map<String, Object> updateParam) {
         return mapper.changeRecordStatus(updateParam);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -35,4 +35,6 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
 
     public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
+
+    public List<VehicleBookRecord> selectByVehicleIdAndTime(Map<String, Object> param);
 }
\ No newline at end of file

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

@@ -325,6 +325,11 @@
         order by vbr.id desc
     </select>
 
+    <select id="selectByVehicleIdAndTime" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
+        select v1.* from vehicle_book_record v1
+         where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2 and v1.book_end_date >= #{time}
+    </select>
+
     <select id="getById" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord">
         select
             vbr.`id`,