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
0572940d
Commit
0572940d
authored
Nov 10, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
fceb5a46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
SpecialRent.java
...main/java/com/xxfc/platform/order/entity/SpecialRent.java
+4
-0
SpecialRentController.java
...a/com/xxfc/platform/order/rest/SpecialRentController.java
+3
-2
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/SpecialRent.java
View file @
0572940d
...
...
@@ -231,6 +231,10 @@ public class SpecialRent implements Serializable {
@ApiModelProperty
(
value
=
"商品信息json"
)
private
String
goodsJson
;
public
void
setGoodsJson
(
String
goodsJson
)
{
this
.
goodsJson
=
goodsJson
;
}
@Column
(
name
=
"brand_name"
)
@ApiModelProperty
(
"品牌名称"
)
private
String
brandName
;
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/SpecialRentController.java
View file @
0572940d
...
...
@@ -26,6 +26,7 @@ import com.xxfc.platform.order.pojo.order.add.AddRentVehicleDTO;
import
com.xxfc.platform.order.service.OrderRentVehicleService
;
import
com.xxfc.platform.vehicle.entity.Vehicle
;
import
com.xxfc.platform.vehicle.feign.VehicleFeign
;
import
com.xxfc.platform.vehicle.pojo.vo.VehicleVO
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiOperation
;
import
lombok.Data
;
...
...
@@ -221,12 +222,12 @@ public class SpecialRentController extends BaseController<SpecialRentBiz, Specia
@Data
public
static
class
SpecialRentVO
extends
SpecialRent
{
Vehicle
vehicle
;
Vehicle
VO
vehicle
;
@Override
public
void
setGoodsJson
(
String
goodsJson
)
{
super
.
setGoodsJson
(
goodsJson
);
if
(
StrUtil
.
isNotBlank
(
goodsJson
))
{
setVehicle
(
JSONUtil
.
toBean
(
goodsJson
,
Vehicle
.
class
));
setVehicle
(
JSONUtil
.
toBean
(
goodsJson
,
Vehicle
VO
.
class
));
super
.
setGoodsJson
(
null
);
}
}
...
...
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