Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
4f0b60e8
Commit
4f0b60e8
authored
Nov 19, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加详情
parent
234fc056
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
29 additions
and
1 deletion
+29
-1
RentVehicleBO.java
...ava/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
+2
-0
SpecialRentController.java
...a/com/xxfc/platform/order/rest/SpecialRentController.java
+17
-1
OrderRentVehicleService.java
.../xxfc/platform/order/service/OrderRentVehicleService.java
+10
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
View file @
4f0b60e8
...
@@ -14,6 +14,7 @@ import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
...
@@ -14,6 +14,7 @@ import com.xxfc.platform.vehicle.pojo.BookVehicleVO;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
...
@@ -23,6 +24,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
...
@@ -23,6 +24,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
private
VehicleModel
vehicleModel
;
private
VehicleModel
vehicleModel
;
private
BookVehicleVO
bookVehicleVO
;
private
BookVehicleVO
bookVehicleVO
;
private
Vehicle
vehicle
;
private
Vehicle
vehicle
;
private
BigDecimal
specialUnitPrice
;
/**
/**
* 订单标记 1--普通订单;2--需求预定申请订单;3--特惠租车订单
* 订单标记 1--普通订单;2--需求预定申请订单;3--特惠租车订单
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
View file @
4f0b60e8
...
@@ -114,7 +114,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
...
@@ -114,7 +114,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
@ResponseBody
@ResponseBody
@ApiOperation
(
value
=
"分页查询可参加特惠租车"
)
@ApiOperation
(
value
=
"分页查询可参加特惠租车"
)
@IgnoreUserToken
@IgnoreUserToken
public
ObjectRestResponse
<
SpecialRentVO
>
pageList
(
QueryDTO
dto
)
{
public
ObjectRestResponse
<
PageDataVO
<
SpecialRentVO
>
>
pageList
(
QueryDTO
dto
)
{
//查询列表数据
//查询列表数据
Query
query
=
new
Query
(
dto
);
Query
query
=
new
Query
(
dto
);
PageDataVO
<
SpecialRentVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseBiz
.
selectByWeekend
(
w
->
{
PageDataVO
<
SpecialRentVO
>
pages
=
PageDataVO
.
pageInfo
(
query
,
()
->
baseBiz
.
selectByWeekend
(
w
->
{
...
@@ -131,6 +131,16 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
...
@@ -131,6 +131,16 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
return
ObjectRestResponse
.
succ
(
pages
);
return
ObjectRestResponse
.
succ
(
pages
);
}
}
@RequestMapping
(
value
=
"/app/unauth/app/detail"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ApiOperation
(
value
=
"查询特惠租车详情"
)
@IgnoreUserToken
public
ObjectRestResponse
<
SpecialRent
>
detail
(
SpecialDetailDTO
dto
)
{
//查询数据
AssertUtils
.
isBlankBean
(
dto
);
return
ObjectRestResponse
.
succ
(
baseBiz
.
selectById
(
dto
.
getId
()));
}
@RequestMapping
(
value
=
"/appBusiness/myList"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/appBusiness/myList"
,
method
=
RequestMethod
.
GET
)
@ResponseBody
@ResponseBody
@ApiOperation
(
value
=
"分页查询我发布的特惠租车"
)
@ApiOperation
(
value
=
"分页查询我发布的特惠租车"
)
...
@@ -191,6 +201,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
...
@@ -191,6 +201,7 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
RentVehicleBO
bo
=
orderRentVehicleBiz
.
initRentVehicleBO
(
dto
);
RentVehicleBO
bo
=
orderRentVehicleBiz
.
initRentVehicleBO
(
dto
);
bo
.
setOrderSign
(
BaseOrder
.
ORDER_SIGN_SPECIAL
);
bo
.
setOrderSign
(
BaseOrder
.
ORDER_SIGN_SPECIAL
);
bo
.
setAppUserDTO
(
getAppUser
());
bo
.
setAppUserDTO
(
getAppUser
());
bo
.
setSpecialUnitPrice
(
specialRent
.
getUnitPrice
());
orderRentVehicleService
.
specialCreateOrder
(
bo
,
specialRent
.
getOrderNo
());
orderRentVehicleService
.
specialCreateOrder
(
bo
,
specialRent
.
getOrderNo
());
baseBiz
.
updateSelectiveById
(
new
SpecialRent
(){{
baseBiz
.
updateSelectiveById
(
new
SpecialRent
(){{
setId
(
specialRent
.
getId
());
setId
(
specialRent
.
getId
());
...
@@ -250,4 +261,9 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
...
@@ -250,4 +261,9 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
public
static
class
SpecialOrderDTO
extends
AddRentVehicleDTO
{
public
static
class
SpecialOrderDTO
extends
AddRentVehicleDTO
{
Integer
specialId
;
Integer
specialId
;
}
}
@Data
public
static
class
SpecialDetailDTO
{
Integer
id
;
}
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java
View file @
4f0b60e8
...
@@ -440,6 +440,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -440,6 +440,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
detail
.
initDate
();
detail
.
initDate
();
List
<
VehicleModelCalendarPriceDTO
>
metaVmcpds
=
vehicleFeign
.
getPriceByVehicleIdFeignV2
(
detail
.
getVehicleId
(),
detail
.
getStartTime
(),
detail
.
getEndTime
(),
dto
.
getUserid
()).
getData
();
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
);
List
<
VMCalendarPriceCostDTO
>
vmcpds
=
Convert
.
toList
(
VMCalendarPriceCostDTO
.
class
,
metaVmcpds
);
...
@@ -628,6 +633,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
...
@@ -628,6 +633,11 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
detail
.
initDate
();
detail
.
initDate
();
List
<
VehicleModelCalendarPriceDTO
>
metaVmcpds
=
vehicleFeign
.
getPriceByVehicleIdFeignV2
(
detail
.
getVehicleId
(),
detail
.
getStartTime
(),
detail
.
getEndTime
(),
dto
.
getUserid
()).
getData
();
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
);
List
<
VMCalendarPriceCostDTO
>
vmcpds
=
Convert
.
toList
(
VMCalendarPriceCostDTO
.
class
,
metaVmcpds
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment