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
3a2c8028
Commit
3a2c8028
authored
Mar 14, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
to autowired
parent
de22889a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
MarketService.java
...ain/java/com/gogirl/application/market/MarketService.java
+4
-0
OrderManageServiceImpl.java
.../application/order/serve/impl/OrderManageServiceImpl.java
+3
-1
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+0
-3
SubmitScheduleCommand.java
...d/order/serve/command/schedule/SubmitScheduleCommand.java
+3
-0
No files found.
src/main/java/com/gogirl/application/market/MarketService.java
View file @
3a2c8028
...
@@ -34,5 +34,9 @@ public interface MarketService {
...
@@ -34,5 +34,9 @@ public interface MarketService {
*/
*/
void
setterOrderMarket
(
Integer
orderId
);
void
setterOrderMarket
(
Integer
orderId
);
/**
*
* @param orderId
*/
void
setterOrder
(
Integer
orderId
);
void
setterOrder
(
Integer
orderId
);
}
}
src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java
View file @
3a2c8028
...
@@ -251,7 +251,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -251,7 +251,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServe
.
setProduceName
(
null
);
orderServe
.
setProduceName
(
null
);
}
}
//折扣金额
orderServe
.
setDiscountPrice
(
BigDecimal
.
ZERO
);
orderServe
.
setDiscountPrice
(
BigDecimal
.
ZERO
);
if
(
orderServeParam
.
getServeChangePrice
()
!=
null
)
{
if
(
orderServeParam
.
getServeChangePrice
()
!=
null
)
{
orderServe
.
setServeChangePrice
(
orderServeParam
.
getServeChangePrice
());
orderServe
.
setServeChangePrice
(
orderServeParam
.
getServeChangePrice
());
...
@@ -287,6 +286,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
...
@@ -287,6 +286,9 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
orderServeMapper
.
deleteBatchIds
(
deleteOrderServeIdList
);
orderServeMapper
.
deleteBatchIds
(
deleteOrderServeIdList
);
}
}
orderManage
.
setChangePrice
(
orderServeList
.
stream
().
map
(
OrderServe:
:
getServeChangePrice
).
reduce
(
BigDecimal
.
ZERO
,
BigDecimal:
:
add
));
orderManageMapper
.
updateById
(
orderManage
);
marketService
.
setterOrder
(
orderManage
.
getId
());
marketService
.
setterOrder
(
orderManage
.
getId
());
}
}
...
...
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
3a2c8028
...
@@ -41,7 +41,6 @@ import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
...
@@ -41,7 +41,6 @@ import com.gogirl.infrastructure.mapper.store.oa.TakeLeaveEventMapper;
import
com.gogirl.infrastructure.mapper.store.store.StoreManageMapper
;
import
com.gogirl.infrastructure.mapper.store.store.StoreManageMapper
;
import
com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper
;
import
com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper
;
import
com.gogirl.infrastructure.util.MapDistance
;
import
com.gogirl.infrastructure.util.MapDistance
;
import
com.gogirl.infrastructure.util.SessionUtils
;
import
com.gogirl.shared.order.serve.command.schedule.*
;
import
com.gogirl.shared.order.serve.command.schedule.*
;
import
com.gogirl.shared.order.serve.query.dto.IdleTimeDTO
;
import
com.gogirl.shared.order.serve.query.dto.IdleTimeDTO
;
import
com.gogirl.shared.order.serve.query.qry.*
;
import
com.gogirl.shared.order.serve.query.qry.*
;
...
@@ -961,7 +960,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -961,7 +960,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
scheduleManage
.
setDepartmentId
(
scheduleManageCommand
.
getDepartmentId
());
scheduleManage
.
setDepartmentId
(
scheduleManageCommand
.
getDepartmentId
());
//预约服务补充
//预约服务补充
StoreManage
storeManage
=
storeManageMapper
.
selectById
(
scheduleManageCommand
.
getDepartmentId
());
StoreManage
storeManage
=
storeManageMapper
.
selectById
(
scheduleManageCommand
.
getDepartmentId
());
//获取预约号
//获取预约号
...
@@ -996,7 +994,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
...
@@ -996,7 +994,6 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
BeanUtils
.
copyProperties
(
scheduleManageCommand
,
scheduleManage
);
BeanUtils
.
copyProperties
(
scheduleManageCommand
,
scheduleManage
);
List
<
ScheduleServe
>
scheduleServeList
=
scheduleManageCommand
.
getScheduleServeDTOList
().
stream
().
map
(
scheduleServeDTO
->
{
List
<
ScheduleServe
>
scheduleServeList
=
scheduleManageCommand
.
getScheduleServeDTOList
().
stream
().
map
(
scheduleServeDTO
->
{
ScheduleServe
scheduleServe
=
new
ScheduleServe
();
ScheduleServe
scheduleServe
=
new
ScheduleServe
();
BeanUtils
.
copyProperties
(
scheduleServeDTO
,
scheduleServe
);
BeanUtils
.
copyProperties
(
scheduleServeDTO
,
scheduleServe
);
...
...
src/main/java/com/gogirl/shared/order/serve/command/schedule/SubmitScheduleCommand.java
View file @
3a2c8028
...
@@ -17,4 +17,7 @@ public class SubmitScheduleCommand implements Serializable {
...
@@ -17,4 +17,7 @@ public class SubmitScheduleCommand implements Serializable {
//美甲师方案参数
//美甲师方案参数
private
final
List
<
TreeProgram
>
defaultNodeList
;
private
final
List
<
TreeProgram
>
defaultNodeList
;
//leisure -
private
String
source
;
}
}
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