Toggle navigation
Toggle navigation
This project
Loading...
Sign in
jiujian
/
client-customer-order-api
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
zhuyifan
2025-04-17 13:30:55 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
087eca73084333577eb49aef19ea505f667d1213
087eca73
1 parent
b6078e36
订餐规则
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
72 additions
and
0 deletions
src/main/java/com/infoloop/tianting/controller/MealOrderController.java
src/main/java/com/infoloop/tianting/model/vo/DeliveryRuleVO.java
src/main/java/com/infoloop/tianting/service/MealOrderService.java
src/main/java/com/infoloop/tianting/service/client/DeliveryRuleServiceRpcClient.java
src/main/java/com/infoloop/tianting/service/impl/MealOrderServiceImpl.java
src/main/java/com/infoloop/tianting/controller/MealOrderController.java
View file @
087eca7
...
...
@@ -5,6 +5,7 @@ import com.infoloop.tianting.annotation.RepeatSubmit;
import
com.infoloop.tianting.mealorderservice.SingleMealOrderRpcResponse
;
import
com.infoloop.tianting.model.common.CreatedResult
;
import
com.infoloop.tianting.model.dto.MealOrderDTO
;
import
com.infoloop.tianting.model.vo.DeliveryRuleVO
;
import
com.infoloop.tianting.model.vo.MealOrderVO
;
import
com.infoloop.tianting.service.MealOrderService
;
import
io.swagger.annotations.Api
;
...
...
@@ -59,4 +60,11 @@ public class MealOrderController {
return
mealOrderService
.
getMealOrderById
(
mealOrder
);
}
@ApiOperation
(
value
=
"订餐规则"
)
@GetMapping
(
"/deliveryrule"
)
@ResponseStatus
(
HttpStatus
.
OK
)
public
DeliveryRuleVO
getDeliveryRule
()
{
return
mealOrderService
.
getDeliveryRule
();
}
}
...
...
src/main/java/com/infoloop/tianting/model/vo/DeliveryRuleVO.java
0 → 100644
View file @
087eca7
package
com
.
infoloop
.
tianting
.
model
.
vo
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Builder
;
import
lombok.Data
;
@Data
@ApiModel
(
value
=
"订餐规则"
)
@Builder
public
class
DeliveryRuleVO
{
@ApiModelProperty
(
value
=
"订餐开始时间"
)
private
String
startTime
;
@ApiModelProperty
(
value
=
"订餐结束时间"
)
private
String
endTime
;
private
Boolean
monday
;
private
Boolean
tuesday
;
private
Boolean
wednesday
;
private
Boolean
thursday
;
private
Boolean
friday
;
private
Boolean
saturday
;
private
Boolean
sunday
;
}
src/main/java/com/infoloop/tianting/service/MealOrderService.java
View file @
087eca7
...
...
@@ -3,6 +3,7 @@ package com.infoloop.tianting.service;
import
com.infoloop.tianting.mealorderservice.SingleMealOrderRpcResponse
;
import
com.infoloop.tianting.model.common.CreatedResult
;
import
com.infoloop.tianting.model.dto.MealOrderDTO
;
import
com.infoloop.tianting.model.vo.DeliveryRuleVO
;
import
com.infoloop.tianting.model.vo.MealOrderVO
;
import
java.util.List
;
...
...
@@ -14,4 +15,6 @@ public interface MealOrderService {
CreatedResult
<
MealOrderVO
>
createMealOrder
(
MealOrderDTO
.
CreateMealOrderDTO
createMealOrderDTO
);
MealOrderVO
getMealOrderById
(
SingleMealOrderRpcResponse
mealOrder
);
DeliveryRuleVO
getDeliveryRule
();
}
...
...
src/main/java/com/infoloop/tianting/service/client/DeliveryRuleServiceRpcClient.java
View file @
087eca7
package
com
.
infoloop
.
tianting
.
service
.
client
;
import
com.infoloop.tianting.deliveryruleservice.DeliveryTemplateTypeEnum
;
import
com.infoloop.tianting.deliveryruleservice.GetClientLabelsByIdsRpcRequest
;
import
com.infoloop.tianting.deliveryruleservice.GetClientLabelsByIdsRpcResponse
;
import
com.infoloop.tianting.deliveryruleservice.GetDefaultDeliveryTemplateAndRuleRpcRequest
;
import
com.infoloop.tianting.deliveryruleservice.GetDefaultDeliveryTemplateAndRuleRpcResponse
;
import
com.infoloop.tianting.deliveryruleservice.QueryClientLabelsByConditionRpcRequest
;
import
com.infoloop.tianting.deliveryruleservice.QueryClientLabelsByConditionRpcResponse
;
import
com.infoloop.tianting.deliveryruleservice.TiantingDeliveryRuleServiceRpcGrpc
;
...
...
@@ -40,5 +43,14 @@ public class DeliveryRuleServiceRpcClient {
return
deliveryRuleServiceRpcBlockingStub
.
getClientLabelsByIds
(
request
);
}
public
GetDefaultDeliveryTemplateAndRuleRpcResponse
getDefaultDeliveryTemplateAndRule
(
int
enterpriseId
)
{
final
var
request
=
GetDefaultDeliveryTemplateAndRuleRpcRequest
.
newBuilder
()
.
setEnterpriseId
(
enterpriseId
)
.
setType
(
DeliveryTemplateTypeEnum
.
DELIVERY_TEMPLATE_TYPE_DELIVERY
)
.
build
();
return
deliveryRuleServiceRpcBlockingStub
.
getDefaultDeliveryTemplateAndRule
(
request
);
}
}
...
...
src/main/java/com/infoloop/tianting/service/impl/MealOrderServiceImpl.java
View file @
087eca7
...
...
@@ -10,9 +10,11 @@ import com.infoloop.tianting.mealorderservice.MenuSchedule;
import
com.infoloop.tianting.mealorderservice.SingleMealOrderRpcResponse
;
import
com.infoloop.tianting.model.common.CreatedResult
;
import
com.infoloop.tianting.model.dto.MealOrderDTO
;
import
com.infoloop.tianting.model.vo.DeliveryRuleVO
;
import
com.infoloop.tianting.model.vo.MealOrderVO
;
import
com.infoloop.tianting.service.MealOrderService
;
import
com.infoloop.tianting.service.client.ClientInventoryServiceRpcClient
;
import
com.infoloop.tianting.service.client.DeliveryRuleServiceRpcClient
;
import
com.infoloop.tianting.service.client.MealOrderServiceRpcClient
;
import
com.infoloop.tianting.utils.DateUtil
;
import
lombok.RequiredArgsConstructor
;
...
...
@@ -36,6 +38,8 @@ public class MealOrderServiceImpl implements MealOrderService {
private
final
ClientInventoryServiceRpcClient
clientInventoryServiceRpcClient
;
private
final
DeliveryRuleServiceRpcClient
deliveryRuleServiceRpcClient
;
@Override
public
List
<
MealOrderVO
>
queryMealOrders
(
MealOrderDTO
.
QueryMealOrderDTO
queryMealOrderDTO
)
{
final
var
loginInfo
=
LoginContextHolder
.
getLoginInfo
();
...
...
@@ -118,4 +122,23 @@ public class MealOrderServiceImpl implements MealOrderService {
.
meals
(
mealOrder
.
getMealsList
().
stream
().
map
(
e
->
MealOrderVO
.
Meals
.
builder
().
date
(
e
.
getDate
()).
menu
(
e
.
getMenu
()).
build
()).
toList
())
.
build
();
}
@Override
public
DeliveryRuleVO
getDeliveryRule
()
{
final
var
rule
=
deliveryRuleServiceRpcClient
.
getDefaultDeliveryTemplateAndRule
(
LoginContextHolder
.
getEnterpriseId
()).
getRule
();
if
(
rule
.
getConfigJson
().
getRulesList
().
isEmpty
())
{
return
DeliveryRuleVO
.
builder
().
build
();
}
return
DeliveryRuleVO
.
builder
()
.
startTime
(
rule
.
getConfigJson
().
getRules
(
0
).
getStartTime
())
.
endTime
(
rule
.
getConfigJson
().
getRules
(
0
).
getEndTime
())
.
monday
(
rule
.
getConfigJson
().
getRules
(
0
).
getMonday
())
.
tuesday
(
rule
.
getConfigJson
().
getRules
(
0
).
getTuesday
())
.
wednesday
(
rule
.
getConfigJson
().
getRules
(
0
).
getWednesday
())
.
thursday
(
rule
.
getConfigJson
().
getRules
(
0
).
getThursday
())
.
friday
(
rule
.
getConfigJson
().
getRules
(
0
).
getFriday
())
.
saturday
(
rule
.
getConfigJson
().
getRules
(
0
).
getSaturday
())
.
sunday
(
rule
.
getConfigJson
().
getRules
(
0
).
getSunday
())
.
build
();
}
}
...
...
Please
register
or
login
to post a comment