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
c941ad75
Commit
c941ad75
authored
Aug 03, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单修改
parent
6e5b961e
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
269 additions
and
182 deletions
+269
-182
OrderAboutParamDTO.java
...om/xxfc/platform/order/pojo/order/OrderAboutParamDTO.java
+3
-0
OrderPageVO.java
.../java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
+12
-4
BackStageOrderController.java
...om/xxfc/platform/order/rest/BackStageOrderController.java
+246
-0
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+8
-178
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderAboutParamDTO.java
View file @
c941ad75
...
...
@@ -24,4 +24,7 @@ public class OrderAboutParamDTO {
@ApiModelProperty
(
value
=
"免赔费用"
)
private
BigDecimal
damageSafe
;
// @ApiModelProperty(value = "违章保留金")
// private BigDecimal ;
}
\ No newline at end of file
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java
View file @
c941ad75
package
com
.
xxfc
.
platform
.
order
.
pojo
.
order
;
import
com.xxfc.platform.order.entity.BaseOrder
;
import
com.xxfc.platform.order.entity.OrderMemberDetail
;
import
com.xxfc.platform.order.entity.OrderRentVehicleDetail
;
import
com.xxfc.platform.order.entity.OrderTourDetail
;
import
com.xxfc.platform.order.entity.*
;
import
com.xxfc.platform.vehicle.entity.VehicleUserLicense
;
import
lombok.Data
;
...
...
@@ -24,8 +21,14 @@ public class OrderPageVO extends BaseOrder {
List
<
VehicleUserLicense
>
vehicleUserLicenses
;
/**
* 用户名
*/
private
String
username
;
/**
* 车牌
*/
private
String
vehicalNumberPlat
;
private
String
qrcodeStr
;
...
...
@@ -35,8 +38,13 @@ public class OrderPageVO extends BaseOrder {
*/
private
BigDecimal
illegalReserve
;
/**
* 出交车记录
*/
private
OrderVehicleCrosstownDto
orderVehicleCrosstownDto
;
private
List
<
OrderItem
>
items
;
public
void
setQrcodeStr
(
String
prefix
)
{
this
.
qrcodeStr
=
prefix
+
"?"
+
TYPE
+
getType
()+
"&"
+
NO
+
getNo
();
}
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java
0 → 100644
View file @
c941ad75
This diff is collapsed.
Click to expand it.
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
c941ad75
This diff is collapsed.
Click to expand it.
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