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
96f85f4a
Commit
96f85f4a
authored
Nov 12, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
a8cca14d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
0 deletions
+13
-0
ShuntApply.java
.../main/java/com/xxfc/platform/order/entity/ShuntApply.java
+4
-0
SpecialRent.java
...main/java/com/xxfc/platform/order/entity/SpecialRent.java
+7
-0
SpecialRentBiz.java
...main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java
+1
-0
ShuntApplyController.java
...va/com/xxfc/platform/order/rest/ShuntApplyController.java
+1
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/ShuntApply.java
View file @
96f85f4a
package
com
.
xxfc
.
platform
.
order
.
entity
;
package
com
.
xxfc
.
platform
.
order
.
entity
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.math.BigDecimal
;
import
java.util.Date
;
import
java.util.Date
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
...
@@ -237,4 +238,7 @@ public class ShuntApply implements Serializable {
...
@@ -237,4 +238,7 @@ public class ShuntApply implements Serializable {
@Column
(
name
=
"is_bizdel"
)
@Column
(
name
=
"is_bizdel"
)
private
Integer
isBizdel
;
private
Integer
isBizdel
;
@Column
(
name
=
"real_amount"
)
private
BigDecimal
realAmount
;
}
}
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java
View file @
96f85f4a
...
@@ -266,4 +266,11 @@ public class SpecialRent implements Serializable {
...
@@ -266,4 +266,11 @@ public class SpecialRent implements Serializable {
@Column
(
name
=
"over_time"
)
@Column
(
name
=
"over_time"
)
@ApiModelProperty
(
value
=
"超时时间戳"
,
hidden
=
true
)
@ApiModelProperty
(
value
=
"超时时间戳"
,
hidden
=
true
)
private
Long
overTime
;
private
Long
overTime
;
/**
* 超时时间戳
*/
@Column
(
name
=
"price_type"
)
@ApiModelProperty
(
value
=
"超时时间戳"
,
hidden
=
true
)
private
Integer
priceType
;
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/SpecialRentBiz.java
View file @
96f85f4a
...
@@ -113,6 +113,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
...
@@ -113,6 +113,7 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
specialRent
.
setBrandId
(
vehicle
.
getBrandId
());
specialRent
.
setBrandId
(
vehicle
.
getBrandId
());
specialRent
.
setCategoryId
(
vehicle
.
getCategoryId
());
specialRent
.
setCategoryId
(
vehicle
.
getCategoryId
());
specialRent
.
setGoodsType
(
vehicle
.
getGoodsType
());
specialRent
.
setGoodsType
(
vehicle
.
getGoodsType
());
specialRent
.
setPriceType
(
vehicle
.
getPriceType
());
//缓存商品信息
//缓存商品信息
specialRent
.
setGoodsJson
(
JSONUtil
.
parse
(
vehicle
).
toString
());
specialRent
.
setGoodsJson
(
JSONUtil
.
parse
(
vehicle
).
toString
());
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/ShuntApplyController.java
View file @
96f85f4a
...
@@ -229,6 +229,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
...
@@ -229,6 +229,7 @@ public class ShuntApplyController extends BaseController<ShuntApplyBiz, ShuntApp
setId
(
shuntApply
.
getId
());
setId
(
shuntApply
.
getId
());
setStatus
(
ShuntApply
.
STATUS_ORDER
);
setStatus
(
ShuntApply
.
STATUS_ORDER
);
setOrderStatus
(
ShuntApply
.
ORDER_STATUS_TOPAY
);
setOrderStatus
(
ShuntApply
.
ORDER_STATUS_TOPAY
);
setRealAmount
(
bo
.
getOrder
().
getRealAmount
());
}});
}});
return
ObjectRestResponse
.
succ
(
bo
.
getOrder
());
return
ObjectRestResponse
.
succ
(
bo
.
getOrder
());
}
}
...
...
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