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
732d4e87
Commit
732d4e87
authored
Nov 08, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
063098e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
CostDetailExtend.java
.../com/xxfc/platform/order/pojo/price/CostDetailExtend.java
+2
-1
OrderAccountBiz.java
...ain/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
+2
-0
OrderCancelBiz.java
...ava/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
+2
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/CostDetailExtend.java
View file @
732d4e87
package
com
.
xxfc
.
platform
.
order
.
pojo
.
price
;
package
com
.
xxfc
.
platform
.
order
.
pojo
.
price
;
import
cn.hutool.core.collection.CollUtil
;
import
cn.hutool.json.JSONUtil
;
import
cn.hutool.json.JSONUtil
;
import
com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO
;
import
com.xxfc.platform.vehicle.pojo.dto.order.VMCalendarPriceCostDTO
;
import
lombok.Data
;
import
lombok.Data
;
...
@@ -41,7 +42,7 @@ public class CostDetailExtend {
...
@@ -41,7 +42,7 @@ public class CostDetailExtend {
/**
/**
* 使用(消耗)详情列表
* 使用(消耗)详情列表
*/
*/
List
<
VMCalendarPriceCostDTO
>
useAmountList
;
List
<
VMCalendarPriceCostDTO
>
useAmountList
=
CollUtil
.
newArrayList
();
;
public
void
initParamJson
()
{
public
void
initParamJson
()
{
paramJson
=
JSONUtil
.
toJsonStr
(
this
);
paramJson
=
JSONUtil
.
toJsonStr
(
this
);
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
View file @
732d4e87
...
@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
...
@@ -469,6 +469,8 @@ public class OrderAccountBiz extends BaseBiz<OrderAccountMapper,OrderAccount> {
csv
.
setHadConpon
((
StrUtil
.
isNotBlank
(
orderMQDTO
.
getCouponTickerNos
())?
Boolean
.
TRUE
:
Boolean
.
FALSE
));
csv
.
setHadConpon
((
StrUtil
.
isNotBlank
(
orderMQDTO
.
getCouponTickerNos
())?
Boolean
.
TRUE
:
Boolean
.
FALSE
));
csv
.
setSameUseUnitPriceFromList
(
inProgressVO
.
getUseAmountList
());
csv
.
setSameUseUnitPriceFromList
(
inProgressVO
.
getUseAmountList
());
csv
.
setSameOverUnitPriceFromList
(
inProgressVO
.
getOverAmountList
());
csv
.
setSameOverUnitPriceFromList
(
inProgressVO
.
getOverAmountList
());
csv
.
setUseAmountList
(
inProgressVO
.
getUseAmountList
());
csv
.
setOverAmountList
(
inProgressVO
.
getOverAmountList
());
if
(
csv
.
getUsedDayNum
()
==
orderMQDTO
.
getOrderRentVehicleDetail
().
getDayNum
())
{
if
(
csv
.
getUsedDayNum
()
==
orderMQDTO
.
getOrderRentVehicleDetail
().
getDayNum
())
{
csv
.
setType
(
CostDetailExtend
.
FINLISH_ONTIME
);
csv
.
setType
(
CostDetailExtend
.
FINLISH_ONTIME
);
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
View file @
732d4e87
...
@@ -178,6 +178,8 @@ public class OrderCancelBiz {
...
@@ -178,6 +178,8 @@ public class OrderCancelBiz {
csv
.
setViolateDesc
(
""
);
csv
.
setViolateDesc
(
""
);
csv
.
setSameUseUnitPriceFromList
(
inProgressVO
.
getUseAmountList
());
csv
.
setSameUseUnitPriceFromList
(
inProgressVO
.
getUseAmountList
());
csv
.
setSameOverUnitPriceFromList
(
inProgressVO
.
getOverAmountList
());
csv
.
setSameOverUnitPriceFromList
(
inProgressVO
.
getOverAmountList
());
csv
.
setUseAmountList
(
inProgressVO
.
getUseAmountList
());
csv
.
setOverAmountList
(
inProgressVO
.
getOverAmountList
());
//如果有扣款项,则生成额外的费用明细
//如果有扣款项,则生成额外的费用明细
if
(
oad
.
getDeductions
().
size
()
>
0
)
{
if
(
oad
.
getDeductions
().
size
()
>
0
)
{
...
...
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