Merge branch 'dev' into feature-zjw

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

@@ -43,10 +43,9 @@ public class AppUserRelationController extends BaseController<AppUserRelationBiz
     @ApiModelProperty("app分享绑定")
     public ObjectRestResponse bind(
             @RequestParam(value = "code",defaultValue = "")String code,
-            @RequestParam(value = "userid",defaultValue = "0")Integer userid,
             HttpServletRequest request){
         try {
-        //Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
+        Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
         return baseBiz.appBindRelation(userid,code);
         } catch (Exception e) {
             e.printStackTrace();

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/AppHomeController.java

@@ -52,7 +52,7 @@ public class AppHomeController extends BaseController<CofigBiz,Cofig> {
         }else if (type==3){
             list=campsiteFeign.goodList(page,limit);
         }else if (type==4){
-            list=vehicleFeign.goodList(page,limit);
+            return vehicleFeign.goodList(page,limit);
         }
         return  new ObjectRestResponse<>().rel(true).data(list);
     }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DepositRefundRecord.java

@@ -63,6 +63,15 @@ public class DepositRefundRecord {
      */
     @Transient
     OrderViolation orderViolation;
+    /**
+     * 剩余押金预计到账时间
+     */
     @Transient
     Long rentDepositAutoRefundTime;
+
+    /**
+     * 客服电话
+     */
+    @Transient
+    private String customerPhone;
 }
\ No newline at end of file

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -17,8 +17,8 @@ import java.util.Set;
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "vehicle")
+@FeignClient(name = "order")
 public interface OrderFeign {
-    @GetMapping("/baseOrder/entityList")
-    public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);
+//    @GetMapping("/baseOrder/entityList")
+//    public ObjectRestResponse<List<BaseOrder>> baseOrderEntityList(@RequestParam("entity") Map<String, Object> entity);
 }

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

@@ -94,8 +94,8 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
     public List<DepositRefundRecord> selectByCrossId(Integer cross) {
         List<DepositRefundRecord> list = mapper.selectByCrossId(cross);
         for(DepositRefundRecord depositRefundRecord : list) {
+            OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectById(depositRefundRecord.getCrosstownId());
             if(depositRefundRecord.getIscomplete() == true && depositRefundRecord.getStatus() == DepositRefundStatus.VIOLATIONARRIVAL.getCode()) {//查询违章记录
-                OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectById(depositRefundRecord.getCrosstownId());
                 if(orderVehicleCrosstown != null) {
                     BaseOrder baseOrder = baseOrderBiz.selectById(orderVehicleCrosstown.getOrderId());
                     if(baseOrder != null) {

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -86,7 +86,7 @@ public interface VehicleFeign {
      * @return 返回
      */
     @GetMapping("/vehicleModel/goodList")
-    List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam("limit") Integer limit);
+    ObjectRestResponse<List<GoodDataVO>> goodList(@RequestParam(value = "page") Integer page, @RequestParam("limit") Integer limit);
 
     /**
      * 根据一个id获取城市

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

@@ -37,10 +37,10 @@ public class VehicleActiveService {
     VehicleUpkeepLogMapper vehicleUpkeepLogMapper;
 
     @Autowired
-    VehicleBookRecordBiz vehicleBookRecordBiz;
+    VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
 
     @Autowired
-    VehicleUpkeepItemMapper vehicleUpkeepItemMapper;
+    VehicleBookRecordBiz vehicleBookRecordBiz;
     @Value("${vehicle.mileage}")
     private Integer Mileage;
 
@@ -118,6 +118,10 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
+
+
+
+
     }
 
     @Transactional
@@ -195,7 +199,6 @@ public class VehicleActiveService {
     public void updateBookRecordStatus(Integer bookRecordId, Integer type) {
         VehicleBookRecord vehicleBookRecord = vehicleBookRecordBiz.selectById(bookRecordId);
         if(vehicleBookRecord != null) {
-            vehicleBookRecord.setStatus(VehicleBookRecordStatus.LIFTED.getCode());
             if(type == 1) {
                 vehicleBookRecord.setActualStartDate(new Date());
             } else {
@@ -209,6 +212,7 @@ public class VehicleActiveService {
     }
 
 
+
     /**
      * 车辆保养
      * @param vehicleUpkeepVo
@@ -223,7 +227,7 @@ public class VehicleActiveService {
         }
         if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
             // 车辆非正常状态
-            throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc() + vehicle.getStatus(),
+            throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getCode());
         }
         Integer lastMileage=vehicleUpkeepVo.getMileage();

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

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
@@ -297,8 +296,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      @ApiOperation("优质车型")
     @GetMapping(value = "/goodList")
     @IgnoreUserToken
-    public List<GoodDataVO> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
-        return baseBiz.goodList(page, limit);
+    public ObjectRestResponse<List<GoodDataVO>>  goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
+        return ObjectRestResponse.succ(baseBiz.goodList(page, limit));
     }
     @ApiOperation("上下架")
     @PutMapping(value = "/setStatus/{id}/{status}")

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

@@ -584,10 +584,6 @@
             left join vehicle_cata vc on vm.id = vc.vehicle_model_id
         </if>
         <where>
-            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
-                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
-            (abr.to_lift_company = null or (abr.to_lift_company = ))
-
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test=" yearMonthAndParam !=null and yearNo4Where == null">
@@ -596,6 +592,9 @@
                     <include refid="yearMonthAndParamSql"></include>
                 </foreach>
             </if>
+
+            <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+                <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test="startCompanyId != null and endCompanyId != null ">
                 and (
                     (abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
@@ -638,7 +637,7 @@
         left join vehicle_book_record vbre
         on sevbr.vehicle_id = vbre.vehicle_id and sevbr.max_book_end_date = vbre.book_end_date and vbre.status != 4 and vbre.status != 6
         left join vehicle_book_record vbrs
-        on sevbr.vehicle_id = vbrs.vehicle_id and sevbr.min_book_start_date = vbrs.book_start_date and vbrs.status != 4 and vbrs.status != 6;
+        on sevbr.vehicle_id = vbrs.vehicle_id and sevbr.min_book_start_date = vbrs.book_start_date and vbrs.status != 4 and vbrs.status != 6
     </sql>
 
 </mapper>
\ No newline at end of file