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
2c63cc1a
Commit
2c63cc1a
authored
Mar 23, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
0c3b4bf5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
1 deletion
+37
-1
PurchaseSkuDTOAssembler.java
...in/java/com/gogirl/assembler/PurchaseSkuDTOAssembler.java
+18
-0
BaseProduce.java
...ain/java/com/gogirl/domain/product/serve/BaseProduce.java
+2
-0
ScheduleManageController.java
...girl/interfaces/order/serve/ScheduleManageController.java
+15
-1
ScheduleServeDTO.java
...gogirl/shared/order/serve/query/dto/ScheduleServeDTO.java
+2
-0
No files found.
src/main/java/com/gogirl/assembler/PurchaseSkuDTOAssembler.java
0 → 100644
View file @
2c63cc1a
package
com
.
gogirl
.
assembler
;
import
com.gogirl.domain.product.purchase.PurchaseSku
;
import
com.gogirl.shared.product.query.dto.PurchaseSkuDTO
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Component
;
import
java.util.function.Function
;
@Component
public
class
PurchaseSkuDTOAssembler
implements
Function
<
PurchaseSku
,
PurchaseSkuDTO
>
{
@Override
public
PurchaseSkuDTO
apply
(
PurchaseSku
purchaseSku
)
{
PurchaseSkuDTO
purchaseSkuDTO
=
new
PurchaseSkuDTO
();
BeanUtils
.
copyProperties
(
purchaseSku
,
purchaseSkuDTO
);
return
purchaseSkuDTO
;
}
}
src/main/java/com/gogirl/domain/product/serve/BaseProduce.java
View file @
2c63cc1a
...
...
@@ -81,4 +81,6 @@ public class BaseProduce implements Serializable {
@TableField
(
exist
=
false
)
private
BigDecimal
promotionPrice
;
private
String
practice
;
}
src/main/java/com/gogirl/interfaces/order/serve/ScheduleManageController.java
View file @
2c63cc1a
...
...
@@ -7,8 +7,10 @@ import com.gogirl.application.product.mall.PurchaseSkuService;
import
com.gogirl.application.store.store.StoreTechnicianService
;
import
com.gogirl.application.user.customer.CustomerBalanceService
;
import
com.gogirl.application.xcx.GogirlTokenService
;
import
com.gogirl.assembler.PurchaseSkuDTOAssembler
;
import
com.gogirl.assembler.ScheduleManageDTOAssembler
;
import
com.gogirl.domain.order.serve.ScheduleManage
;
import
com.gogirl.domain.product.serve.BaseProduce
;
import
com.gogirl.domain.store.store.StoreTechnician
;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.dto.IdleTimeProgramQuery
;
...
...
@@ -18,6 +20,8 @@ import com.gogirl.dto.QueryLeisureTechnicianReq;
import
com.gogirl.infrastructure.common.annotation.GogirlShop
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper
;
import
com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper
;
import
com.gogirl.infrastructure.util.SessionUtils
;
import
com.gogirl.infrastructure.util.lock.ScheduledLock
;
import
com.gogirl.shared.order.serve.command.schedule.CancelScheduleCommand
;
...
...
@@ -26,6 +30,7 @@ import com.gogirl.shared.order.serve.command.schedule.UpdateScheduleCommand;
import
com.gogirl.shared.order.serve.query.dto.IdleTimeDTO
;
import
com.gogirl.shared.order.serve.query.dto.ScheduleManageDTO
;
import
com.gogirl.shared.order.serve.query.qry.schedule.ScheduleManagePageQuery
;
import
com.gogirl.shared.product.query.dto.PurchaseSkuDTO
;
import
com.gogirl.shared.user.query.qry.VipServeQuery
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiModelProperty
;
...
...
@@ -38,6 +43,7 @@ import java.text.ParseException;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
@Api
(
tags
=
"version3.0:预约接口"
,
value
=
"version3.0:预约接口"
)
@RestController
...
...
@@ -175,15 +181,23 @@ public class ScheduleManageController {
return
JsonResult
.
success
((
Page
<
ScheduleManageDTO
>)
page
.
convert
(
scheduleManageDTOAssembler
));
}
private
final
BaseProduceMapper
baseProduceMapper
;
private
final
PurchaseSkuMapper
purchaseSkuMapper
;
private
final
PurchaseSkuDTOAssembler
purchaseSkuDTOAssembler
;
@ApiOperation
(
value
=
"根据id查询预约详情"
)
@GetMapping
(
"/technician/schedule/queryScheduleManage"
)
public
JsonResult
<
ScheduleManageDTO
>
technicianQueryScheduleManage
(
@RequestParam
Integer
id
)
{
ScheduleManage
scheduleManage
=
scheduleManageService
.
queryScheduleManage
(
id
);
ScheduleManageDTO
scheduleManageDTO
=
scheduleManageDTOAssembler
.
apply
(
scheduleManage
);
scheduleManageDTO
.
getScheduleServeDTOList
().
forEach
(
scheduleServeDTO
->
{
//
todo
如果预约服务有款式 就查询款式使用色号
//如果预约服务有款式 就查询款式使用色号
if
(
scheduleServeDTO
.
getProduceId
()
!=
null
)
{
List
<
PurchaseSkuDTO
>
purchaseSkuDTOList
=
purchaseSkuMapper
.
selectByProduceId
(
scheduleServeDTO
.
getProduceId
()).
stream
().
map
(
purchaseSkuDTOAssembler
).
collect
(
Collectors
.
toList
());
scheduleServeDTO
.
setPurchaseSkuDTOList
(
purchaseSkuDTOList
);
BaseProduce
baseProduce
=
baseProduceMapper
.
selectById
(
scheduleServeDTO
.
getProduceId
());
scheduleServeDTO
.
setProducePractice
(
baseProduce
.
getPractice
());
}
});
return
JsonResult
.
success
(
scheduleManageDTO
);
...
...
src/main/java/com/gogirl/shared/order/serve/query/dto/ScheduleServeDTO.java
View file @
2c63cc1a
...
...
@@ -132,4 +132,6 @@ public class ScheduleServeDTO implements Serializable {
@ApiModelProperty
(
"服务价格"
)
private
BigDecimal
price
=
BigDecimal
.
ZERO
;
private
String
producePractice
;
}
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