jiujian / client-customer-order-api

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
05043309 2 parents e693e25c c4457155

Merge branch 'dev/mzyh-0617' into 'master' 

美中宜和新增字段



See merge request !7
Inline Side-by-side
Showing 3 changed files with 10 additions and 0 deletions
...@@ -82,6 +82,9 @@ public class MenuDbDTO { ...@@ -82,6 +82,9 @@ public class MenuDbDTO {
82 82
83 @ApiModelProperty(value = "发布时间") 83 @ApiModelProperty(value = "发布时间")
84 private String publishAt; 84 private String publishAt;
85 +
86 + @ApiModelProperty(value = "医嘱冲突检查")
87 + private Boolean checkMedicalConflict;
85 } 88 }
86 89
87 @Data 90 @Data
......
...@@ -46,6 +46,7 @@ public class MenuServiceImpl implements MenuService { ...@@ -46,6 +46,7 @@ public class MenuServiceImpl implements MenuService {
46 .customerScope(menu.getCustomerScope()) 46 .customerScope(menu.getCustomerScope())
47 .nutritionPromotion(menu.getNutritionPromotion()) 47 .nutritionPromotion(menu.getNutritionPromotion())
48 .nutritionalStatistics(menu.getNutritionalStatistics()) 48 .nutritionalStatistics(menu.getNutritionalStatistics())
49 + .checkMedicalConflict(menu.getCheckMedicalConflict())
49 .dishRuleJson(DishRuleJson.builder() 50 .dishRuleJson(DishRuleJson.builder()
50 .days(menu.getDishRuleJson().getDays()) 51 .days(menu.getDishRuleJson().getDays())
51 .dishType(menu.getDishRuleJson().getDishType()) 52 .dishType(menu.getDishRuleJson().getDishType())
...@@ -87,6 +88,7 @@ public class MenuServiceImpl implements MenuService { ...@@ -87,6 +88,7 @@ public class MenuServiceImpl implements MenuService {
87 .customerScope(menu.getCustomerScope()) 88 .customerScope(menu.getCustomerScope())
88 .nutritionPromotion(menu.getNutritionPromotion()) 89 .nutritionPromotion(menu.getNutritionPromotion())
89 .nutritionalStatistics(menu.getNutritionalStatistics()) 90 .nutritionalStatistics(menu.getNutritionalStatistics())
91 + .checkMedicalConflict(menu.getCheckMedicalConflict())
90 .dishRuleJson(DishRuleJson.builder() 92 .dishRuleJson(DishRuleJson.builder()
91 .days(menu.getDishRuleJson().getDays()) 93 .days(menu.getDishRuleJson().getDays())
92 .dishType(menu.getDishRuleJson().getDishType()) 94 .dishType(menu.getDishRuleJson().getDishType())
...@@ -129,6 +131,7 @@ public class MenuServiceImpl implements MenuService { ...@@ -129,6 +131,7 @@ public class MenuServiceImpl implements MenuService {
129 .customerScope(menu.getCustomerScope()) 131 .customerScope(menu.getCustomerScope())
130 .nutritionPromotion(menu.getNutritionPromotion()) 132 .nutritionPromotion(menu.getNutritionPromotion())
131 .nutritionalStatistics(menu.getNutritionalStatistics()) 133 .nutritionalStatistics(menu.getNutritionalStatistics())
134 + .checkMedicalConflict(menu.getCheckMedicalConflict())
132 .dishRuleJson(DishRuleJson.builder() 135 .dishRuleJson(DishRuleJson.builder()
133 .days(menu.getDishRuleJson().getDays()) 136 .days(menu.getDishRuleJson().getDays())
134 .dishType(menu.getDishRuleJson().getDishType()) 137 .dishType(menu.getDishRuleJson().getDishType())
......
...@@ -79,6 +79,7 @@ message SingleMenuRpcResponse { ...@@ -79,6 +79,7 @@ message SingleMenuRpcResponse {
79 int32 updateSource = 16; 79 int32 updateSource = 16;
80 bool isDeleted = 17; 80 bool isDeleted = 17;
81 int64 publishAt = 18; 81 int64 publishAt = 18;
82 + bool checkMedicalConflict = 19;
82 } 83 }
83 84
84 message OrderRuleJson { 85 message OrderRuleJson {
...@@ -201,6 +202,7 @@ message MenuCreation{ ...@@ -201,6 +202,7 @@ message MenuCreation{
201 DishRuleJson dishRuleJson = 11; 202 DishRuleJson dishRuleJson = 11;
202 bool shouldCreatePublishAt = 12; 203 bool shouldCreatePublishAt = 12;
203 int64 publishAt = 13; 204 int64 publishAt = 13;
205 + bool checkMedicalConflict = 14;
204 } 206 }
205 207
206 message CreateMenuRpcRequest { 208 message CreateMenuRpcRequest {
...@@ -247,6 +249,8 @@ message MenuModification { ...@@ -247,6 +249,8 @@ message MenuModification {
247 DishRuleJson dishRuleJson = 17; 249 DishRuleJson dishRuleJson = 17;
248 bool shouldUpdatePublishAt = 18; 250 bool shouldUpdatePublishAt = 18;
249 int64 publishAt = 19; 251 int64 publishAt = 19;
252 + bool shouldUpdateCheckMedicalConflict = 20;
253 + bool checkMedicalConflict = 21;
250 } 254 }
251 255
252 message UpdateMenuRpcRequest { 256 message UpdateMenuRpcRequest {
......