修改bug

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

@@ -304,4 +304,8 @@ public class OrderRentVehicleDetail implements Serializable {
 	@Column(name = "handel_violation")
 	private Integer handelViolation;
 
+	@ApiModelProperty(value = "是否需要定损 0--不需要； 1--需要定损")
+	@Column(name = "fixed_loss_status")
+	private Integer fixedLossStatus;
+
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -363,7 +363,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         }else {
             //会员固定价列表
             modelAmount = new BigDecimal(prices[(memberEnum.getCode() - 1)]);
-            rebate = modelAmount.divide(vehicleModel.getPrice()).multiply(hundred).setScale(0, BigDecimal.ROUND_UP).intValue();
+            rebate = modelAmount.divide(vehicleModel.getPrice(), 2, BigDecimal.ROUND_UP).multiply(hundred).intValue();
         }
         HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
         handleDiscountDTO.setRebate(rebate);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VModelDetailVO.java

 package com.xxfc.platform.vehicle.pojo;
 
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
@@ -11,4 +13,10 @@ import java.util.List;
 public class VModelDetailVO extends VehicleModel {
     @ApiModelProperty("类型列表")
     List<VehiclePlatCata> vehiclePlatCatas;
+
+    @ApiModelProperty("用户信息")
+    AppUserDTO appUserDTO;
+
+    @ApiModelProperty("会员列表")
+    List<BaseUserMemberLevel> userMemberLevel;
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageInfo;
 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.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -48,7 +49,7 @@ import java.util.List;
 @RestController
 @RequestMapping("vehicleModel")
 @Api(value = "车型controller", tags = {"车型操作接口"})
-public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> {
+public class VehicleModelController extends BaseController<VehicleModelBiz, VehicleModel> implements UserRestInterface {
 
     @Autowired
     private VehiclePlatCataBiz vehiclePlatCataBiz;
@@ -62,6 +63,11 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Autowired
     private UserFeign userFeign;
 
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     @Autowired
     private UserAuthConfig userAuthConfig;
 
@@ -86,6 +92,8 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             throw new BaseException(ResultCode.NOTEXIST_CODE);
         VModelDetailVO vModelDetailVO = BeanUtil.toBean(vm, VModelDetailVO.class);
         vModelDetailVO.setVehiclePlatCatas(vehiclePlatCataBiz.getByModelId(vm.getId()));
+        vModelDetailVO.setAppUserDTO(getAppUser());
+        vModelDetailVO.setUserMemberLevel(userFeign.levels());
         return new ObjectRestResponse().data(vModelDetailVO);
     }