jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
964ae91a 1 parent 1f63ca48

feat(clientcustomerorderservice): 将在线支付字段改为枚举类型- 在 ClientCustomerOrderService.pr… 

…oto 中定义 OnlinePayEnum 枚举类型
Inline Side-by-side
Showing 4 changed files with 496 additions and 499 deletions
...@@ -7,15 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableId; ...@@ -7,15 +7,14 @@ import com.baomidou.mybatisplus.annotation.TableId;
7 import com.baomidou.mybatisplus.annotation.TableLogic; 7 import com.baomidou.mybatisplus.annotation.TableLogic;
8 import com.baomidou.mybatisplus.annotation.TableName; 8 import com.baomidou.mybatisplus.annotation.TableName;
9 import com.baomidou.mybatisplus.extension.activerecord.Model; 9 import com.baomidou.mybatisplus.extension.activerecord.Model;
10 -import com.fasterxml.jackson.annotation.JsonFormat;
11 import com.fasterxml.jackson.databind.JsonNode; 10 import com.fasterxml.jackson.databind.JsonNode;
12 import lombok.Data; 11 import lombok.Data;
13 import lombok.EqualsAndHashCode; 12 import lombok.EqualsAndHashCode;
14 import lombok.experimental.Accessors; 13 import lombok.experimental.Accessors;
14 +import org.apache.ibatis.type.JdbcType;
15 15
16 import java.io.Serializable; 16 import java.io.Serializable;
17 import java.time.LocalDateTime; 17 import java.time.LocalDateTime;
18 -import org.apache.ibatis.type.JdbcType;
19 18
20 /** 19 /**
21 * order DB 20 * order DB
...@@ -100,9 +99,9 @@ public class OrderDb extends Model<OrderDb> implements Serializable { ...@@ -100,9 +99,9 @@ public class OrderDb extends Model<OrderDb> implements Serializable {
100 */ 99 */
101 private Integer payPrice; 100 private Integer payPrice;
102 /** 101 /**
103 - * 是否在线付费；0=未付费，1=付费 102 + * 支付方式
104 */ 103 */
105 - private Boolean onlinePay; 104 + private Integer onlinePay;
106 /** 105 /**
107 * 支付时间 106 * 支付时间
108 */ 107 */
......
...@@ -10,7 +10,6 @@ import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustome ...@@ -10,7 +10,6 @@ import com.infoloop.tianting.clientcustomerorderservice.BatchCreateClientCustome
10 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest; 10 import com.infoloop.tianting.clientcustomerorderservice.BatchUpdateClientCustomerOrdersRpcRequest;
11 import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation; 11 import com.infoloop.tianting.clientcustomerorderservice.ClientCustomerOrderCreation;
12 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest; 12 import com.infoloop.tianting.clientcustomerorderservice.CreateClientCustomerOrderRpcRequest;
13 -import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
14 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum; 13 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
15 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest; 14 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
16 import com.tianting.infoloop.mapper.OrderDbMapper; 15 import com.tianting.infoloop.mapper.OrderDbMapper;
...@@ -19,13 +18,13 @@ import com.tianting.infoloop.model.db.OrderDetailDb; ...@@ -19,13 +18,13 @@ import com.tianting.infoloop.model.db.OrderDetailDb;
19 import com.tianting.infoloop.model.dto.CustomerNoticeDto; 18 import com.tianting.infoloop.model.dto.CustomerNoticeDto;
20 import com.tianting.infoloop.model.dto.MealDetailJson; 19 import com.tianting.infoloop.model.dto.MealDetailJson;
21 import com.tianting.infoloop.service.OrderDbService; 20 import com.tianting.infoloop.service.OrderDbService;
22 -import com.tianting.infoloop.service.OrderDetailDbService;
23 import com.tianting.infoloop.utils.exception.ErrorCodeConstants; 21 import com.tianting.infoloop.utils.exception.ErrorCodeConstants;
24 import com.tianting.infoloop.utils.exception.ServiceExceptionUtil; 22 import com.tianting.infoloop.utils.exception.ServiceExceptionUtil;
25 import lombok.RequiredArgsConstructor; 23 import lombok.RequiredArgsConstructor;
26 import lombok.extern.slf4j.Slf4j; 24 import lombok.extern.slf4j.Slf4j;
27 import org.springframework.beans.factory.annotation.Autowired; 25 import org.springframework.beans.factory.annotation.Autowired;
28 import org.springframework.stereotype.Service; 26 import org.springframework.stereotype.Service;
27 +import org.springframework.transaction.annotation.Transactional;
29 28
30 import java.time.Instant; 29 import java.time.Instant;
31 import java.time.LocalDateTime; 30 import java.time.LocalDateTime;
...@@ -40,154 +39,146 @@ import java.util.stream.Collectors; ...@@ -40,154 +39,146 @@ import java.util.stream.Collectors;
40 @Service 39 @Service
41 @RequiredArgsConstructor(onConstructor_ = @Autowired) 40 @RequiredArgsConstructor(onConstructor_ = @Autowired)
42 public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> implements OrderDbService { 41 public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> implements OrderDbService {
43 - private final OrderDbMapper orderDbMapper; 42 + private final OrderDbMapper orderDbMapper;
44 - private final OrderDetailDbService orderDetailDbService;
45 43
46 - @Override 44 + @Override
47 - public OrderDb createOrderDb(CreateClientCustomerOrderRpcRequest createOrderRpcRequest) { 45 + @Transactional(rollbackFor = Exception.class)
48 - OrderDb orderDb = new OrderDb(); 46 + public OrderDb createOrderDb(CreateClientCustomerOrderRpcRequest createOrderRpcRequest) {
49 - //生成分布式唯一值 47 + OrderDb orderDb = new OrderDb();
50 - String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 48 + //生成分布式唯一值
51 - orderDb.setOrderCode(orderCode); 49 + String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
52 - orderDb.setEnterpriseId(createOrderRpcRequest.getEnterpriseId()); 50 + orderDb.setOrderCode(orderCode);
53 - orderDb.setClientId(createOrderRpcRequest.getCreation().getClientId()); 51 + orderDb.setEnterpriseId(createOrderRpcRequest.getEnterpriseId());
54 - orderDb.setStallId(createOrderRpcRequest.getCreation().getStallId()); 52 + orderDb.setClientId(createOrderRpcRequest.getCreation().getClientId());
55 - if (createOrderRpcRequest.getCreation().getShouldCreateCustomerId()) { 53 + orderDb.setStallId(createOrderRpcRequest.getCreation().getStallId());
56 - orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId()); 54 + if (createOrderRpcRequest.getCreation().getShouldCreateCustomerId()) {
57 - } 55 + orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId());
58 - if (createOrderRpcRequest.getCreation().getShouldCreateOpenId()) { 56 + }
59 - orderDb.setOpenId(createOrderRpcRequest.getCreation().getOpenId()); 57 + if (createOrderRpcRequest.getCreation().getShouldCreateOpenId()) {
60 - } 58 + orderDb.setOpenId(createOrderRpcRequest.getCreation().getOpenId());
61 - if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) { 59 + }
62 - orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId()); 60 + if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) {
63 - } 61 + orderDb.setCustomerId(createOrderRpcRequest.getCreation().getCustomerId());
64 - orderDb.setStatus(createOrderRpcRequest.getCreation().getStatusValue()); 62 + }
65 - orderDb.setMenuId(createOrderRpcRequest.getCreation().getMenuId()); 63 + orderDb.setStatus(createOrderRpcRequest.getCreation().getStatusValue());
66 - orderDb.setTotalNum(createOrderRpcRequest.getCreation().getTotalNum()); 64 + orderDb.setMenuId(createOrderRpcRequest.getCreation().getMenuId());
67 - if (createOrderRpcRequest.getCreation().getShouldCreatePayPrice()) { 65 + orderDb.setTotalNum(createOrderRpcRequest.getCreation().getTotalNum());
68 - orderDb.setPayPrice(createOrderRpcRequest.getCreation().getPayPrice()); 66 + if (createOrderRpcRequest.getCreation().getShouldCreatePayPrice()) {
69 - } 67 + orderDb.setPayPrice(createOrderRpcRequest.getCreation().getPayPrice());
70 - if (createOrderRpcRequest.getCreation().getShouldCreatePayTime()) { 68 + }
71 - orderDb.setPayTime(Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getPayTime()) 69 + if (createOrderRpcRequest.getCreation().getShouldCreatePayTime()) {
72 - .atZone(ZoneId.systemDefault()) 70 + orderDb.setPayTime(Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getPayTime()).atZone(ZoneId.systemDefault()).toLocalDateTime());
73 - .toLocalDateTime()); 71 + }
74 - } 72 + if (createOrderRpcRequest.getCreation().getShouldCreateOnlinePay()) {
75 - if (createOrderRpcRequest.getCreation().getShouldCreateOnlinePay()) { 73 + orderDb.setOnlinePay(createOrderRpcRequest.getCreation().getOnlinePayValue());
76 - orderDb.setOnlinePay(createOrderRpcRequest.getCreation().getOnlinePay()); 74 + }
77 - } 75 + if (createOrderRpcRequest.getCreation().getShouldCreatePayStatus()) {
78 - if (createOrderRpcRequest.getCreation().getShouldCreatePayStatus()) { 76 + orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
79 - orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue()); 77 + }
80 - } 78 + if (createOrderRpcRequest.getCreation().getShouldCreateTransactionId()) {
81 - if (createOrderRpcRequest.getCreation().getShouldCreateTransactionId()) { 79 + orderDb.setTransactionId(createOrderRpcRequest.getCreation().getTransactionId());
82 - orderDb.setTransactionId(createOrderRpcRequest.getCreation().getTransactionId()); 80 + }
83 - } 81 + if (createOrderRpcRequest.getCreation().getShouldCreateErrorMsg()) {
84 - if (createOrderRpcRequest.getCreation().getShouldCreateErrorMsg()) { 82 + orderDb.setErrorMsg(createOrderRpcRequest.getCreation().getErrorMsg());
85 - orderDb.setErrorMsg(createOrderRpcRequest.getCreation().getErrorMsg()); 83 + }
86 - } 84 + if (createOrderRpcRequest.getCreation().getShouldCreateAddress()) {
87 - if (createOrderRpcRequest.getCreation().getShouldCreateAddress()) { 85 + orderDb.setAddress(createOrderRpcRequest.getCreation().getAddress());
88 - orderDb.setAddress(createOrderRpcRequest.getCreation().getAddress()); 86 + }
89 - } 87 + if (createOrderRpcRequest.getCreation().getShouldCreateRoomNo()) {
90 - if (createOrderRpcRequest.getCreation().getShouldCreateRoomNo()) { 88 + orderDb.setRoomNo(createOrderRpcRequest.getCreation().getRoomNo());
91 - orderDb.setRoomNo(createOrderRpcRequest.getCreation().getRoomNo()); 89 + }
92 - } 90 + if (createOrderRpcRequest.getCreation().getShouldCreateTableCode()) {
93 - if (createOrderRpcRequest.getCreation().getShouldCreateTableCode()) { 91 + orderDb.setTableCode(createOrderRpcRequest.getCreation().getTableCode());
94 - orderDb.setTableCode(createOrderRpcRequest.getCreation().getTableCode()); 92 + }
95 - } 93 + if (createOrderRpcRequest.getCreation().getShouldCreatePickupCode()) {
96 - if (createOrderRpcRequest.getCreation().getShouldCreatePickupCode()) { 94 + orderDb.setPickupCode(createOrderRpcRequest.getCreation().getPickupCode());
97 - orderDb.setPickupCode(createOrderRpcRequest.getCreation().getPickupCode()); 95 + }
98 - } 96 + if (createOrderRpcRequest.getCreation().getShouldCreateOrderType()) {
99 - if (createOrderRpcRequest.getCreation().getShouldCreateOrderType()) { 97 + orderDb.setOrderType(createOrderRpcRequest.getCreation().getOrderTypeValue());
100 - orderDb.setOrderType(createOrderRpcRequest.getCreation().getOrderTypeValue()); 98 + }
101 - } 99 + if (createOrderRpcRequest.getCreation().getShouldCreateRemark()) {
102 - if (createOrderRpcRequest.getCreation().getShouldCreateRemark()) { 100 + orderDb.setRemark(createOrderRpcRequest.getCreation().getRemark());
103 - orderDb.setRemark(createOrderRpcRequest.getCreation().getRemark()); 101 + }
104 - } 102 + ObjectMapper objectMapper = new ObjectMapper();
105 - ObjectMapper objectMapper = new ObjectMapper(); 103 + if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) {
106 - if (createOrderRpcRequest.getCreation().getShouldCreateCustomerNoticeJson()) { 104 + JsonNode notice = objectMapper.valueToTree(CustomerNoticeDto.builder()
107 - JsonNode notice = objectMapper.valueToTree(CustomerNoticeDto.builder() 105 + .avoids(createOrderRpcRequest.getCreation().getCustomerNoticeJson().getAvoidsList())
108 - .avoids(createOrderRpcRequest.getCreation().getCustomerNoticeJson().getAvoidsList()) 106 + .doctors(createOrderRpcRequest.getCreation().getCustomerNoticeJson().getDoctorsList())
109 - .doctors(createOrderRpcRequest.getCreation().getCustomerNoticeJson().getDoctorsList()) 107 + .build());
110 - .build()); 108 + orderDb.setCustomerNoticeJson(notice);
111 - orderDb.setCustomerNoticeJson(notice); 109 + }
112 - } 110 + LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()).atOffset(ZoneOffset.UTC).toLocalDateTime();
113 - LocalDateTime mealTime = Instant.ofEpochMilli(createOrderRpcRequest.getCreation().getMealTime()) 111 + orderDb.setMealTime(mealTime);
114 -// .atZone(ZoneId.systemDefault()) 112 + orderDb.setPayStatus(createOrderRpcRequest.getCreation().getPayStatusValue());
115 - .atOffset(ZoneOffset.UTC) 113 + orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
116 - .toLocalDateTime(); 114 + orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
117 - orderDb.setMealTime(mealTime); 115 + orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
118 - orderDb.setPayStatus(createOrderRpcRequest.getCreation().getOnlinePay() ? PayStatusEnum.TO_PAY_VALUE : PayStatusEnum.SUCCEED_VALUE); 116 + orderDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue());
119 - orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy()); 117 + orderDb.setCloseTimeType(createOrderRpcRequest.getCreation().getCloseTimeTypeValue());
120 - orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue()); 118 + orderDb.setIsRead(createOrderRpcRequest.getCreation().getIsRead());
121 - orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy()); 119 + orderDb.setIsDeleted(false);
122 - orderDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue()); 120 + orderDb.setIsConfirm(false);
123 - orderDb.setCloseTimeType(createOrderRpcRequest.getCreation().getCloseTimeTypeValue()); 121 + orderDb.setIsAllocation(false);
124 - orderDb.setIsRead(createOrderRpcRequest.getCreation().getIsRead()); 122 + boolean res = this.save(orderDb);
125 - orderDb.setIsDeleted(false); 123 + if (!res) {
126 - orderDb.setIsConfirm(false); 124 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
127 - orderDb.setIsAllocation(false); 125 + }
128 - 126 + if (createOrderRpcRequest.getCreation().getShouldCreateOrderDetails()) {
129 - boolean res = this.save(orderDb); 127 + var detailList = createOrderRpcRequest.getCreation().getOrderDetailsList().stream()
130 - if (!res) { 128 + .map(detailCreation -> {
131 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 129 + OrderDetailDb orderDetailDb = new OrderDetailDb();
132 - } 130 + orderDetailDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
133 - if (createOrderRpcRequest.getCreation().getShouldCreateOrderDetails()) { 131 + orderDetailDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
134 - var detailList = createOrderRpcRequest.getCreation().getOrderDetailsList().stream() 132 + orderDetailDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue());
135 - .map(detailCreation -> { 133 + orderDetailDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
136 - OrderDetailDb orderDetailDb = new OrderDetailDb(); 134 + orderDetailDb.setOrderId(orderDb.getId());
137 - orderDetailDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue()); 135 + orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
138 - orderDetailDb.setCreatedBy(createOrderRpcRequest.getCreatedBy()); 136 + orderDetailDb.setCount(detailCreation.getCount());
139 - orderDetailDb.setUpdateSource(createOrderRpcRequest.getCreationSourceValue()); 137 + orderDetailDb.setMealId(detailCreation.getMealId());
140 - orderDetailDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy()); 138 + orderDetailDb.setCategoryId(detailCreation.getCategoryId());
141 - orderDetailDb.setOrderId(orderDb.getId()); 139 + orderDetailDb.setSkuId(detailCreation.getSkuId());
142 - orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId()); 140 + orderDetailDb.setEnterpriseId(orderDb.getEnterpriseId());
143 - orderDetailDb.setCount(detailCreation.getCount()); 141 + orderDetailDb.setIsDeleted(false);
144 - orderDetailDb.setMealId(detailCreation.getMealId()); 142 + if (detailCreation.getShouldCreateShowName()) {
145 - orderDetailDb.setCategoryId(detailCreation.getCategoryId()); 143 + orderDetailDb.setShowName(detailCreation.getShowName());
146 - orderDetailDb.setSkuId(detailCreation.getSkuId()); 144 + }
147 - orderDetailDb.setEnterpriseId(orderDb.getEnterpriseId()); 145 + if (detailCreation.getShouldCreatePrice()) {
148 - orderDetailDb.setIsDeleted(false); 146 + orderDetailDb.setPrice(detailCreation.getPrice());
149 - if (detailCreation.getShouldCreateShowName()) { 147 + }
150 - orderDetailDb.setShowName(detailCreation.getShowName()); 148 + if (detailCreation.getShouldCreateAdjustSkuRemark()) {
151 - } 149 + orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark());
152 - if (detailCreation.getShouldCreatePrice()) { 150 + }
153 - orderDetailDb.setPrice(detailCreation.getPrice()); 151 + orderDetailDb.setServeStatus(ServeStatusEnum.SERVE_NOT_START_VALUE);
154 - } 152 + if (detailCreation.getShouldCreateMealDetailJson()) {
155 - if (detailCreation.getShouldCreateAdjustSkuRemark()) { 153 + orderDetailDb.setMealDetailJson(objectMapper.valueToTree(MealDetailJson.builder()
156 - orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark()); 154 + .allergies(detailCreation.getMealDetailJson().getAllergiesList())
157 - } 155 + .avoids(detailCreation.getMealDetailJson().getAvoidsList())
158 - orderDetailDb.setServeStatus(ServeStatusEnum.SERVE_NOT_START_VALUE); 156 + .basicMaterials(detailCreation.getMealDetailJson().getBasicMaterials())
159 - if (detailCreation.getShouldCreateMealDetailJson()) { 157 + .carbohydrate(detailCreation.getMealDetailJson().getCarbohydrate())
160 - orderDetailDb.setMealDetailJson(objectMapper.valueToTree(MealDetailJson.builder() 158 + .dockers(detailCreation.getMealDetailJson().getDockersList())
161 - .allergies(detailCreation.getMealDetailJson().getAllergiesList()) 159 + .efficacies(detailCreation.getMealDetailJson().getEfficaciesList())
162 - .avoids(detailCreation.getMealDetailJson().getAvoidsList()) 160 + .energy(detailCreation.getMealDetailJson().getEnergy())
163 - .basicMaterials(detailCreation.getMealDetailJson().getBasicMaterials()) 161 + .fat(detailCreation.getMealDetailJson().getFat())
164 - .carbohydrate(detailCreation.getMealDetailJson().getCarbohydrate()) 162 + .protein(detailCreation.getMealDetailJson().getProtein())
165 - .dockers(detailCreation.getMealDetailJson().getDockersList()) 163 + .skus(detailCreation.getMealDetailJson().getSkusList())
166 - .efficacies(detailCreation.getMealDetailJson().getEfficaciesList()) 164 + .tastes(detailCreation.getMealDetailJson().getTastesList())
167 - .energy(detailCreation.getMealDetailJson().getEnergy()) 165 + .build()));
168 - .fat(detailCreation.getMealDetailJson().getFat()) 166 + }
169 - .protein(detailCreation.getMealDetailJson().getProtein()) 167 + return orderDetailDb;
170 - .skus(detailCreation.getMealDetailJson().getSkusList()) 168 + })
171 - .tastes(detailCreation.getMealDetailJson().getTastesList()) 169 + .collect(Collectors.toList());
172 - .build()));//detailCreation.getMealDetailJson() 170 + List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class).saveBatch(detailList) ? detailList : Collections.emptyList();
173 - } 171 + if (resOrderDetails.size() != createOrderRpcRequest.getCreation().getOrderDetailsCount()) {
174 - return orderDetailDb; 172 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
175 - }) 173 + }
176 - .collect(Collectors.toList()); 174 + }
177 - List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class) 175 + return orderDb;
178 - .saveBatch(detailList) ? detailList : Collections.emptyList();
179 -
180 - if (resOrderDetails.size() != createOrderRpcRequest.getCreation().getOrderDetailsCount()) {
181 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
182 - }
183 } 176 }
184 - return orderDb;
185 - }
186 177
187 - @Override 178 + @Override
188 - public List<OrderDb> batchCreateOrderDbs( 179 + public List<OrderDb> batchCreateOrderDbs(
189 - BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) { 180 + BatchCreateClientCustomerOrdersRpcRequest batchCreateOrdersRequest) {
190 - ObjectMapper objectMapper = new ObjectMapper(); 181 + ObjectMapper objectMapper = new ObjectMapper();
191 // var orderList = batchCreateOrdersRequest.getCreationsList().stream() 182 // var orderList = batchCreateOrdersRequest.getCreationsList().stream()
192 // .map(creation ->{ 183 // .map(creation ->{
193 // OrderDb orderDb = new OrderDb(); 184 // OrderDb orderDb = new OrderDb();
...@@ -271,357 +262,355 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -271,357 +262,355 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
271 // if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) { 262 // if (resOrders.size() != batchCreateOrdersRequest.getCreationsCount()) {
272 // throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 263 // throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
273 // } 264 // }
274 - List<OrderDb> resOrders = new ArrayList<>(); 265 + List<OrderDb> resOrders = new ArrayList<>();
275 - for(ClientCustomerOrderCreation creation: batchCreateOrdersRequest.getCreationsList()){ 266 + for (ClientCustomerOrderCreation creation : batchCreateOrdersRequest.getCreationsList()) {
276 - OrderDb orderDb = new OrderDb(); 267 + OrderDb orderDb = new OrderDb();
277 - String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr(); 268 + String orderCode = IdUtil.getSnowflake(0, 0).nextIdStr();
278 - orderDb.setOrderCode(orderCode); 269 + orderDb.setOrderCode(orderCode);
279 - orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId()); 270 + orderDb.setEnterpriseId(batchCreateOrdersRequest.getEnterpriseId());
280 - orderDb.setClientId(creation.getClientId()); 271 + orderDb.setClientId(creation.getClientId());
281 - orderDb.setStallId(creation.getStallId()); 272 + orderDb.setStallId(creation.getStallId());
282 - if (creation.getShouldCreateOpenId()) { 273 + if (creation.getShouldCreateOpenId()) {
283 - orderDb.setOpenId(creation.getOpenId()); 274 + orderDb.setOpenId(creation.getOpenId());
284 - } 275 + }
285 - if (creation.getShouldCreateCustomerNoticeJson()) 276 + if (creation.getShouldCreateCustomerNoticeJson()) {
286 - { 277 + orderDb.setCustomerId(creation.getCustomerId());
287 - orderDb.setCustomerId(creation.getCustomerId()); 278 + }
288 - } 279 + orderDb.setStatus(creation.getStatusValue());
289 - orderDb.setStatus(creation.getStatusValue()); 280 + orderDb.setMenuId(creation.getMenuId());
290 - orderDb.setMenuId(creation.getMenuId()); 281 + orderDb.setTotalNum(creation.getTotalNum());
291 - orderDb.setTotalNum(creation.getTotalNum()); 282 + if (creation.getShouldCreatePayPrice()) {
292 - if (creation.getShouldCreatePayPrice()) { 283 + orderDb.setPayPrice(creation.getPayPrice());
293 - orderDb.setPayPrice(creation.getPayPrice()); 284 + }
294 - } 285 + if (creation.getShouldCreatePayTime()) {
295 - if (creation.getShouldCreatePayTime()) { 286 + orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime())
296 - orderDb.setPayTime(Instant.ofEpochMilli(creation.getPayTime()) 287 + .atZone(ZoneId.systemDefault())
297 - .atZone(ZoneId.systemDefault()) 288 + .toLocalDateTime());
298 - .toLocalDateTime()); 289 + }
299 - } 290 + if (creation.getShouldCreateOnlinePay()) {
300 - if (creation.getShouldCreateOnlinePay()) { 291 + orderDb.setOnlinePay(creation.getOnlinePayValue());
301 - orderDb.setOnlinePay(creation.getOnlinePay()); 292 + }
302 - } 293 + if (creation.getShouldCreatePayStatus()) {
303 - if (creation.getShouldCreatePayStatus()) { 294 + orderDb.setPayStatus(creation.getPayStatusValue());
304 - orderDb.setPayStatus(creation.getPayStatusValue()); 295 + }
305 - } 296 + if (creation.getShouldCreateTransactionId()) {
306 - if (creation.getShouldCreateTransactionId()) { 297 + orderDb.setTransactionId(creation.getTransactionId());
307 - orderDb.setTransactionId(creation.getTransactionId()); 298 + }
308 - } 299 + if (creation.getShouldCreateErrorMsg()) {
309 - if (creation.getShouldCreateErrorMsg()) { 300 + orderDb.setErrorMsg(creation.getErrorMsg());
310 - orderDb.setErrorMsg(creation.getErrorMsg()); 301 + }
311 - } 302 + if (creation.getShouldCreateAddress()) {
312 - if (creation.getShouldCreateAddress()) { 303 + orderDb.setAddress(creation.getAddress());
313 - orderDb.setAddress(creation.getAddress()); 304 + }
314 - } 305 + if (creation.getShouldCreateRoomNo()) {
315 - if (creation.getShouldCreateRoomNo()) { 306 + orderDb.setRoomNo(creation.getRoomNo());
316 - orderDb.setRoomNo(creation.getRoomNo()); 307 + }
317 - } 308 + if (creation.getShouldCreateTableCode()) {
318 - if (creation.getShouldCreateTableCode()) { 309 + orderDb.setTableCode(creation.getTableCode());
319 - orderDb.setTableCode(creation.getTableCode()); 310 + }
320 - } 311 + if (creation.getShouldCreatePickupCode()) {
321 - if (creation.getShouldCreatePickupCode()) { 312 + orderDb.setPickupCode(creation.getPickupCode());
322 - orderDb.setPickupCode(creation.getPickupCode()); 313 + }
323 - } 314 + if (creation.getShouldCreateOrderType()) {
324 - if (creation.getShouldCreateOrderType()) { 315 + orderDb.setOrderType(creation.getOrderTypeValue());
325 - orderDb.setOrderType(creation.getOrderTypeValue()); 316 + }
326 - } 317 + if (creation.getShouldCreateRemark()) {
327 - if (creation.getShouldCreateRemark()) { 318 + orderDb.setRemark(creation.getRemark());
328 - orderDb.setRemark(creation.getRemark()); 319 + }
329 - } 320 + if (creation.getShouldCreateCustomerNoticeJson()) {
330 - if (creation.getShouldCreateCustomerNoticeJson()) { 321 + JsonNode notice = objectMapper.valueToTree(CustomerNoticeDto.builder()
331 - JsonNode notice = objectMapper.valueToTree(CustomerNoticeDto.builder() 322 + .avoids(creation.getCustomerNoticeJson().getAvoidsList())
332 - .avoids(creation.getCustomerNoticeJson().getAvoidsList()) 323 + .doctors(creation.getCustomerNoticeJson().getDoctorsList())
333 - .doctors(creation.getCustomerNoticeJson().getDoctorsList()) 324 + .build());
334 - .build()); 325 + orderDb.setCustomerNoticeJson(notice);
335 - orderDb.setCustomerNoticeJson(notice); 326 + }
336 - } 327 + LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime())
337 - LocalDateTime mealTime = Instant.ofEpochMilli(creation.getMealTime()) 328 + .atZone(ZoneId.systemDefault())
338 - .atZone(ZoneId.systemDefault()) 329 + .toLocalDateTime();
339 - .toLocalDateTime(); 330 + orderDb.setMealTime(mealTime);
340 - orderDb.setMealTime(mealTime); 331 + orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
341 - orderDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy()); 332 + orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
342 - orderDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue()); 333 + orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
343 - orderDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy()); 334 + orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
344 - orderDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue()); 335 + orderDb.setCloseTimeType(creation.getCloseTimeTypeValue());
345 - orderDb.setCloseTimeType(creation.getCloseTimeTypeValue()); 336 + orderDb.setIsRead(creation.getIsRead());
346 - orderDb.setIsRead(creation.getIsRead()); 337 + orderDb.setIsDeleted(false);
347 - orderDb.setIsDeleted(false); 338 + orderDb.setIsConfirm(false);
348 - orderDb.setIsConfirm(false); 339 + orderDb.setIsAllocation(false);
349 - orderDb.setIsAllocation(false); 340 + boolean res = this.save(orderDb);
350 - boolean res = this.save(orderDb); 341 + if (!res) {
351 - if (!res) { 342 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL);
352 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_GEN_FAIL); 343 + }
353 - } 344 + resOrders.add(orderDb);
354 - resOrders.add(orderDb);
355 345
356 - if (creation.getShouldCreateOrderDetails()) { 346 + if (creation.getShouldCreateOrderDetails()) {
357 - var detailList = creation.getOrderDetailsList().stream() 347 + var detailList = creation.getOrderDetailsList().stream()
358 - .map(detailCreation -> { 348 + .map(detailCreation -> {
359 - OrderDetailDb orderDetailDb = new OrderDetailDb(); 349 + OrderDetailDb orderDetailDb = new OrderDetailDb();
360 - orderDetailDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue()); 350 + orderDetailDb.setCreationSource(batchCreateOrdersRequest.getCreationSourceValue());
361 - orderDetailDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy()); 351 + orderDetailDb.setCreatedBy(batchCreateOrdersRequest.getCreatedBy());
362 - orderDetailDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue()); 352 + orderDetailDb.setUpdateSource(batchCreateOrdersRequest.getCreationSourceValue());
363 - orderDetailDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy()); 353 + orderDetailDb.setUpdatedBy(batchCreateOrdersRequest.getCreatedBy());
364 - orderDetailDb.setOrderId(orderDb.getId()); 354 + orderDetailDb.setOrderId(orderDb.getId());
365 - orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId()); 355 + orderDetailDb.setMenuDetailId(detailCreation.getMenuDetailId());
366 - orderDetailDb.setCount(detailCreation.getCount()); 356 + orderDetailDb.setCount(detailCreation.getCount());
367 - orderDetailDb.setMealId(detailCreation.getMealId()); 357 + orderDetailDb.setMealId(detailCreation.getMealId());
368 - orderDetailDb.setCategoryId(detailCreation.getCategoryId()); 358 + orderDetailDb.setCategoryId(detailCreation.getCategoryId());
369 - orderDetailDb.setSkuId(detailCreation.getSkuId()); 359 + orderDetailDb.setSkuId(detailCreation.getSkuId());
370 - orderDetailDb.setIsDeleted(false); 360 + orderDetailDb.setIsDeleted(false);
371 - if (detailCreation.getShouldCreateShowName()) { 361 + if (detailCreation.getShouldCreateShowName()) {
372 - orderDetailDb.setShowName(detailCreation.getShowName()); 362 + orderDetailDb.setShowName(detailCreation.getShowName());
373 - } 363 + }
374 - if (detailCreation.getShouldCreatePrice()) { 364 + if (detailCreation.getShouldCreatePrice()) {
375 - orderDetailDb.setPrice(detailCreation.getPrice()); 365 + orderDetailDb.setPrice(detailCreation.getPrice());
376 - } 366 + }
377 - if (detailCreation.getShouldCreateAdjustSkuRemark()) { 367 + if (detailCreation.getShouldCreateAdjustSkuRemark()) {
378 - orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark()); 368 + orderDetailDb.setAdjustSkuRemark(detailCreation.getAdjustSkuRemark());
379 - } 369 + }
380 - orderDetailDb.setServeStatus(ServeStatusEnum.SERVE_NOT_START_VALUE); 370 + orderDetailDb.setServeStatus(ServeStatusEnum.SERVE_NOT_START_VALUE);
381 - if (detailCreation.getShouldCreateMealDetailJson()) { 371 + if (detailCreation.getShouldCreateMealDetailJson()) {
382 - orderDetailDb.setMealDetailJson(objectMapper.valueToTree(MealDetailJson.builder() 372 + orderDetailDb.setMealDetailJson(objectMapper.valueToTree(MealDetailJson.builder()
383 - .allergies(detailCreation.getMealDetailJson().getAllergiesList()) 373 + .allergies(detailCreation.getMealDetailJson().getAllergiesList())
384 - .avoids(detailCreation.getMealDetailJson().getAvoidsList()) 374 + .avoids(detailCreation.getMealDetailJson().getAvoidsList())
385 - .basicMaterials(detailCreation.getMealDetailJson().getBasicMaterials()) 375 + .basicMaterials(detailCreation.getMealDetailJson().getBasicMaterials())
386 - .carbohydrate(detailCreation.getMealDetailJson().getCarbohydrate()) 376 + .carbohydrate(detailCreation.getMealDetailJson().getCarbohydrate())
387 - .dockers(detailCreation.getMealDetailJson().getDockersList()) 377 + .dockers(detailCreation.getMealDetailJson().getDockersList())
388 - .efficacies(detailCreation.getMealDetailJson().getEfficaciesList()) 378 + .efficacies(detailCreation.getMealDetailJson().getEfficaciesList())
389 - .energy(detailCreation.getMealDetailJson().getEnergy()) 379 + .energy(detailCreation.getMealDetailJson().getEnergy())
390 - .fat(detailCreation.getMealDetailJson().getFat()) 380 + .fat(detailCreation.getMealDetailJson().getFat())
391 - .protein(detailCreation.getMealDetailJson().getProtein()) 381 + .protein(detailCreation.getMealDetailJson().getProtein())
392 - .skus(detailCreation.getMealDetailJson().getSkusList()) 382 + .skus(detailCreation.getMealDetailJson().getSkusList())
393 - .tastes(detailCreation.getMealDetailJson().getTastesList()) 383 + .tastes(detailCreation.getMealDetailJson().getTastesList())
394 - .build())); 384 + .build()));
395 - } 385 + }
396 - return orderDetailDb; 386 + return orderDetailDb;
397 - }) 387 + })
398 - .collect(Collectors.toList()); 388 + .collect(Collectors.toList());
399 - List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class) 389 + List<OrderDetailDb> resOrderDetails = SpringUtil.getBean(OrderDetailDbServiceImpl.class)
400 - .saveBatch(detailList) ? detailList : Collections.emptyList(); 390 + .saveBatch(detailList) ? detailList : Collections.emptyList();
401 391
402 - if (resOrderDetails.size() != creation.getOrderDetailsCount()) { 392 + if (resOrderDetails.size() != creation.getOrderDetailsCount()) {
403 - throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL); 393 + throw ServiceExceptionUtil.exception(ErrorCodeConstants.ORDER_DETAIL_GEN_FAIL);
394 + }
395 + }
404 } 396 }
405 - } 397 + return resOrders;
406 } 398 }
407 - return resOrders;
408 - }
409 399
410 - @Override 400 + @Override
411 - public List<OrderDb> getOrdersByCustomerId(Integer customerId) { 401 + public List<OrderDb> getOrdersByCustomerId(Integer customerId) {
412 - QueryWrapper<OrderDb> wrapper = new QueryWrapper<>(); 402 + QueryWrapper<OrderDb> wrapper = new QueryWrapper<>();
413 - wrapper.eq("customerId", customerId) 403 + wrapper.eq("customerId", customerId)
414 - .orderByDesc("createdAt"); 404 + .orderByDesc("createdAt");
415 - final var res = orderDbMapper.selectList(wrapper); 405 + final var res = orderDbMapper.selectList(wrapper);
416 - return res; 406 + return res;
417 - } 407 + }
418 408
419 - @Override 409 + @Override
420 - public Boolean updateOrderDb(UpdateClientCustomerOrderRpcRequest updateOrderRequest) { 410 + public Boolean updateOrderDb(UpdateClientCustomerOrderRpcRequest updateOrderRequest) {
421 - var orderDb = new OrderDb(); 411 + var orderDb = new OrderDb();
422 - orderDb.setId(updateOrderRequest.getModification().getId()); 412 + orderDb.setId(updateOrderRequest.getModification().getId());
423 - orderDb.setEnterpriseId(updateOrderRequest.getEnterpriseId()); 413 + orderDb.setEnterpriseId(updateOrderRequest.getEnterpriseId());
424 - orderDb.setUpdatedBy(updateOrderRequest.getUpdatedBy()); 414 + orderDb.setUpdatedBy(updateOrderRequest.getUpdatedBy());
425 - orderDb.setUpdateSource(updateOrderRequest.getUpdateSourceValue()); 415 + orderDb.setUpdateSource(updateOrderRequest.getUpdateSourceValue());
426 416
427 - if (updateOrderRequest.getModification().getShouldUpdateOrderCode()) { 417 + if (updateOrderRequest.getModification().getShouldUpdateOrderCode()) {
428 - orderDb.setOrderCode(updateOrderRequest.getModification().getOrderCode()); 418 + orderDb.setOrderCode(updateOrderRequest.getModification().getOrderCode());
429 - } 419 + }
430 - if (updateOrderRequest.getModification().getShouldUpdateClientId()) { 420 + if (updateOrderRequest.getModification().getShouldUpdateClientId()) {
431 - orderDb.setClientId(updateOrderRequest.getModification().getClientId()); 421 + orderDb.setClientId(updateOrderRequest.getModification().getClientId());
432 - } 422 + }
433 - if (updateOrderRequest.getModification().getShouldUpdateStallId()) { 423 + if (updateOrderRequest.getModification().getShouldUpdateStallId()) {
434 - orderDb.setStallId(updateOrderRequest.getModification().getStallId()); 424 + orderDb.setStallId(updateOrderRequest.getModification().getStallId());
435 - } 425 + }
436 - if (updateOrderRequest.getModification().getShouldUpdateCustomerId()) { 426 + if (updateOrderRequest.getModification().getShouldUpdateCustomerId()) {
437 - orderDb.setCustomerId(updateOrderRequest.getModification().getCustomerId()); 427 + orderDb.setCustomerId(updateOrderRequest.getModification().getCustomerId());
438 - } 428 + }
439 - if (updateOrderRequest.getModification().getShouldUpdateOpenId()) { 429 + if (updateOrderRequest.getModification().getShouldUpdateOpenId()) {
440 - orderDb.setOpenId(updateOrderRequest.getModification().getOpenId()); 430 + orderDb.setOpenId(updateOrderRequest.getModification().getOpenId());
441 - } 431 + }
442 - if (updateOrderRequest.getModification().getShouldUpdateStatus()) { 432 + if (updateOrderRequest.getModification().getShouldUpdateStatus()) {
443 - orderDb.setStatus(updateOrderRequest.getModification().getStatusValue()); // 假设OrderStatusEnum有getValue方法获取对应整数值 433 + orderDb.setStatus(updateOrderRequest.getModification().getStatusValue()); // 假设OrderStatusEnum有getValue方法获取对应整数值
444 - } 434 + }
445 - if (updateOrderRequest.getModification().getShouldUpdateMenuId()) { 435 + if (updateOrderRequest.getModification().getShouldUpdateMenuId()) {
446 - orderDb.setMenuId(updateOrderRequest.getModification().getMenuId()); 436 + orderDb.setMenuId(updateOrderRequest.getModification().getMenuId());
447 - } 437 + }
448 - if (updateOrderRequest.getModification().getShouldUpdateCloseTimeType()) { 438 + if (updateOrderRequest.getModification().getShouldUpdateCloseTimeType()) {
449 - orderDb.setCloseTimeType(updateOrderRequest.getModification().getCloseTimeTypeValue()); // 假设CloseTimeType有getValue方法获取对应整数值 439 + orderDb.setCloseTimeType(updateOrderRequest.getModification().getCloseTimeTypeValue()); // 假设CloseTimeType有getValue方法获取对应整数值
450 - } 440 + }
451 - if (updateOrderRequest.getModification().getShouldUpdateTotalNum()) { 441 + if (updateOrderRequest.getModification().getShouldUpdateTotalNum()) {
452 - orderDb.setTotalNum(updateOrderRequest.getModification().getTotalNum()); 442 + orderDb.setTotalNum(updateOrderRequest.getModification().getTotalNum());
453 - } 443 + }
454 - if (updateOrderRequest.getModification().getShouldUpdatePayPrice()) { 444 + if (updateOrderRequest.getModification().getShouldUpdatePayPrice()) {
455 - orderDb.setPayPrice(updateOrderRequest.getModification().getPayPrice()); 445 + orderDb.setPayPrice(updateOrderRequest.getModification().getPayPrice());
456 - } 446 + }
457 - if (updateOrderRequest.getModification(). 447 + if (updateOrderRequest.getModification().getShouldUpdateOnlinePay()) {
458 - getShouldUpdateOnlinePay()) { 448 + orderDb.setOnlinePay(updateOrderRequest.getModification().getOnlinePayValue());
459 - orderDb.setOnlinePay(updateOrderRequest.getModification().getOnlinePay()); 449 + }
460 - } 450 + if (updateOrderRequest.getModification().getShouldUpdatePayTime()) {
461 - if (updateOrderRequest.getModification().getShouldUpdatePayTime()) { 451 + orderDb.setPayTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getPayTime())
462 - orderDb.setPayTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getPayTime()) 452 + .atZone(ZoneId.systemDefault())
463 - .atZone(ZoneId.systemDefault()) 453 + .toLocalDateTime());
464 - .toLocalDateTime()); 454 + }
465 - } 455 + if (updateOrderRequest.getModification().getShouldUpdatePayStatus()) {
466 - if (updateOrderRequest.getModification().getShouldUpdatePayStatus()) { 456 + orderDb.setPayStatus(updateOrderRequest.getModification().getPayStatusValue()); // 假设PayStatusEnum有getValue方法获取对应整数值
467 - orderDb.setPayStatus(updateOrderRequest.getModification().getPayStatusValue()); // 假设PayStatusEnum有getValue方法获取对应整数值 457 + }
468 - } 458 + if (updateOrderRequest.getModification().getShouldUpdateErrorMsg()) {
469 - if (updateOrderRequest.getModification().getShouldUpdateErrorMsg()) { 459 + orderDb.setErrorMsg(updateOrderRequest.getModification().getErrorMsg());
470 - orderDb.setErrorMsg(updateOrderRequest.getModification().getErrorMsg()); 460 + }
471 - } 461 + if (updateOrderRequest.getModification().getShouldUpdateTransactionId()) {
472 - if (updateOrderRequest.getModification().getShouldUpdateTransactionId()) { 462 + orderDb.setTransactionId(updateOrderRequest.getModification().getTransactionId());
473 - orderDb.setTransactionId(updateOrderRequest.getModification().getTransactionId()); 463 + }
474 - } 464 + if (updateOrderRequest.getModification().getShouldUpdateMealTime()) {
475 - if (updateOrderRequest.getModification().getShouldUpdateMealTime()) { 465 + orderDb.setMealTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getMealTime())
476 - orderDb.setMealTime(Instant.ofEpochMilli(updateOrderRequest.getModification().getMealTime()) 466 + .atZone(ZoneId.systemDefault())
477 - .atZone(ZoneId.systemDefault()) 467 + .toLocalDateTime());
478 - .toLocalDateTime()); 468 + }
479 - } 469 + if (updateOrderRequest.getModification().getShouldUpdateAddress()) {
480 - if (updateOrderRequest.getModification().getShouldUpdateAddress()) { 470 + orderDb.setAddress(updateOrderRequest.getModification().getAddress());
481 - orderDb.setAddress(updateOrderRequest.getModification().getAddress()); 471 + }
482 - } 472 + if (updateOrderRequest.getModification().getShouldUpdateRoomNo()) {
483 - if (updateOrderRequest.getModification().getShouldUpdateRoomNo()) { 473 + orderDb.setRoomNo(updateOrderRequest.getModification().
484 - orderDb.setRoomNo(updateOrderRequest.getModification(). 474 + getRoomNo());
485 - getRoomNo()); 475 + }
486 - } 476 + if (updateOrderRequest.getModification().getShouldUpdateTableCode()) {
487 - if (updateOrderRequest.getModification().getShouldUpdateTableCode()) { 477 + orderDb.setTableCode(updateOrderRequest.getModification().getTableCode());
488 - orderDb.setTableCode(updateOrderRequest.getModification().getTableCode()); 478 + }
489 - } 479 + if (updateOrderRequest.getModification().getShouldUpdatePickupCode()) {
490 - if (updateOrderRequest.getModification().getShouldUpdatePickupCode()) { 480 + orderDb.setPickupCode(updateOrderRequest.getModification().getPickupCode());
491 - orderDb.setPickupCode(updateOrderRequest.getModification().getPickupCode()); 481 + }
492 - } 482 + if (updateOrderRequest.getModification().getShouldUpdateOrderType()) {
493 - if (updateOrderRequest.getModification().getShouldUpdateOrderType()) { 483 + orderDb.setOrderType(updateOrderRequest.getModification().getOrderTypeValue());
494 - orderDb.setOrderType(updateOrderRequest.getModification().getOrderTypeValue()); 484 + }
495 - } 485 + if (updateOrderRequest.getModification().getShouldUpdateRemark()) {
496 - if (updateOrderRequest.getModification().getShouldUpdateRemark()) { 486 + orderDb.setRemark(updateOrderRequest.getModification().getRemark());
497 - orderDb.setRemark(updateOrderRequest.getModification().getRemark()); 487 + }
498 - } 488 + ObjectMapper objectMapper = new ObjectMapper();
499 - ObjectMapper objectMapper = new ObjectMapper(); 489 + if (updateOrderRequest.getModification().getShouldUpdateCustomerNoticeJson()) {
500 - if (updateOrderRequest.getModification().getShouldUpdateCustomerNoticeJson()) { 490 + orderDb.setCustomerNoticeJson(objectMapper.valueToTree(CustomerNoticeDto.builder()
501 - orderDb.setCustomerNoticeJson(objectMapper.valueToTree(CustomerNoticeDto.builder() 491 + .avoids(updateOrderRequest.getModification().getCustomerNoticeJson().getAvoidsList())
502 - .avoids(updateOrderRequest.getModification().getCustomerNoticeJson().getAvoidsList()) 492 + .doctors(updateOrderRequest.getModification().getCustomerNoticeJson().getDoctorsList())
503 - .doctors(updateOrderRequest.getModification().getCustomerNoticeJson().getDoctorsList()) 493 + .build()));
504 - .build())); 494 + }
505 - } 495 + if (updateOrderRequest.getModification().getShouldUpdateIsRead()) {
506 - if (updateOrderRequest.getModification().getShouldUpdateIsRead()) { 496 + orderDb.setIsRead(updateOrderRequest.getModification().getIsRead());
507 - orderDb.setIsRead(updateOrderRequest.getModification().getIsRead()); 497 + }
508 - } 498 + if (updateOrderRequest.getModification().getShouldUpdateOpenId()) {
509 - if (updateOrderRequest.getModification().getShouldUpdateOpenId()) { 499 + orderDb.setIsConfirm(updateOrderRequest.getModification().getIsConfirm());
510 - orderDb.setIsConfirm(updateOrderRequest.getModification().getIsConfirm()); 500 + }
511 - } 501 + if (updateOrderRequest.getModification().getShouldUpdateIsAllocation()) {
512 - if (updateOrderRequest.getModification().getShouldUpdateIsAllocation()) { 502 + orderDb.setIsAllocation(updateOrderRequest.getModification().getIsAllocation());
513 - orderDb.setIsAllocation(updateOrderRequest.getModification().getIsAllocation()); 503 + }
504 + return orderDbMapper.updateById(orderDb) > 0;
514 } 505 }
515 - return orderDbMapper.updateById(orderDb) > 0;
516 - }
517 506
518 - @Override 507 + @Override
519 - public Boolean batchUpdateOrderDbs( 508 + public Boolean batchUpdateOrderDbs(
520 - BatchUpdateClientCustomerOrdersRpcRequest batchUpdateOrdersRequest) { 509 + BatchUpdateClientCustomerOrdersRpcRequest batchUpdateOrdersRequest) {
521 - final var list = batchUpdateOrdersRequest.getModificationsList().stream().map(modification -> { 510 + final var list = batchUpdateOrdersRequest.getModificationsList().stream().map(modification -> {
522 - var orderDb = new OrderDb(); 511 + var orderDb = new OrderDb();
523 - orderDb.setId(modification.getId()); 512 + orderDb.setId(modification.getId());
524 - orderDb.setEnterpriseId(batchUpdateOrdersRequest.getEnterpriseId()); 513 + orderDb.setEnterpriseId(batchUpdateOrdersRequest.getEnterpriseId());
525 - orderDb.setUpdatedBy(batchUpdateOrdersRequest.getUpdatedBy()); 514 + orderDb.setUpdatedBy(batchUpdateOrdersRequest.getUpdatedBy());
526 - orderDb.setUpdateSource(batchUpdateOrdersRequest.getUpdateSourceValue()); 515 + orderDb.setUpdateSource(batchUpdateOrdersRequest.getUpdateSourceValue());
527 - if (modification.getShouldUpdateOrderCode()) { 516 + if (modification.getShouldUpdateOrderCode()) {
528 - orderDb.setOrderCode(modification.getOrderCode()); 517 + orderDb.setOrderCode(modification.getOrderCode());
529 - } 518 + }
530 - if (modification.getShouldUpdateClientId()) { 519 + if (modification.getShouldUpdateClientId()) {
531 - orderDb.setClientId(modification.getClientId()); 520 + orderDb.setClientId(modification.getClientId());
532 - } 521 + }
533 - if (modification.getShouldUpdateStallId()) { 522 + if (modification.getShouldUpdateStallId()) {
534 - orderDb.setStallId(modification.getStallId()); 523 + orderDb.setStallId(modification.getStallId());
535 - } 524 + }
536 - if (modification.getShouldUpdateCustomerId()) { 525 + if (modification.getShouldUpdateCustomerId()) {
537 - orderDb.setCustomerId(modification.getCustomerId()); 526 + orderDb.setCustomerId(modification.getCustomerId());
538 - } 527 + }
539 - if (modification.getShouldUpdateOpenId()) { 528 + if (modification.getShouldUpdateOpenId()) {
540 - orderDb.setOpenId(modification.getOpenId()); 529 + orderDb.setOpenId(modification.getOpenId());
541 - } 530 + }
542 - if (modification.getShouldUpdateStatus()) { 531 + if (modification.getShouldUpdateStatus()) {
543 - orderDb.setStatus(modification.getStatusValue()); 532 + orderDb.setStatus(modification.getStatusValue());
544 - } 533 + }
545 - if (modification.getShouldUpdateMenuId()) { 534 + if (modification.getShouldUpdateMenuId()) {
546 - orderDb.setMenuId(modification.getMenuId()); 535 + orderDb.setMenuId(modification.getMenuId());
547 - } 536 + }
548 - if (modification.getShouldUpdateCloseTimeType()) { 537 + if (modification.getShouldUpdateCloseTimeType()) {
549 - orderDb.setCloseTimeType(modification.getCloseTimeTypeValue()); 538 + orderDb.setCloseTimeType(modification.getCloseTimeTypeValue());
550 - } 539 + }
551 - if (modification.getShouldUpdateTotalNum()) { 540 + if (modification.getShouldUpdateTotalNum()) {
552 - orderDb.setTotalNum(modification.getTotalNum()); 541 + orderDb.setTotalNum(modification.getTotalNum());
553 - } 542 + }
554 - if (modification.getShouldUpdatePayPrice()) { 543 + if (modification.getShouldUpdatePayPrice()) {
555 - orderDb.setPayPrice(modification.getPayPrice()); 544 + orderDb.setPayPrice(modification.getPayPrice());
556 - } 545 + }
557 - if (modification.getShouldUpdateOnlinePay()) { 546 + if (modification.getShouldUpdateOnlinePay()) {
558 - orderDb.setOnlinePay(modification.getOnlinePay()); 547 + orderDb.setOnlinePay(modification.getOnlinePayValue());
559 - } 548 + }
560 - if (modification.getShouldUpdatePayTime()) { 549 + if (modification.getShouldUpdatePayTime()) {
561 - orderDb.setPayTime(Instant.ofEpochMilli(modification.getPayTime()) 550 + orderDb.setPayTime(Instant.ofEpochMilli(modification.getPayTime())
562 - .atZone(ZoneId.systemDefault()) 551 + .atZone(ZoneId.systemDefault())
563 - .toLocalDateTime()); 552 + .toLocalDateTime());
564 - } 553 + }
565 - if (modification.getShouldUpdatePayStatus()) { 554 + if (modification.getShouldUpdatePayStatus()) {
566 - orderDb.setPayStatus(modification.getPayStatusValue()); 555 + orderDb.setPayStatus(modification.getPayStatusValue());
567 - } 556 + }
568 - if (modification.getShouldUpdateErrorMsg()) { 557 + if (modification.getShouldUpdateErrorMsg()) {
569 - orderDb.setErrorMsg(modification.getErrorMsg()); 558 + orderDb.setErrorMsg(modification.getErrorMsg());
570 - } 559 + }
571 - if (modification.getShouldUpdateTransactionId()) { 560 + if (modification.getShouldUpdateTransactionId()) {
572 - orderDb.setTransactionId(modification.getTransactionId()); 561 + orderDb.setTransactionId(modification.getTransactionId());
573 - } 562 + }
574 - if (modification.getShouldUpdateMealTime()) { 563 + if (modification.getShouldUpdateMealTime()) {
575 - orderDb.setMealTime(Instant.ofEpochMilli(modification.getMealTime()) 564 + orderDb.setMealTime(Instant.ofEpochMilli(modification.getMealTime())
576 - .atZone(ZoneId.systemDefault()) 565 + .atZone(ZoneId.systemDefault())
577 - .toLocalDateTime()); 566 + .toLocalDateTime());
578 - } 567 + }
579 - if (modification.getShouldUpdateAddress()) { 568 + if (modification.getShouldUpdateAddress()) {
580 - orderDb.setAddress(modification.getAddress()); 569 + orderDb.setAddress(modification.getAddress());
581 - } 570 + }
582 - if (modification.getShouldUpdateRoomNo()) { 571 + if (modification.getShouldUpdateRoomNo()) {
583 - orderDb.setRoomNo(modification.getRoomNo()); 572 + orderDb.setRoomNo(modification.getRoomNo());
584 - } 573 + }
585 - if (modification.getShouldUpdateTableCode()) { 574 + if (modification.getShouldUpdateTableCode()) {
586 - orderDb.setTableCode(modification.getTableCode()); 575 + orderDb.setTableCode(modification.getTableCode());
587 - } 576 + }
588 - if (modification.getShouldUpdatePickupCode()) { 577 + if (modification.getShouldUpdatePickupCode()) {
589 - orderDb.setPickupCode(modification.getPickupCode()); 578 + orderDb.setPickupCode(modification.getPickupCode());
590 - } 579 + }
591 - if (modification.getShouldUpdateOrderType()) { 580 + if (modification.getShouldUpdateOrderType()) {
592 - orderDb.setOrderType(modification.getOrderTypeValue()); 581 + orderDb.setOrderType(modification.getOrderTypeValue());
593 - } 582 + }
594 - if (modification.getShouldUpdateRemark()) { 583 + if (modification.getShouldUpdateRemark()) {
595 - orderDb.setRemark(modification.getRemark()); 584 + orderDb.setRemark(modification.getRemark());
596 - } 585 + }
597 - ObjectMapper objectMapper = new ObjectMapper(); 586 + ObjectMapper objectMapper = new ObjectMapper();
598 - if (modification.getShouldUpdateCustomerNoticeJson()) { 587 + if (modification.getShouldUpdateCustomerNoticeJson()) {
599 - orderDb.setCustomerNoticeJson(objectMapper.valueToTree(CustomerNoticeDto.builder() 588 + orderDb.setCustomerNoticeJson(objectMapper.valueToTree(CustomerNoticeDto.builder()
600 - .avoids(modification.getCustomerNoticeJson().getAvoidsList()) 589 + .avoids(modification.getCustomerNoticeJson().getAvoidsList())
601 - .doctors(modification.getCustomerNoticeJson().getDoctorsList()) 590 + .doctors(modification.getCustomerNoticeJson().getDoctorsList())
602 - .build())); 591 + .build()));
603 - } 592 + }
604 - if (modification.getShouldUpdateIsRead()) { 593 + if (modification.getShouldUpdateIsRead()) {
605 - orderDb.setIsRead(modification.getIsRead()); 594 + orderDb.setIsRead(modification.getIsRead());
606 - } 595 + }
607 - if (modification.getShouldUpdateIsConfirm()) { 596 + if (modification.getShouldUpdateIsConfirm()) {
608 - orderDb.setIsConfirm(modification.getIsConfirm()); 597 + orderDb.setIsConfirm(modification.getIsConfirm());
609 - } 598 + }
610 - if (modification.getShouldUpdateIsAllocation()) { 599 + if (modification.getShouldUpdateIsAllocation()) {
611 - orderDb.setIsAllocation(modification.getIsAllocation()); 600 + orderDb.setIsAllocation(modification.getIsAllocation());
612 - } 601 + }
613 - return orderDb; 602 + return orderDb;
614 - }).collect(Collectors.toList()); 603 + }).collect(Collectors.toList());
615 - return SpringUtil.getBean(OrderDbServiceImpl.class).updateBatchById(list); 604 + return SpringUtil.getBean(OrderDbServiceImpl.class).updateBatchById(list);
616 - } 605 + }
617 606
618 - @Override 607 + @Override
619 - public List<OrderDb> getOrdersByOpenId(Integer openId) { 608 + public List<OrderDb> getOrdersByOpenId(Integer openId) {
620 - QueryWrapper<OrderDb> wrapper = new QueryWrapper<>(); 609 + QueryWrapper<OrderDb> wrapper = new QueryWrapper<>();
621 - wrapper.eq("openId", openId) 610 + wrapper.eq("openId", openId)
622 - .orderByDesc("createdAt"); 611 + .orderByDesc("createdAt");
623 - return orderDbMapper.selectList(wrapper); 612 + return orderDbMapper.selectList(wrapper);
624 - } 613 + }
625 614
626 // @Override 615 // @Override
627 // public List<OrderDb> batchCreateOrdersAndDetails( 616 // public List<OrderDb> batchCreateOrdersAndDetails(
......
...@@ -2,10 +2,10 @@ package com.tianting.infoloop.utils; ...@@ -2,10 +2,10 @@ package com.tianting.infoloop.utils;
2 2
3 import com.fasterxml.jackson.databind.JsonNode; 3 import com.fasterxml.jackson.databind.JsonNode;
4 import com.fasterxml.jackson.databind.ObjectMapper; 4 import com.fasterxml.jackson.databind.ObjectMapper;
5 -import com.google.protobuf.GeneratedMessageV3;
6 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType; 5 import com.infoloop.tianting.clientcustomerorderservice.CloseTimeType;
7 import com.infoloop.tianting.clientcustomerorderservice.CustomerNotice; 6 import com.infoloop.tianting.clientcustomerorderservice.CustomerNotice;
8 import com.infoloop.tianting.clientcustomerorderservice.MealDetail; 7 import com.infoloop.tianting.clientcustomerorderservice.MealDetail;
8 +import com.infoloop.tianting.clientcustomerorderservice.OnlinePayEnum;
9 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum; 9 import com.infoloop.tianting.clientcustomerorderservice.OrderSourceEnum;
10 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum; 10 import com.infoloop.tianting.clientcustomerorderservice.OrderStatusEnum;
11 import com.infoloop.tianting.clientcustomerorderservice.OrderTypeEnum; 11 import com.infoloop.tianting.clientcustomerorderservice.OrderTypeEnum;
...@@ -15,7 +15,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde ...@@ -15,7 +15,7 @@ import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrde
15 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse; 15 import com.infoloop.tianting.clientcustomerorderservice.SingleClientCustomerOrderRpcResponse;
16 import com.tianting.infoloop.model.db.OrderDb; 16 import com.tianting.infoloop.model.db.OrderDb;
17 import com.tianting.infoloop.model.db.OrderDetailDb; 17 import com.tianting.infoloop.model.db.OrderDetailDb;
18 -import java.lang.reflect.Constructor; 18 +
19 import java.time.ZoneOffset; 19 import java.time.ZoneOffset;
20 import java.util.ArrayList; 20 import java.util.ArrayList;
21 import java.util.List; 21 import java.util.List;
...@@ -56,7 +56,7 @@ public class DbToProtoUtil { ...@@ -56,7 +56,7 @@ public class DbToProtoUtil {
56 } 56 }
57 57
58 if (orderDb.getOnlinePay()!= null) { 58 if (orderDb.getOnlinePay()!= null) {
59 - protoBuilder.setOnlinePay(orderDb.getOnlinePay()); 59 + protoBuilder.setOnlinePay(OnlinePayEnum.forNumber(orderDb.getOnlinePay()));
60 } 60 }
61 61
62 if (orderDb.getPayStatus()!= null) { 62 if (orderDb.getPayStatus()!= null) {
......
...@@ -81,6 +81,15 @@ enum CloseTimeType { ...@@ -81,6 +81,15 @@ enum CloseTimeType {
81 RESERVATION = 1; 81 RESERVATION = 1;
82 } 82 }
83 83
84 +enum OnlinePayEnum {
85 + UNKNOWN = 0;
86 + ONLINE = 1; //在线
87 + OFFLINE = 2; //线下
88 + LEAVE_HOSPITAL = 3;//出院
89 + EMPLOYEE_CARD = 4; //员工卡
90 + PAPER_VERIFICATION = 5; //纸质核销
91 +}
92 +
84 enum ServeStatusEnum { 93 enum ServeStatusEnum {
85 UNKNOWN_SERVE_STATUS = 0; 94 UNKNOWN_SERVE_STATUS = 0;
86 SERVE_NOT_START = 1; 95 SERVE_NOT_START = 1;
...@@ -106,7 +115,7 @@ message SingleClientCustomerOrderRpcResponse { ...@@ -106,7 +115,7 @@ message SingleClientCustomerOrderRpcResponse {
106 CloseTimeType closeTimeType = 10; 115 CloseTimeType closeTimeType = 10;
107 int32 totalNum = 11; 116 int32 totalNum = 11;
108 int32 payPrice = 12; 117 int32 payPrice = 12;
109 - bool onlinePay = 13; 118 + OnlinePayEnum onlinePay = 13;
110 int64 payTime = 14; 119 int64 payTime = 14;
111 PayStatusEnum payStatus = 15; 120 PayStatusEnum payStatus = 15;
112 string errorMsg = 16; 121 string errorMsg = 16;
...@@ -205,7 +214,7 @@ message QueryClientCustomerOrdersByConditionRpcRequest { ...@@ -205,7 +214,7 @@ message QueryClientCustomerOrdersByConditionRpcRequest {
205 bool shouldFilterCloseTimeType = 16; 214 bool shouldFilterCloseTimeType = 16;
206 CloseTimeType closeTimeType = 17; 215 CloseTimeType closeTimeType = 17;
207 bool shouldFilterOnlinePay = 18; 216 bool shouldFilterOnlinePay = 18;
208 - bool onlinePay = 19; 217 + OnlinePayEnum onlinePay = 19;
209 bool shouldFilterPayTimeStart = 20; 218 bool shouldFilterPayTimeStart = 20;
210 int64 payTimeStart = 21; 219 int64 payTimeStart = 21;
211 bool shouldFilterPayTimeEnd = 22; 220 bool shouldFilterPayTimeEnd = 22;
...@@ -254,7 +263,7 @@ message ClientCustomerOrderCreation{ ...@@ -254,7 +263,7 @@ message ClientCustomerOrderCreation{
254 bool shouldCreatePayPrice = 12; 263 bool shouldCreatePayPrice = 12;
255 int32 payPrice = 13; 264 int32 payPrice = 13;
256 bool shouldCreateOnlinePay = 14; 265 bool shouldCreateOnlinePay = 14;
257 - bool onlinePay = 15; 266 + OnlinePayEnum onlinePay = 15;
258 bool shouldCreatePayTime = 16; 267 bool shouldCreatePayTime = 16;
259 int64 payTime = 17; 268 int64 payTime = 17;
260 bool shouldCreatePayStatus = 18; 269 bool shouldCreatePayStatus = 18;
...@@ -330,7 +339,7 @@ message ClientCustomerOrderModification { ...@@ -330,7 +339,7 @@ message ClientCustomerOrderModification {
330 bool shouldUpdatePayPrice = 20; 339 bool shouldUpdatePayPrice = 20;
331 int32 payPrice = 21; 340 int32 payPrice = 21;
332 bool shouldUpdateOnlinePay = 22; 341 bool shouldUpdateOnlinePay = 22;
333 - bool onlinePay = 23; 342 + OnlinePayEnum onlinePay = 23;
334 bool shouldUpdatePayTime = 24; 343 bool shouldUpdatePayTime = 24;
335 int64 payTime = 25; 344 int64 payTime = 25;
336 bool shouldUpdatePayStatus = 26; 345 bool shouldUpdatePayStatus = 26;
......