Merge branch 'feature_chw_zjw' into dev-chw

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

@@ -72,6 +72,10 @@ public class VehicleVO extends Vehicle {
 
     private List<VehicleExtensionVO> vehicleExtensions;
 
+    public void setExtensionVOS(List<VehicleExtensionVO> extensionVOS) {
+        this.extensionVOS = extensionVOS;
+    }
+
     private String manageProvinceName;
 
     private String manageCityName;

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

@@ -100,6 +100,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     VehicleHolidayPriceInfoBiz vehicleHolidayPriceInfoBiz;
 
+    @Autowired
+    VehicleExtensionBiz extensionBiz;
+
     public UserFeign getUserFeign() {
         return userFeign;
     }
@@ -704,10 +707,25 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
     }
 
+    @GetMapping("app/unauth/website/selectList")
+    @ApiModelProperty("店铺商品列表(官网)")
+    @IgnoreUserToken
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> websiteSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+        vehicleFindAppDTO.setState(Vehicle.STATE_UP);
+        vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
+        PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO> pageVo = baseBiz.appSelectList(vehicleFindAppDTO);
+        if(CollUtil.isNotEmpty(pageVo.getData())) {
+            pageVo.getData().forEach(v -> {
+                v.setVehicleExtensions(extensionBiz.getTree(v.getId()));
+            });
+        }
+        return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
+    }
+
     @GetMapping("app/unauth/shop/headSelectList")
     @ApiModelProperty("店铺商品列表(头部输入框)")
     @IgnoreUserToken
-    public  ObjectRestResponse<PageDataVO<VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
+    public  ObjectRestResponse<PageDataVO<com.xxfc.platform.vehicle.pojo.vo.VehicleVO>> shopHeadSelectList(VehicleFindAppDTO vehicleFindAppDTO) {
         vehicleFindAppDTO.setState(Vehicle.STATE_UP);
         vehicleFindAppDTO.setIsMinPrice(SYS_TRUE);
         return  ObjectRestResponse.succ(baseBiz.appSelectList(vehicleFindAppDTO));
@@ -723,6 +741,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     static public class VehicleVO extends Vehicle {
         private VehicleModel vehicleModel;
         private List<VehiclePlatCata> vehiclePlatCatas;
+
         private List<VehicleModelCalendarPriceDTO> priceDTOS;
         /**
          * 价格开始日期