修改申请

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

@@ -307,6 +307,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         //rbd.setModelId(shuntApply.getModelId());
         rbd.setBrandId(shuntApply.getBrandId());
         rbd.setCategoryId(shuntApply.getCategoryId());
+        rbd.setGoodsType(shuntApply.getGoodsType());
         rbd.setParkBranchCompanyId(companyId);
         rbd.setStartCompanyId(companyId);
         rbd.setEndCompanyId(companyId);

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

@@ -528,6 +528,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             depositAmount = depositAmount.add(detail.getTrafficDeposit());
         }
         orderAmount = orderAmount.add(goodsAmount).add(depositAmount);
+        realAmount = orderAmount.subtract(couponAmount);
 
         //生成订单明细
         RentVehiclePriceVO rvp = new RentVehiclePriceVO();

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

@@ -24,6 +24,9 @@ public class RentVehicleBookDTO extends PageParam {
     @ApiModelProperty("型号id")
     private Integer categoryId;
 
+    @ApiModelProperty("商品类型 1--房车；2--机车；3--游艇")
+    private Integer goodsType;
+
     /**
      * 预定目标日期(开始)
      */
@@ -146,8 +149,6 @@ public class RentVehicleBookDTO extends PageParam {
     Double lon;
     @ApiModelProperty("纬度")
     Double lat;
-    @ApiModelProperty("商品类型 1--房车；2--机车；3--游艇")
-    Integer goodsType;
 
     @ApiModelProperty("分类逗号分割")
     String catasStr;

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

@@ -13,6 +13,7 @@ import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
@@ -212,7 +213,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
 
             //增加车型页面
             if (sort == 1) {
-                return getList();
+                return getList(goodsType);
             }
         } catch (Exception e) {
             log.error(e.getMessage(), e);;
@@ -221,13 +222,15 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
     }
 
 
-    @Cache(key = RedisKey.BRANCH_COMPANY_CATA_LIST)
-    private ObjectRestResponse getList() {
+    @Cache(key = RedisKey.BRANCH_COMPANY_CATA_LIST+ "{1}")
+    private ObjectRestResponse getList(Integer goodsType) {
         //获取一级标签
         Example example = Example.builder(VehiclePlatCata.class)
                 .where(WeekendSqls.<VehiclePlatCata>custom()
                         .andEqualTo(VehiclePlatCata::getParentId, 0)
-                        .andEqualTo(VehiclePlatCata::getState, 0))
+                        .andEqualTo(VehiclePlatCata::getState, 0)
+                        .andEqualTo(VehiclePlatCata::getGoodsType, goodsType)
+                )
                 .orderByAsc("isMore", "rank")
                 .build();
         //分页查询父类

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

@@ -288,10 +288,10 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
     @RequestMapping(value = "/rent/apply/usable-vehicle", method = RequestMethod.POST)
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<UsableVeicleVO>> applyUsableVehicle(@RequestBody RentVehicleBookDTO rbd) {
-        rbd.setRecordIntersection(Boolean.TRUE);
+        rbd.setRecordIntersection(Boolean.FALSE);
         rbd.setLimit(100);
         rbd.setPage(1);
-        rbd.setYearNo4Where(Boolean.TRUE);
+        //rbd.setYearNo4Where(Boolean.TRUE);
 
         //查询可车辆信息
         PageDataVO<UsableVeicleVO> pageDataVO = vehicleBiz.searchUsableVehicle(rbd);