Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
H
haoban-manage3.0
Overview
Overview
Details
Activity
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
haoban3.0
haoban-manage3.0
Commits
b18e02f1
Commit
b18e02f1
authored
Jun 09, 2023
by
徐高华
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
协商记录
parent
dd0536e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
GicOrderRefundController.java
...manage/web/controller/order/GicOrderRefundController.java
+2
-2
OrderExchangeConsultVO.java
...an/manage/web/vo/order/refund/OrderExchangeConsultVO.java
+6
-6
OrderRefundConsultVO.java
...oban/manage/web/vo/order/refund/OrderRefundConsultVO.java
+6
-6
No files found.
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/order/GicOrderRefundController.java
View file @
b18e02f1
...
...
@@ -262,7 +262,7 @@ public class GicOrderRefundController {
OrderRefundConsultVO
vo
=
EntityUtil
.
changeEntityByJSON
(
OrderRefundConsultVO
.
class
,
dto
)
;
if
(
StringUtils
.
isNotEmpty
(
dto
.
getOperInfo
()))
{
ConsultOperVO
oper
=
JSONObject
.
parseObject
(
dto
.
getOperInfo
(),
ConsultOperVO
.
class
)
;
vo
.
setOper
(
oper
);
vo
.
setOper
Info
(
oper
);
}
list
.
add
(
vo
)
;
}
...
...
@@ -280,7 +280,7 @@ public class GicOrderRefundController {
OrderExchangeConsultVO
vo
=
EntityUtil
.
changeEntityByJSON
(
OrderExchangeConsultVO
.
class
,
dto
)
;
if
(
StringUtils
.
isNotEmpty
(
dto
.
getOperInfo
()))
{
ConsultOperVO
oper
=
JSONObject
.
parseObject
(
dto
.
getOperInfo
(),
ConsultOperVO
.
class
)
;
vo
.
setOper
(
oper
);
vo
.
setOper
Info
(
oper
);
}
list
.
add
(
vo
)
;
}
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderExchangeConsultVO.java
View file @
b18e02f1
...
...
@@ -60,14 +60,14 @@ public class OrderExchangeConsultVO implements Serializable {
*/
private
Date
updateTime
;
private
ConsultOperVO
oper
;
public
ConsultOperVO
getOper
()
{
return
oper
;
private
ConsultOperVO
oper
Info
;
public
ConsultOperVO
getOper
Info
()
{
return
oper
Info
;
}
public
void
setOper
(
ConsultOperVO
oper
)
{
this
.
oper
=
oper
;
public
void
setOper
Info
(
ConsultOperVO
operInfo
)
{
this
.
oper
Info
=
operInfo
;
}
public
String
getReason
()
{
...
...
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/order/refund/OrderRefundConsultVO.java
View file @
b18e02f1
...
...
@@ -85,14 +85,14 @@ public class OrderRefundConsultVO implements Serializable {
private
String
extJson
;
private
ConsultOperVO
oper
;
public
ConsultOperVO
getOper
()
{
return
oper
;
private
ConsultOperVO
oper
Info
;
public
ConsultOperVO
getOper
Info
()
{
return
oper
Info
;
}
public
void
setOper
(
ConsultOperVO
oper
)
{
this
.
oper
=
oper
;
public
void
setOper
Info
(
ConsultOperVO
operInfo
)
{
this
.
oper
Info
=
operInfo
;
}
public
String
getExtJson
()
{
...
...
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