Merge branch 'feature_chw_zjw' into dev-chw

# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.ReflectionUtils;
 import io.swagger.annotations.ApiOperation;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -144,5 +145,8 @@ public class BaseController<Biz extends BaseBiz,Entity> extends CommonBaseContro
         return ObjectRestResponse.succ();
     }
 
-
+    @Data
+    public static class BaseDetailDTO {
+        Integer id;
+    }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java

@@ -14,6 +14,7 @@ import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -23,6 +24,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
     private VehicleModel vehicleModel;
     private BookVehicleVO bookVehicleVO;
     private Vehicle vehicle;
+    private BigDecimal specialUnitPrice;
 
     /**
      * 订单标记 1--普通订单；2--需求预定申请订单；3--特惠租车订单

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

@@ -33,10 +33,7 @@ import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.persistence.Column;
-
 import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_FALSE;
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
 import static com.xxfc.platform.order.entity.SpecialRent.*;
 
 @RestController
@@ -114,7 +111,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
     @ResponseBody
     @ApiOperation(value = "分页查询可参加特惠租车")
     @IgnoreUserToken
-    public ObjectRestResponse<SpecialRentVO> pageList(QueryDTO dto) {
+    public ObjectRestResponse<PageDataVO<SpecialRentVO>> pageList(QueryDTO dto) {
         //查询列表数据
         Query query = new Query(dto);
         PageDataVO<SpecialRentVO> pages = PageDataVO.pageInfo(query, () -> baseBiz.selectByWeekend(w -> {
@@ -131,6 +128,16 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         return ObjectRestResponse.succ(pages);
     }
 
+    @RequestMapping(value = "/app/unauth/app/detail", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "查询特惠租车详情")
+    @IgnoreUserToken
+    public ObjectRestResponse<SpecialRent> detail(BaseDetailDTO dto) {
+        //查询数据
+        AssertUtils.isBlankBean(dto);
+        return ObjectRestResponse.succ(baseBiz.selectById(dto.getId()));
+    }
+
     @RequestMapping(value = "/appBusiness/myList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "分页查询我发布的特惠租车")
@@ -192,6 +199,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
         bo.setOrderSign(BaseOrder.ORDER_SIGN_SPECIAL);
         bo.setAppUserDTO(getAppUser());
         bo.setBookRecordId(specialRent.getBookRecordId());
+        bo.setSpecialUnitPrice(specialRent.getUnitPrice());
         orderRentVehicleService.specialCreateOrder(bo, specialRent.getOrderNo());
         baseBiz.updateSelectiveById(new SpecialRent(){{
             setId(specialRent.getId());

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

@@ -440,6 +440,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         detail.initDate();
         List<VehicleModelCalendarPriceDTO> metaVmcpds = vehicleFeign.getPriceByVehicleIdFeignV2(detail.getVehicleId(), detail.getStartTime(), detail.getEndTime(), dto.getUserid()).getData();
 
+        if(null != detail.getSpecialUnitPrice()) {
+            metaVmcpds.forEach(meta -> {
+                meta.setPrice(detail.getSpecialUnitPrice());
+            });
+        }
         List<VMCalendarPriceCostDTO> vmcpds = Convert.toList(VMCalendarPriceCostDTO.class, metaVmcpds);
 
 
@@ -628,6 +633,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
         detail.initDate();
         List<VehicleModelCalendarPriceDTO> metaVmcpds = vehicleFeign.getPriceByVehicleIdFeignV2(detail.getVehicleId(), detail.getStartTime(), detail.getEndTime(), dto.getUserid()).getData();
 
+        if(null != detail.getSpecialUnitPrice()) {
+            metaVmcpds.forEach(meta -> {
+                meta.setPrice(detail.getSpecialUnitPrice());
+            });
+        }
         List<VMCalendarPriceCostDTO> vmcpds = Convert.toList(VMCalendarPriceCostDTO.class, metaVmcpds);