zhuyifan

fix(order): 修正新建订单的支付状态

...@@ -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.OrderStatusEnum;
14 import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum; 13 import com.infoloop.tianting.clientcustomerorderservice.PayStatusEnum;
15 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum; 14 import com.infoloop.tianting.clientcustomerorderservice.ServeStatusEnum;
16 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest; 15 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcRequest;
...@@ -23,6 +22,11 @@ import com.tianting.infoloop.service.OrderDbService; ...@@ -23,6 +22,11 @@ import com.tianting.infoloop.service.OrderDbService;
23 import com.tianting.infoloop.service.OrderDetailDbService; 22 import com.tianting.infoloop.service.OrderDetailDbService;
24 import com.tianting.infoloop.utils.exception.ErrorCodeConstants; 23 import com.tianting.infoloop.utils.exception.ErrorCodeConstants;
25 import com.tianting.infoloop.utils.exception.ServiceExceptionUtil; 24 import com.tianting.infoloop.utils.exception.ServiceExceptionUtil;
25 +import lombok.RequiredArgsConstructor;
26 +import lombok.extern.slf4j.Slf4j;
27 +import org.springframework.beans.factory.annotation.Autowired;
28 +import org.springframework.stereotype.Service;
29 +
26 import java.time.Instant; 30 import java.time.Instant;
27 import java.time.LocalDateTime; 31 import java.time.LocalDateTime;
28 import java.time.ZoneId; 32 import java.time.ZoneId;
...@@ -31,10 +35,6 @@ import java.util.ArrayList; ...@@ -31,10 +35,6 @@ import java.util.ArrayList;
31 import java.util.Collections; 35 import java.util.Collections;
32 import java.util.List; 36 import java.util.List;
33 import java.util.stream.Collectors; 37 import java.util.stream.Collectors;
34 -import lombok.RequiredArgsConstructor;
35 -import lombok.extern.slf4j.Slf4j;
36 -import org.springframework.beans.factory.annotation.Autowired;
37 -import org.springframework.stereotype.Service;
38 38
39 @Slf4j 39 @Slf4j
40 @Service 40 @Service
...@@ -115,7 +115,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl ...@@ -115,7 +115,7 @@ public class OrderDbServiceImpl extends ServiceImpl<OrderDbMapper, OrderDb> impl
115 .atOffset(ZoneOffset.UTC) 115 .atOffset(ZoneOffset.UTC)
116 .toLocalDateTime(); 116 .toLocalDateTime();
117 orderDb.setMealTime(mealTime); 117 orderDb.setMealTime(mealTime);
118 - orderDb.setPayStatus(PayStatusEnum.SUCCEED_VALUE); 118 + orderDb.setPayStatus(PayStatusEnum.TO_PAY_VALUE);
119 orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy()); 119 orderDb.setCreatedBy(createOrderRpcRequest.getCreatedBy());
120 orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue()); 120 orderDb.setCreationSource(createOrderRpcRequest.getCreationSourceValue());
121 orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy()); 121 orderDb.setUpdatedBy(createOrderRpcRequest.getCreatedBy());
......