Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
customer-service
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
QG
customer-service
Commits
ba73e7a5
Commit
ba73e7a5
authored
Apr 21, 2020
by
杨钧
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去除总金额
parent
d0803629
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
JsonResult.java
src/main/java/cn/quantgroup/customer/rest/vo/JsonResult.java
+2
-1
OrderServiceImpl.java
...cn/quantgroup/customer/service/impl/OrderServiceImpl.java
+3
-2
XyqbServiceImpl.java
.../cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
+2
-2
No files found.
src/main/java/cn/quantgroup/customer/rest/vo/JsonResult.java
View file @
ba73e7a5
...
@@ -77,8 +77,9 @@ public class JsonResult<T> implements Serializable {
...
@@ -77,8 +77,9 @@ public class JsonResult<T> implements Serializable {
@Override
@Override
public
String
toString
()
{
public
String
toString
()
{
return
"JsonResult{"
+
return
"JsonResult{"
+
"
businessCode='"
+
businessCode
+
'\''
+
"
msg='"
+
msg
+
'\''
+
", code='"
+
code
+
'\''
+
", code='"
+
code
+
'\''
+
", businessCode='"
+
businessCode
+
'\''
+
", data="
+
data
+
", data="
+
data
+
'}'
;
'}'
;
}
}
...
...
src/main/java/cn/quantgroup/customer/service/impl/OrderServiceImpl.java
View file @
ba73e7a5
...
@@ -403,9 +403,10 @@ public class OrderServiceImpl implements IOrderService {
...
@@ -403,9 +403,10 @@ public class OrderServiceImpl implements IOrderService {
fieldDataMap
.
put
(
"title"
,
"结清违约金"
);
fieldDataMap
.
put
(
"title"
,
"结清违约金"
);
}
else
if
(
"otherFee"
.
equals
(
key
))
{
}
else
if
(
"otherFee"
.
equals
(
key
))
{
fieldDataMap
.
put
(
"title"
,
"应还其他费用"
);
fieldDataMap
.
put
(
"title"
,
"应还其他费用"
);
}
else
if
(
"totalAmount"
.
equals
(
key
))
{
fieldDataMap
.
put
(
"title"
,
"应还总额"
);
}
}
// else if ("totalAmount".equals(key)) {
// fieldDataMap.put("title", "应还总额");
// }
fieldDataMap
.
put
(
"value"
,
Constant
.
DECIMAL_FORMAT2
.
format
(
value
));
fieldDataMap
.
put
(
"value"
,
Constant
.
DECIMAL_FORMAT2
.
format
(
value
));
dataList
.
add
(
fieldDataMap
);
dataList
.
add
(
fieldDataMap
);
}
}
...
...
src/main/java/cn/quantgroup/customer/service/impl/XyqbServiceImpl.java
View file @
ba73e7a5
...
@@ -447,8 +447,8 @@ public class XyqbServiceImpl implements IXyqbService {
...
@@ -447,8 +447,8 @@ public class XyqbServiceImpl implements IXyqbService {
if
(
Objects
.
isNull
(
jsonResult
))
{
if
(
Objects
.
isNull
(
jsonResult
))
{
return
JsonResult
.
buildErrorStateResult
(
"操作失败,xyqb返回错误"
,
Boolean
.
FALSE
);
return
JsonResult
.
buildErrorStateResult
(
"操作失败,xyqb返回错误"
,
Boolean
.
FALSE
);
}
else
{
}
else
{
if
(!
jsonResult
.
isSuccess
())
{
if
(!
jsonResult
.
isSuccess
())
{
return
JsonResult
.
buildErrorStateResult
(
StringUtils
.
isNotBlank
(
jsonResult
.
getMsg
())
?
jsonResult
.
getMsg
():
"操作失败,xyqb返回错误"
,
Boolean
.
FALSE
);
return
JsonResult
.
buildErrorStateResult
(
StringUtils
.
isNotBlank
(
jsonResult
.
getMsg
())
?
jsonResult
.
getMsg
()
:
"操作失败,xyqb返回错误"
,
Boolean
.
FALSE
);
}
}
return
JsonResult
.
buildSuccessResult
(
"[操作成功]"
,
Boolean
.
TRUE
);
return
JsonResult
.
buildSuccessResult
(
"[操作成功]"
,
Boolean
.
TRUE
);
}
}
...
...
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