Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BannerBiz.java

@@ -22,9 +22,9 @@ import java.util.List;
 @Service
 public class BannerBiz extends BaseBiz<BannerMapper,Banner> {
 
-    public List<BannerVo> findBannerList(Integer type,Integer location, String multiLocation, Integer platform) {
+    public List<BannerVo> findBannerList(Integer type,Integer location, String multiLocation, Integer platform, Integer status) {
         List<BannerVo> bannerVos = new ArrayList<>();
-        List<Banner> banners = mapper.findBannerListByType(type,location,multiLocation,platform);
+        List<Banner> banners = mapper.findBannerListByType(type,location,multiLocation,platform,status);
         banners.forEach(banner -> {
             BannerVo bannerVo = new BannerVo();
             BeanUtils.copyProperties(banner,bannerVo);

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/mapper/BannerMapper.java

@@ -27,5 +27,5 @@ public interface BannerMapper extends Mapper<Banner> {
 
 
 
-    List<Banner> findBannerListByType(@Param("type") Integer type,@Param("location") Integer location, @Param("multiLocation") String multiLocation, @Param("platform") Integer platform);
+    List<Banner> findBannerListByType(@Param("type") Integer type,@Param("location") Integer location, @Param("multiLocation") String multiLocation, @Param("platform") Integer platform, @Param("status") Integer status);
 }

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

@@ -34,11 +34,12 @@ public class BannerController {
     public ObjectRestResponse findBannerlist(@RequestParam(required = false, value = "type") Integer type,
                                              @RequestParam(required = false, value = "location") Integer location,
                                              @RequestParam(required = false, value = "multiLocation") String multiLocation,
-                                             @RequestParam(value = "platform",required = false,defaultValue = "0") Integer platform) {
+                                             @RequestParam(value = "platform",required = false,defaultValue = "0") Integer platform,
+                                             @RequestParam(value = "status",required = false,defaultValue = "1") Integer status) {
         if (null == location && StrUtil.isBlank(multiLocation)) {
             return ObjectRestResponse.createDefaultFail();
         }
-        List<BannerVo> bannerList = bannerBiz.findBannerList(type, location, multiLocation, platform);
+        List<BannerVo> bannerList = bannerBiz.findBannerList(type, location, multiLocation, platform, status);
         return ObjectRestResponse.succ(bannerList);
     }
 }

xx-app/xx-app-server/src/main/resources/mapper/BannerMapper.xml

@@ -20,6 +20,9 @@
 
     <select id="findBannerListByType" resultMap="bannerMap">
         select * from `banner` where `is_del`=0
+        <if test="status != null">
+            and `status`=#{status}
+        </if>
         <if test="type != null">
             and `type`=#{type}
         </if>

xx-order/xx-order-api/pom.xml

@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.ibeetl</groupId>
             <artifactId>beetl</artifactId>
-            <version>2.9.3</version>
+            <version>3.2.3.RELEASE</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -219,11 +219,11 @@ public class ShuntApply implements Serializable {
 
 	@Column(name = "brand_name")
 	@ApiModelProperty("品牌名称")
-	private Integer brandName;
+	private String brandName;
 
 	@Column(name = "category_name")
 	@ApiModelProperty("型号名称")
-	private Integer categoryName;
+	private String categoryName;
 
 
 }

xx-order/xx-order-server/pom.xml

@@ -42,7 +42,13 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>5.4.2</version>
+            <version>5.4.6</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.ibeetl</groupId>
+            <artifactId>beetl</artifactId>
+            <version>3.2.3.RELEASE</version>
         </dependency>
 
     </dependencies>

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.lang.Dict;
 import cn.hutool.extra.template.Template;
+import cn.hutool.extra.template.TemplateConfig;
 import cn.hutool.extra.template.TemplateEngine;
 import cn.hutool.extra.template.TemplateUtil;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;

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

@@ -198,6 +198,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
             //商品类型
             bo.getOrder().setGoodsType(vehicle.getGoodsType());
             bo.setVehicle(vehicle);
+            bo.setGoodsDepositType(vehicle.getDepositType());
         }
     }
 

xx-universal/xx-universal-server/pom.xml

@@ -73,11 +73,6 @@
             <artifactId>jetty-util</artifactId>
             <version>9.3.7.v20160115</version>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>4.5.10</version>
-        </dependency>
         <dependency>
             <groupId>com.github.wxiaoqi</groupId>
             <artifactId>ace-admin-api</artifactId>

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

@@ -403,6 +403,18 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         return ObjectRestResponse.succ(vehicleBookRecord);
     }
 
+    @GetMapping(value = "/app/unauth/v2/getPriceByVehicle")
+    @IgnoreUserToken
+    public  ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getByVehicleIdV2(String vehicleId, String startDate, String endDate, Long startDateTemp, Long endDateTemp) {
+        if(null != startDateTemp) {
+            startDate = DateUtil.date(startDateTemp).toString();
+        }
+        if(null != endDateTemp) {
+            endDate = DateUtil.date(endDateTemp).toString();
+        }
+        return ObjectRestResponse.succ(getSynthesizePrice(vehicleId, startDate, endDate, getCurrentUserIdInt()));
+    }
+
     @GetMapping(value = "v2/getPriceByVehicleFeign")
     @IgnoreUserToken
     public  ObjectRestResponse<List<VehicleModelCalendarPriceDTO>> getByVehicleIdFeignV2(String vehicleId, String startDate, String endDate, Integer userId) {