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
db9fd770
Commit
db9fd770
authored
Oct 31, 2019
by
libin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员订单列表
parent
c3e616a4
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
96 additions
and
20 deletions
+96
-20
MemberOrderFindDTO.java
.../com/xxfc/platform/order/pojo/dto/MemberOrderFindDTO.java
+1
-0
OrderMemberController.java
...a/com/xxfc/platform/order/rest/OrderMemberController.java
+1
-1
OrderMemberService.java
...a/com/xxfc/platform/order/service/OrderMemberService.java
+90
-18
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+4
-1
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/MemberOrderFindDTO.java
View file @
db9fd770
...
...
@@ -36,4 +36,5 @@ public class MemberOrderFindDTO extends PageParam {
private
String
facilitatePhone
;
private
Boolean
isExport
;
private
List
<
Integer
>
userIds
;
private
Boolean
isPay
;
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderMemberController.java
View file @
db9fd770
...
...
@@ -69,6 +69,6 @@ public class OrderMemberController extends BaseController<OrderMemberDetailBiz,
@PostMapping
(
"/export"
)
@ResponseBody
public
void
exportMemberOrders
(
@RequestBody
MemberOrderFindDTO
memberOrderFindDTO
,
HttpServletResponse
response
){
orderMemberService
.
exportMemberOrderData
(
memberOrderFindDTO
);
//
orderMemberService.exportMemberOrderData(memberOrderFindDTO);
}
}
\ No newline at end of file
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java
View file @
db9fd770
This diff is collapsed.
Click to expand it.
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
db9fd770
...
...
@@ -303,7 +303,7 @@
FROM
`base_order`
WHERE
type = 3
and
<![CDATA[`member_level`<>0]]>
type = 3
<if
test=
"orderNo!=null and orderNo!=''"
>
and `no`=#{orderNo}
</if>
...
...
@@ -334,6 +334,9 @@
<if
test=
"endPayTime!=null and startPayTime==null"
>
and `pay_time`
<![CDATA[<=#{endPayTime}]]>
</if>
<if
test=
"isPay == true"
>
and `has_pay`=1
</if>
<if
test=
"userIds!=null and userIds.size()>0"
>
and `user_id` IN
<foreach
collection=
"userIds"
item=
"userId"
separator=
","
open=
"("
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