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
4ec97333
Commit
4ec97333
authored
Apr 13, 2020
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改员工业绩
parent
fde81042
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
StaffStatisticsBiz.java
...github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java
+1
-1
OrderFeign.java
...c/main/java/com/xxfc/platform/order/feign/OrderFeign.java
+4
-4
OrderListController.java
...c/platform/order/rest/background/OrderListController.java
+7
-0
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/StaffStatisticsBiz.java
View file @
4ec97333
...
...
@@ -258,7 +258,7 @@ public class StaffStatisticsBiz {
if
(
CollectionUtils
.
isNotEmpty
(
appUserSellingWaterDTOS
))
{
//3.根据订单id查询订单相关信息
List
<
Integer
>
orderIds
=
appUserSellingWaterDTOS
.
stream
().
map
(
AppUserSellingWaterDTO:
:
getOrderId
).
collect
(
Collectors
.
toList
());
ObjectRestResponse
<
List
<
OrderDTO
>>
response
=
orderFeign
.
findOrdersByorderId
(
orderIds
);
ObjectRestResponse
<
List
<
OrderDTO
>>
response
=
orderFeign
.
findOrdersByorderId
V2
(
orderIds
);
List
<
OrderDTO
>
orders
=
response
.
getData
();
Map
<
Integer
,
Integer
>
ordersMap
=
orders
.
stream
().
collect
(
Collectors
.
toMap
(
OrderDTO:
:
getId
,
OrderDTO:
:
getCompanyId
));
for
(
AppUserSellingWaterDTO
appUserSellingWaterDTO
:
appUserSellingWaterDTOS
)
{
...
...
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
View file @
4ec97333
...
...
@@ -6,10 +6,7 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import
com.xxfc.platform.order.pojo.dto.OrderDTO
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMethod
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
...
...
@@ -27,4 +24,7 @@ public interface OrderFeign {
@GetMapping
(
value
=
"/count/basebase/findByOrderIds"
)
public
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderId
(
@RequestParam
(
value
=
"orderIds"
)
List
<
Integer
>
orderIds
);
@PostMapping
(
value
=
"/count/basebase/findOrdersByorderIdV2"
)
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderIdV2
(
@RequestBody
List
<
Integer
>
orderIds
);
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderListController.java
View file @
4ec97333
...
...
@@ -33,4 +33,11 @@ public class OrderListController {
public
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderId
(
@RequestParam
(
value
=
"orderIds"
)
List
<
Integer
>
orderIds
){
return
ObjectRestResponse
.
succ
(
baseOrderBiz
.
selectBaeOrderByOrderIds
(
orderIds
));
}
@PostMapping
(
value
=
"/basebase/findOrdersByorderIdV2"
)
@IgnoreClientToken
@IgnoreUserToken
public
ObjectRestResponse
<
List
<
OrderDTO
>>
findOrdersByorderIdV2
(
@RequestBody
List
<
Integer
>
orderIds
){
return
ObjectRestResponse
.
succ
(
baseOrderBiz
.
selectBaeOrderByOrderIds
(
orderIds
));
}
}
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