Merge remote-tracking branch 'origin/base-modify' into base-modify

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

@@ -268,15 +268,15 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             HandleDiscountDTO handleDiscountDTO = new HandleDiscountDTO();
             switch (MemberEnum.getByCode(dto.getMemberLevel())) {
                 case NORMAL:
-                    handleDiscountDTO = handleDiscount(vehicleModel, prices, NORMAL);
+                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, NORMAL);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                 break;
                 case GOLD:
-                    handleDiscountDTO = handleDiscount(vehicleModel, prices, GOLD);
+                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, GOLD);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
                 case DIAMOND:
-                    handleDiscountDTO = handleDiscount(vehicleModel, prices, DIAMOND);
+                    handleDiscountDTO = handleDiscount(dto, vehicleModel, prices, DIAMOND);
                     detail.getOrder().setHasMemberRight(SYS_TRUE);
                     break;
             }
@@ -352,12 +352,12 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @param memberEnum
      * @return
      */
-    private HandleDiscountDTO handleDiscount(VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
+    private HandleDiscountDTO handleDiscount(AppUserDTO dto, VehicleModel vehicleModel, String[] prices, MemberEnum memberEnum) {
         BigDecimal modelAmount;//会员比例
         BigDecimal hundred = BigDecimal.TEN;
         Integer rebate = new Integer(0);
         if(DISCOUNT_STATUS_MEMBER.equals(vehicleModel.getRentDiscountStatus())) {
-            rebate = memberEnum.getPercent();
+            rebate = dto.getDiscount();
             BigDecimal rebatePercent = new BigDecimal(String.valueOf((rebate/100d)));
             modelAmount = rebatePercent.multiply(vehicleModel.getPrice()).setScale(2, BigDecimal.ROUND_HALF_UP);
         }else {

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

@@ -5,6 +5,7 @@ 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.annotation.IgnoreUserToken;
 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;
@@ -86,6 +87,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     //订单
     @ApiOperation("车型详情")
     @RequestMapping(value = "/app/unauth/detail/{id}", method = RequestMethod.GET)
+    @IgnoreUserToken
     public ObjectRestResponse<VModelDetailVO> detail(@PathVariable("id") @ApiParam("车型id") Integer id) {
         //查询车型信息，车型类型关系
         //，公司信息，系统信息（购车须知，预定须知）
@@ -107,6 +109,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
      */
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/unauth/findVehicleModelPage")
+    @IgnoreUserToken
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPageUnauthfind(
             @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ,HttpServletRequest request) {