Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
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
huluobin
gogirl-miniapp-backend
Commits
36ee09ba
Commit
36ee09ba
authored
Jul 06, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
d89cc90d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+2
-2
OrderManageController.java
.../gogirl/interfaces/order/serve/OrderManageController.java
+2
-2
No files found.
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
36ee09ba
...
@@ -825,13 +825,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -825,13 +825,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
.
map
(
ScheduleServe:
:
getServeId
)
.
map
(
ScheduleServe:
:
getServeId
)
.
collect
(
Collectors
.
toList
())))
.
collect
(
Collectors
.
toList
())))
.
stream
()
.
stream
()
.
collect
(
Collectors
.
toMap
(
BaseServe:
:
getId
,
a
->
a
,(
k1
,
k2
)
->
k1
));
.
collect
(
Collectors
.
toMap
(
BaseServe:
:
getId
,
a
->
a
,
(
k1
,
k2
)
->
k1
));
scheduleServeList
.
forEach
(
scheduleServe
->
{
scheduleServeList
.
forEach
(
scheduleServe
->
{
if
(
scheduleServe
.
getOwnProduceId
()
!=
null
)
{
if
(
scheduleServe
.
getOwnProduceId
()
!=
null
)
{
scheduleServe
.
setOwnProduce
(
ownProduceMap
.
get
(
scheduleServe
.
getOwnProduceId
()));
scheduleServe
.
setOwnProduce
(
ownProduceMap
.
get
(
scheduleServe
.
getOwnProduceId
()));
}
}
if
(
scheduleServe
.
getServeId
()
!=
null
)
{
if
(
scheduleServe
.
getServeId
()
!=
null
)
{
scheduleServe
.
setServe
(
baseServeMap
.
get
(
scheduleServe
.
getServeId
()));
scheduleServe
.
setServe
(
baseServeMap
.
get
(
scheduleServe
.
getServeId
()));
}
}
});
});
...
...
src/main/java/com/gogirl/interfaces/order/serve/OrderManageController.java
View file @
36ee09ba
...
@@ -138,11 +138,11 @@ public class OrderManageController {
...
@@ -138,11 +138,11 @@ public class OrderManageController {
@PostMapping
(
"/technician/ordermanage/selectBySkuName"
)
@PostMapping
(
"/technician/ordermanage/selectBySkuName"
)
public
JsonResult
<
PurchaseSku
>
selectBySkuName
(
String
skuName
,
@RequestHeader
(
"brandId"
)
Integer
brandId
)
{
public
JsonResult
<
PurchaseSku
>
selectBySkuName
(
String
skuName
,
@RequestHeader
(
"brandId"
)
Integer
brandId
)
{
PurchaseSku
purchaseSku
=
purchaseSkuMapper
PurchaseSku
purchaseSku
=
purchaseSkuMapper
.
select
One
(
.
select
List
(
new
LambdaQueryWrapper
<
PurchaseSku
>()
new
LambdaQueryWrapper
<
PurchaseSku
>()
.
like
(
PurchaseSku:
:
getSkuName
,
skuName
)
.
like
(
PurchaseSku:
:
getSkuName
,
skuName
)
.
eq
(
PurchaseSku:
:
getBrandId
,
brandId
)
.
eq
(
PurchaseSku:
:
getBrandId
,
brandId
)
);
)
.
stream
().
findFirst
().
orElseGet
(
PurchaseSku:
:
new
)
;
return
JsonResult
.
success
(
purchaseSku
);
return
JsonResult
.
success
(
purchaseSku
);
}
}
...
...
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