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

ace-common/src/main/java/com/github/wxiaoqi/security/common/biz/BaseBiz.java

 package com.github.wxiaoqi.security.common.biz;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -235,18 +237,38 @@ public abstract class BaseBiz<M extends Mapper<T>, T> {
         return new TableResultResponse<T>(result.getTotal(), list);
     }
 
-    public ObjectRestResponse selectAll(){
-        List<T> list = selectListAlls();
+    public ObjectRestResponse selectAll(T entity){
+        List<T> list = selectListAlls(entity);
         return ObjectRestResponse.succ(list);
     }
 
     public List<T> selectListAlls(){
+        return  selectListAlls(null);
+    }
+
+    public List<T> selectListAlls(T entity){
         Class<T> clazz = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[1];
         Example example = new Example(clazz);
         Example.Criteria criteria=example.createCriteria();
+
+        if(null != entity) {
+            Map<String, Object> map = BeanUtil.beanToMap(entity);
+            if(map.entrySet().size()>0) {
+                if (criteria==null){
+                    criteria=example.createCriteria();
+                }
+                for (Map.Entry<String, Object> entry : map.entrySet()) {
+                    if(null != entry.getValue()) {
+                        criteria.andLike(entry.getKey(), "%" + entry.getValue().toString() + "%");
+                    }
+                }
+            }
+        }
+
         if (checkFieldName(clazz,"isDel")){
             criteria.andEqualTo("isDel",0);
         }
+
         if (checkFieldName(clazz,"sortOrder")){
             example.setOrderByClause("sort_order desc");
         }else if(checkFieldName(clazz,"rank")){

ace-common/src/main/java/com/github/wxiaoqi/security/common/rest/BaseController.java

@@ -116,8 +116,8 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
     @ApiOperation("查询所有")
     @RequestMapping(value = "/alls",method = RequestMethod.GET)
     @ResponseBody
-    public ObjectRestResponse alls(){
-        return baseBiz.selectAll();
+    public ObjectRestResponse alls(Entity entity){
+        return ObjectRestResponse.succ(baseBiz.selectListAlls(entity));
     }
 
 

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

@@ -212,4 +212,8 @@ public class ShuntApply implements Serializable {
 	@Column(name = "category_id")
 	@ApiModelProperty("型号id")
 	private Integer categoryId;
+
+	@Column(name = "goods_type")
+	@ApiModelProperty("商品类型 1--房车；2--机车；3--游艇")
+	private Integer goodsType;
 }

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

@@ -251,7 +251,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         detail.setStartTime(shuntApply.getStartTime());
         detail.setEndTime(shuntApply.getEndTime());
         detail.setVehicleId(dto.getVehicleId());
-        detail.setModelId(shuntApply.getModelId());
+//        detail.setModelId(shuntApply.getModelId());
         detail.setStartAddr(shuntApply.getStartCompanyName());
         detail.setStartCompanyId(shuntApply.getStartCompanyId());
         detail.setEndCompanyId(shuntApply.getEndCompanyId());
@@ -292,7 +292,9 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
         StewardShuntApply shuntApplyVO = BeanUtil.toBean(shuntApply, StewardShuntApply.class);
         shuntApplyVO.setVehicleCategory(vehicleFeign.getVehicleCategory(shuntApply.getCategoryId()).getData());
         RentVehicleBookDTO rbd = new RentVehicleBookDTO();
-        rbd.setModelId(shuntApply.getModelId());
+        //rbd.setModelId(shuntApply.getModelId());
+        rbd.setBrandId(shuntApply.getBrandId());
+        rbd.setCategoryId(shuntApply.getCategoryId());
         rbd.setParkBranchCompanyId(companyId);
         rbd.setStartCompanyId(companyId);
         rbd.setEndCompanyId(companyId);

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

@@ -371,10 +371,10 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
 
     @Override
     public RentVehiclePriceVO calculatePrice(RentVehicleBO detail) {
-        if(Vehicle.GOODS_TYPE_RV ==  detail.getOrder().getGoodsType()) {
-            return dayCalculatePrice(detail);
-        }else {
+        if(Vehicle.PRICE_TYPE_HOUR ==  detail.getVehicle().getPriceType()) {
             return hourCalculatePrice(detail);
+        }else {
+            return dayCalculatePrice(detail);
         }
     }
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/Vehicle.java

@@ -20,6 +20,9 @@ public class  Vehicle {
     public static final int STATE_UP = 1;
     public static final int STATE_DOWN = 2;
 
+    public static final int PRICE_TYPE_DAY = 1;
+    public static final int PRICE_TYPE_HOUR = 2;
+
     /**
      * 主键(uuid)
      */

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

@@ -45,6 +45,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
 
+import static cn.hutool.core.date.DateField.HOUR_OF_DAY;
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.*;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP_NAME;
@@ -422,25 +423,49 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
             return CollUtil.newArrayList();
         }
 
-        //Date currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
-        for(cn.hutool.core.date.DateTime currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
-            (currentDate.isAfterOrEquals(beginOfStartDate) && currentDate.isBeforeOrEquals(endOfEndDate));
-            currentDate = DateUtil.offsetDay(currentDate, 1)) {
-            cn.hutool.core.date.DateTime finalCurrentDate = currentDate;
-            VehicleModelCalendarPriceDTO dto = new VehicleModelCalendarPriceDTO(){{
-                setDate(DateUtil.beginOfDay(finalCurrentDate));
-            }};
-            if(currentDate.isWeekend()) {
-                dto.setNo_discount_price(vehicle.getHolidayPrice());
-                dto.setPrice(vehicle.getHolidayPrice());
-                dto.setFreeDays(1);
-            }else {
-                dto.setNo_discount_price(vehicle.getPrice());
-                dto.setPrice(vehicle.getPrice());
-                dto.setFreeDays(1);
+        if(Vehicle.PRICE_TYPE_HOUR ==  vehicle.getPriceType()) {
+            //Date currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
+            for(cn.hutool.core.date.DateTime currentDate = DateUtil.truncate(DateUtil.parse(startDate), HOUR_OF_DAY);
+                (currentDate.isAfterOrEquals(beginOfStartDate) && currentDate.isBeforeOrEquals(endOfEndDate));
+                currentDate = DateUtil.offsetHour(currentDate, 1)) {
+                cn.hutool.core.date.DateTime finalCurrentDate = currentDate;
+                VehicleModelCalendarPriceDTO dto = new VehicleModelCalendarPriceDTO(){{
+                    setDate(DateUtil.beginOfDay(finalCurrentDate));
+                }};
+                if(currentDate.isWeekend()) {
+                    dto.setNo_discount_price(vehicle.getHolidayPrice());
+                    dto.setPrice(vehicle.getHolidayPrice());
+                    dto.setFreeDays(1);
+                }else {
+                    dto.setNo_discount_price(vehicle.getPrice());
+                    dto.setPrice(vehicle.getPrice());
+                    dto.setFreeDays(1);
+                }
+
+                priceDTOS.add(dto);
+            }
+        }else {
+            //Date currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
+            for(cn.hutool.core.date.DateTime currentDate = DateUtil.beginOfDay(DateUtil.parse(startDate));
+                (currentDate.isAfterOrEquals(beginOfStartDate) && currentDate.isBeforeOrEquals(endOfEndDate));
+                currentDate = DateUtil.offsetDay(currentDate, 1)) {
+                cn.hutool.core.date.DateTime finalCurrentDate = currentDate;
+                VehicleModelCalendarPriceDTO dto = new VehicleModelCalendarPriceDTO(){{
+                    setDate(DateUtil.beginOfDay(finalCurrentDate));
+                }};
+                if(currentDate.isWeekend()) {
+                    dto.setNo_discount_price(vehicle.getHolidayPrice());
+                    dto.setPrice(vehicle.getHolidayPrice());
+                    dto.setFreeDays(1);
+                }else {
+                    dto.setNo_discount_price(vehicle.getPrice());
+                    dto.setPrice(vehicle.getPrice());
+                    dto.setFreeDays(1);
+                }
+
+                priceDTOS.add(dto);
             }
 
-            priceDTOS.add(dto);
         }
 
         //获取节假日价格