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
855078a1
Commit
855078a1
authored
Sep 18, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
c98b7db1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
4 deletions
+25
-4
CostDetailExtend.java
.../com/xxfc/platform/order/pojo/price/CostDetailExtend.java
+11
-0
OrderTemplateBiz.java
...in/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java
+8
-2
OrderCancelBiz.java
...ava/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
+6
-2
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/CostDetailExtend.java
View file @
855078a1
package
com
.
xxfc
.
platform
.
order
.
pojo
.
price
;
import
cn.hutool.json.JSONUtil
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
@Data
...
...
@@ -16,4 +18,13 @@ public class CostDetailExtend {
* type:1--取消违约金;2--取消费用明细;3--提前还车费用明细;4--延期还车费用明细
*/
protected
Integer
type
;
/**
* 参数json
*/
public
String
paramJson
=
""
;
public
void
initParamJson
()
{
paramJson
=
JSONUtil
.
toJsonStr
(
this
);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java
View file @
855078a1
...
...
@@ -71,12 +71,18 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
}
public
<
T
extends
CostDetailExtend
>
void
handleCostDetailExtend
(
T
costDetailExtend
)
{
OrderTemplate
template
=
new
OrderTemplate
();
switch
(
costDetailExtend
.
getType
())
{
case
CostDetailExtend
.
CANCEL_NO_START
:
template
=
selectByCode
(
OrderCostEnum
.
RENT_VEHICLE
.
getCode
());
template
.
setTemplate
(
result
(
template
.
getTemplate
(),
new
HashMap
(){{
put
(
"paramJson"
,
costDetailExtend
.
getParamJson
());
}}));
break
;
case
CostDetailExtend
.
CANCEL_STARTED
:
OrderTemplate
template
=
selectByCode
(
OrderCostEnum
.
RENT_VEHICLE
.
getCode
());
template
=
selectByCode
(
OrderCostEnum
.
RENT_VEHICLE
.
getCode
());
template
.
setTemplate
(
result
(
template
.
getTemplate
(),
new
HashMap
(){{
put
(
"paramJson"
,
costDetailExtend
.
getParamJson
());
put
(
"children"
,
handleChildren
(
costDetailExtend
));
put
(
"consumeAmount"
,
((
CancelStartedVO
)
costDetailExtend
).
getConsumeAmount
());
}}));
...
...
@@ -88,7 +94,7 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
default
:
break
;
}
OrderTemplate
template
=
selectByCode
(
OrderCostEnum
.
CANCEL_NO_START
.
getCode
());
costDetailExtend
.
setCostDetail
(
result
(
template
.
getTemplate
(),
Dict
.
parse
(
costDetailExtend
)));
}
...
...
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
View file @
855078a1
...
...
@@ -174,7 +174,9 @@ public class OrderCancelBiz {
}
}
}
orderTemplateBiz
.
handleCostDetailExtend
(
csv
);
csv
.
initParamJson
();
//orderTemplateBiz.handleCostDetailExtend(csv);
orvd
.
handelCostDetailExtend
(
csv
);
orderRentVehicleBiz
.
updateSelectiveByIdRe
(
orvd
);
}
else
{
...
...
@@ -200,7 +202,9 @@ public class OrderCancelBiz {
setViolateAmount
(
deduction
.
getAmount
());
setViolateDesc
(
deduction
.
getName
());
}};
orderTemplateBiz
.
handleCostDetailExtend
(
cnsv
);
cnsv
.
initParamJson
();
//orderTemplateBiz.handleCostDetailExtend(cnsv);
orvd
.
handelCostDetailExtend
(
cnsv
);
orderRentVehicleBiz
.
updateSelectiveByIdRe
(
orvd
);
}
...
...
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