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
ea0b9ff9
Commit
ea0b9ff9
authored
Dec 01, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加出游人接口
parent
53515f38
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
3 deletions
+20
-3
RentVehicleBO.java
...ava/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
+1
-1
AddRentVehicleDTO.java
...xxfc/platform/order/pojo/order/add/AddRentVehicleDTO.java
+1
-1
OrderRentVehicleBiz.java
...java/com/xxfc/platform/order/biz/OrderRentVehicleBiz.java
+18
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/RentVehicleBO.java
View file @
ea0b9ff9
...
@@ -115,7 +115,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
...
@@ -115,7 +115,7 @@ public class RentVehicleBO extends OrderRentVehicleDetail implements OrderDetail
private
String
endDateTimeStr
;
private
String
endDateTimeStr
;
private
Integer
needPersonInsurance
;
private
Integer
needPersonInsurance
;
private
List
<
OrderPersonInsurance
>
insurances
;
private
List
<
OrderPersonInsurance
>
insurances
=
CollUtil
.
newArrayList
()
;
private
List
<
OrderPersonInsurance
>
confirmInsurances
=
CollUtil
.
newArrayList
();
private
List
<
OrderPersonInsurance
>
confirmInsurances
=
CollUtil
.
newArrayList
();
public
void
initDate
()
{
public
void
initDate
()
{
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/add/AddRentVehicleDTO.java
View file @
ea0b9ff9
...
@@ -138,7 +138,7 @@ public class AddRentVehicleDTO extends AddOrderCommonDTO{
...
@@ -138,7 +138,7 @@ public class AddRentVehicleDTO extends AddOrderCommonDTO{
public
static
final
int
GOODS_DEPOSIT_TYPE_DOWN
=
2
;
public
static
final
int
GOODS_DEPOSIT_TYPE_DOWN
=
2
;
private
Integer
needPersonInsurance
=
SYS_FALSE
;
private
Integer
needPersonInsurance
=
SYS_FALSE
;
private
String
insure
usersStr
;
private
String
insure
UserIds
;
private
List
<
OrderPersonInsurance
>
insurances
;
private
List
<
OrderPersonInsurance
>
insurances
;
public
void
setStartTime
(
Long
startTime
)
{
public
void
setStartTime
(
Long
startTime
)
{
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderRentVehicleBiz.java
View file @
ea0b9ff9
...
@@ -8,6 +8,8 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
...
@@ -8,6 +8,8 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
com.github.wxiaoqi.security.common.util.result.JsonResultUtil
;
import
com.github.wxiaoqi.security.common.util.result.JsonResultUtil
;
import
com.xxfc.platform.order.biz.inner.OrderCalculateBiz
;
import
com.xxfc.platform.order.biz.inner.OrderCalculateBiz
;
import
com.xxfc.platform.order.entity.InsureUser
;
import
com.xxfc.platform.order.entity.OrderPersonInsurance
;
import
com.xxfc.platform.order.entity.OrderRentVehicleDetail
;
import
com.xxfc.platform.order.entity.OrderRentVehicleDetail
;
import
com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper
;
import
com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper
;
import
com.xxfc.platform.order.pojo.order.OrderFullDTO
;
import
com.xxfc.platform.order.pojo.order.OrderFullDTO
;
...
@@ -22,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
...
@@ -22,7 +24,6 @@ import lombok.extern.slf4j.Slf4j;
import
org.mockito.internal.util.collections.Sets
;
import
org.mockito.internal.util.collections.Sets
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
org.springframework.web.bind.annotation.RequestBody
;
import
tk.mybatis.mapper.entity.Example
;
import
tk.mybatis.mapper.entity.Example
;
import
java.util.List
;
import
java.util.List
;
...
@@ -47,6 +48,9 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
...
@@ -47,6 +48,9 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
@Autowired
@Autowired
OrderCalculateBiz
orderCalculateBiz
;
OrderCalculateBiz
orderCalculateBiz
;
@Autowired
InsureUserBiz
insureUserBiz
;
public
List
<
OrderRentVehicleDetail
>
listByOrderId
(
Integer
orderId
)
{
public
List
<
OrderRentVehicleDetail
>
listByOrderId
(
Integer
orderId
)
{
return
mapper
.
listByOrderId
(
orderId
);
return
mapper
.
listByOrderId
(
orderId
);
...
@@ -145,6 +149,19 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
...
@@ -145,6 +149,19 @@ public class OrderRentVehicleBiz extends BaseBiz<OrderRentVehicleDetailMapper, O
bo
.
setTickerNo
(
StrUtil
.
isNotBlank
(
vo
.
getTickerNos
())?
bo
.
setTickerNo
(
StrUtil
.
isNotBlank
(
vo
.
getTickerNos
())?
StrUtil
.
splitTrim
(
vo
.
getTickerNos
(),
","
):
null
);
StrUtil
.
splitTrim
(
vo
.
getTickerNos
(),
","
):
null
);
bo
.
setAccompanyItems
(
vo
.
getAccompanyItems
());
bo
.
setAccompanyItems
(
vo
.
getAccompanyItems
());
if
(
StrUtil
.
isNotBlank
(
vo
.
getInsureUserIds
())){
for
(
String
insureUserId:
vo
.
getInsureUserIds
().
split
(
","
))
{
InsureUser
insureUser
=
insureUserBiz
.
selectById
(
Integer
.
valueOf
(
insureUserId
));
if
(
null
==
insureUser
)
{
throw
new
BaseException
(
ResultCode
.
PARAM_ILLEGAL_CODE
,
Sets
.
newSet
(
"保险人不存在"
));
}
else
{
bo
.
getInsurances
().
add
(
new
OrderPersonInsurance
(){{
setIdCard
(
insureUser
.
getIdCard
());
setName
(
insureUser
.
getName
());
}});
}
}
}
return
bo
;
return
bo
;
}
}
...
...
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