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
c0a3c963
Commit
c0a3c963
authored
Nov 11, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
dee2930e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
0 deletions
+20
-0
QueryOrderDTO.java
...ava/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java
+2
-0
BaseOrderController.java
...ava/com/xxfc/platform/order/rest/BaseOrderController.java
+2
-0
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+16
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/QueryOrderDTO.java
View file @
c0a3c963
...
@@ -50,4 +50,6 @@ public class QueryOrderDTO extends PageParam {
...
@@ -50,4 +50,6 @@ public class QueryOrderDTO extends PageParam {
private
Integer
orderSign
;
private
Integer
orderSign
;
private
String
multiOrderSign
;
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
View file @
c0a3c963
...
@@ -432,6 +432,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
...
@@ -432,6 +432,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
Integer
bizType
;
Integer
bizType
;
private
String
multiOrderSign
;
}
}
@RequestMapping
(
value
=
"/app/unauth/refund/{no}/{refundAmount}"
,
method
=
RequestMethod
.
POST
)
@RequestMapping
(
value
=
"/app/unauth/refund/{no}/{refundAmount}"
,
method
=
RequestMethod
.
POST
)
...
...
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
c0a3c963
...
@@ -62,6 +62,14 @@
...
@@ -62,6 +62,14 @@
select *
select *
from base_order
from base_order
<where>
<where>
<if
test=
"multiOrderSign != null"
>
and
(
<foreach
collection=
"multiOrderSign.split(',')"
index=
"sIndex"
item=
"signEntity"
separator=
" or "
>
order_sign = #{signEntity}
</foreach>
)
</if>
<if
test=
"orderSign != null"
>
<if
test=
"orderSign != null"
>
and order_sign = #{orderSign}
and order_sign = #{orderSign}
</if>
</if>
...
@@ -260,6 +268,14 @@
...
@@ -260,6 +268,14 @@
<select
id=
"getAllOrderList"
parameterType=
"Map"
resultType=
"com.xxfc.platform.order.pojo.bg.BgOrderListVo"
>
<select
id=
"getAllOrderList"
parameterType=
"Map"
resultType=
"com.xxfc.platform.order.pojo.bg.BgOrderListVo"
>
SELECT * from order_list_info
SELECT * from order_list_info
<where>
<where>
<if
test=
"multiOrderSign != null"
>
and
(
<foreach
collection=
"multiOrderSign.split(',')"
index=
"sIndex"
item=
"signEntity"
separator=
" or "
>
order_sign = #{signEntity}
</foreach>
)
</if>
<if
test=
"userIds != null and userIds.size() > 0"
>
<if
test=
"userIds != null and userIds.size() > 0"
>
and userId in
and userId in
<foreach
collection=
"userIds"
item=
"item"
open=
"("
separator=
","
close=
")"
>
<foreach
collection=
"userIds"
item=
"item"
open=
"("
separator=
","
close=
")"
>
...
...
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