jiujian / client-customer-order-service

Go to a project
Toggle navigation Toggle navigation pinning
zhuyifan
21d90818 1 parent 0ee22213

fix

Inline Side-by-side
Showing 6 changed files with 33 additions and 37 deletions
...@@ -9,7 +9,6 @@ import brave.propagation.B3Propagation; ...@@ -9,7 +9,6 @@ import brave.propagation.B3Propagation;
9 import brave.propagation.CurrentTraceContext; 9 import brave.propagation.CurrentTraceContext;
10 import brave.propagation.TraceContext; 10 import brave.propagation.TraceContext;
11 import brave.sampler.Sampler; 11 import brave.sampler.Sampler;
12 -import com.tianting.infoloop.service.grpc.ExampleGrpcService;
13 import com.tianting.infoloop.service.grpc.OrderGrpcService; 12 import com.tianting.infoloop.service.grpc.OrderGrpcService;
14 import io.grpc.Server; 13 import io.grpc.Server;
15 import io.grpc.ServerInterceptor; 14 import io.grpc.ServerInterceptor;
......
1 package com.tianting.infoloop.mapper; 1 package com.tianting.infoloop.mapper;
2 2
3 import com.tianting.infoloop.inject.MyBaseMapper; 3 import com.tianting.infoloop.inject.MyBaseMapper;
4 -import com.tianting.infoloop.model.db.OrderOperationRecordsDb; 4 +import com.tianting.infoloop.model.db.OrderOperationRecordDb;
5 5
6 -public interface OrderOperationRecordDbMapper extends MyBaseMapper<OrderOperationRecordsDb> { 6 +public interface OrderOperationRecordDbMapper extends MyBaseMapper<OrderOperationRecordDb> {
7 7
8 } 8 }
......
1 package com.tianting.infoloop.model.db; 1 package com.tianting.infoloop.model.db;
2 2
3 +import com.baomidou.mybatisplus.annotation.FieldFill;
4 +import com.baomidou.mybatisplus.annotation.IdType;
5 +import com.baomidou.mybatisplus.annotation.TableField;
3 import com.baomidou.mybatisplus.annotation.TableId; 6 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableName; 7 import com.baomidou.mybatisplus.annotation.TableName;
5 import com.baomidou.mybatisplus.extension.activerecord.Model; 8 import com.baomidou.mybatisplus.extension.activerecord.Model;
...@@ -18,17 +21,15 @@ import java.time.LocalDateTime; ...@@ -18,17 +21,15 @@ import java.time.LocalDateTime;
18 @Accessors(chain = true) 21 @Accessors(chain = true)
19 @EqualsAndHashCode(callSuper = true) 22 @EqualsAndHashCode(callSuper = true)
20 @TableName(value ="client_customer_order_operation_records") 23 @TableName(value ="client_customer_order_operation_records")
21 -public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> implements Serializable { 24 +public class OrderOperationRecordDb extends Model<OrderOperationRecordDb> implements Serializable {
22 25
23 - @TableId 26 + @TableId(type = IdType.AUTO)
24 private Integer id; 27 private Integer id;
25 28
26 private Integer enterpriseId; 29 private Integer enterpriseId;
27 30
28 private Integer orderId; 31 private Integer orderId;
29 32
30 - private Integer orderDetailId;
31 -
32 private Integer type; 33 private Integer type;
33 34
34 private String originalOrderJson; 35 private String originalOrderJson;
...@@ -43,6 +44,7 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl ...@@ -43,6 +44,7 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl
43 44
44 private Integer createdBy; 45 private Integer createdBy;
45 46
47 + @TableField(fill = FieldFill.INSERT)
46 private LocalDateTime createdAt; 48 private LocalDateTime createdAt;
47 49
48 private Integer creationSource; 50 private Integer creationSource;
......
1 package com.tianting.infoloop.service; 1 package com.tianting.infoloop.service;
2 2
3 import com.baomidou.mybatisplus.extension.service.IService; 3 import com.baomidou.mybatisplus.extension.service.IService;
4 -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest; 4 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
6 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest; 5 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
7 -import com.tianting.infoloop.grpc.exampleservice.TestExampleDbCreation; 6 +import com.tianting.infoloop.model.db.OrderOperationRecordDb;
8 -import com.tianting.infoloop.mapper.OrderDetailMapper; 7 +
9 -import com.tianting.infoloop.model.db.OrderDb;
10 -import com.tianting.infoloop.model.db.OrderDetailDb;
11 -import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
12 -import com.tianting.infoloop.model.db.TestExampleDb;
13 import java.util.List; 8 import java.util.List;
14 9
15 -public interface OrderOperationRecordDbService extends IService<OrderOperationRecordsDb> { 10 +public interface OrderOperationRecordDbService extends IService<OrderOperationRecordDb> {
16 11
17 - List<OrderOperationRecordsDb> batchCreateOrderOperationRecords( 12 + List<OrderOperationRecordDb> batchCreateOrderOperationRecords(
18 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest); 13 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest);
19 14
20 - List<OrderOperationRecordsDb> getOrderOperationRecordsByOrderId( 15 + List<OrderOperationRecordDb> getOrderOperationRecordsByOrderId(
21 GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest); 16 GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest);
22 } 17 }
......
...@@ -53,7 +53,7 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde ...@@ -53,7 +53,7 @@ import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrde
53 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse; 53 import com.infoloop.tianting.clientcustomerorderservice.UpdateClientCustomerOrderRpcResponse;
54 import com.tianting.infoloop.model.db.OrderDb; 54 import com.tianting.infoloop.model.db.OrderDb;
55 import com.tianting.infoloop.model.db.OrderDetailDb; 55 import com.tianting.infoloop.model.db.OrderDetailDb;
56 -import com.tianting.infoloop.model.db.OrderOperationRecordsDb; 56 +import com.tianting.infoloop.model.db.OrderOperationRecordDb;
57 import com.tianting.infoloop.service.OrderDbService; 57 import com.tianting.infoloop.service.OrderDbService;
58 import com.tianting.infoloop.service.OrderDetailDbService; 58 import com.tianting.infoloop.service.OrderDetailDbService;
59 import com.tianting.infoloop.service.OrderOperationRecordDbService; 59 import com.tianting.infoloop.service.OrderOperationRecordDbService;
...@@ -216,7 +216,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -216,7 +216,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
216 } 216 }
217 217
218 if (request.getShouldFilterOrderCode()) { 218 if (request.getShouldFilterOrderCode()) {
219 - queryWrapper.eq(OrderDb::getOrderCode, request.getOrderCode()); 219 + queryWrapper.likeRight(OrderDb::getOrderCode, request.getOrderCode());
220 } 220 }
221 221
222 if (request.getShouldFilterClientIds()) { 222 if (request.getShouldFilterClientIds()) {
...@@ -581,7 +581,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu ...@@ -581,7 +581,7 @@ public class OrderGrpcService extends ClientCustomerOrderServiceRpcGrpc.ClientCu
581 try { 581 try {
582 final var data = orderOperationRecordDbService.batchCreateOrderOperationRecords(request); 582 final var data = orderOperationRecordDbService.batchCreateOrderOperationRecords(request);
583 builder.setIsCreated(data.size() == request.getCreationsCount()).addAllIds(data.stream().map( 583 builder.setIsCreated(data.size() == request.getCreationsCount()).addAllIds(data.stream().map(
584 - OrderOperationRecordsDb::getId).collect(Collectors.toList())); 584 + OrderOperationRecordDb::getId).collect(Collectors.toList()));
585 } catch (final Exception e) { 585 } catch (final Exception e) {
586 log.error("batchCreateOrderOperationRecords error;", e); 586 log.error("batchCreateOrderOperationRecords error;", e);
587 responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException()); 587 responseStreamObserver.onError(Status.INTERNAL.withDescription(e.getMessage()).asException());
......
...@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest; 6 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
7 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest; 7 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
8 import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper; 8 import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper;
9 -import com.tianting.infoloop.model.db.OrderOperationRecordsDb; 9 +import com.tianting.infoloop.model.db.OrderOperationRecordDb;
10 import com.tianting.infoloop.service.OrderOperationRecordDbService; 10 import com.tianting.infoloop.service.OrderOperationRecordDbService;
11 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
12 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
...@@ -21,45 +21,45 @@ import java.util.stream.Collectors; ...@@ -21,45 +21,45 @@ import java.util.stream.Collectors;
21 @Service 21 @Service
22 @RequiredArgsConstructor(onConstructor_ = @Autowired) 22 @RequiredArgsConstructor(onConstructor_ = @Autowired)
23 public class OrderOperationRecordDbServiceImpl extends 23 public class OrderOperationRecordDbServiceImpl extends
24 - ServiceImpl<OrderOperationRecordDbMapper, OrderOperationRecordsDb> 24 + ServiceImpl<OrderOperationRecordDbMapper, OrderOperationRecordDb>
25 implements OrderOperationRecordDbService { 25 implements OrderOperationRecordDbService {
26 26
27 private final OrderOperationRecordDbMapper orderOperationRecordDbMapper; 27 private final OrderOperationRecordDbMapper orderOperationRecordDbMapper;
28 28
29 @Override 29 @Override
30 - public List<OrderOperationRecordsDb> batchCreateOrderOperationRecords( 30 + public List<OrderOperationRecordDb> batchCreateOrderOperationRecords(
31 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) { 31 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) {
32 var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream() 32 var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream()
33 .map(creation -> { 33 .map(creation -> {
34 - OrderOperationRecordsDb orderOperationRecordsDb = new OrderOperationRecordsDb(); 34 + OrderOperationRecordDb orderOperationRecordDb = new OrderOperationRecordDb();
35 - orderOperationRecordsDb.setCreationSource(batchCreateOrderOperationRecordsRequest.getCreationSourceValue()); 35 + orderOperationRecordDb.setCreationSource(batchCreateOrderOperationRecordsRequest.getCreationSourceValue());
36 - orderOperationRecordsDb.setCreatedBy(batchCreateOrderOperationRecordsRequest.getCreatedBy()); 36 + orderOperationRecordDb.setCreatedBy(batchCreateOrderOperationRecordsRequest.getCreatedBy());
37 - orderOperationRecordsDb.setEnterpriseId(batchCreateOrderOperationRecordsRequest.getEnterpriseId()); 37 + orderOperationRecordDb.setEnterpriseId(batchCreateOrderOperationRecordsRequest.getEnterpriseId());
38 - orderOperationRecordsDb.setOperator(batchCreateOrderOperationRecordsRequest.getOperator()); 38 + orderOperationRecordDb.setOperator(batchCreateOrderOperationRecordsRequest.getOperator());
39 - orderOperationRecordsDb.setOrderId(creation.getOrderId()); 39 + orderOperationRecordDb.setOrderId(creation.getOrderId());
40 - orderOperationRecordsDb.setType(creation.getTypeValue()); 40 + orderOperationRecordDb.setType(creation.getTypeValue());
41 if (creation.getShouldCreateAdjustOrderJson()) { 41 if (creation.getShouldCreateAdjustOrderJson()) {
42 - orderOperationRecordsDb.setAdjustOrderJson(creation.getAdjustOrderJson()); 42 + orderOperationRecordDb.setAdjustOrderJson(creation.getAdjustOrderJson());
43 } 43 }
44 if (creation.getShouldCreateOriginalOrderJson()) { 44 if (creation.getShouldCreateOriginalOrderJson()) {
45 - orderOperationRecordsDb.setOriginalOrderJson(creation.getOriginalOrderJson()); 45 + orderOperationRecordDb.setOriginalOrderJson(creation.getOriginalOrderJson());
46 } 46 }
47 if (creation.getShouldCreateAdjustOrderDetailJson()) { 47 if (creation.getShouldCreateAdjustOrderDetailJson()) {
48 - orderOperationRecordsDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson()); 48 + orderOperationRecordDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson());
49 } 49 }
50 if (creation.getShouldCreateOriginalOrderDetailJson()) { 50 if (creation.getShouldCreateOriginalOrderDetailJson()) {
51 - orderOperationRecordsDb.setOriginalOrderDetailJson(creation.getOriginalOrderJson()); 51 + orderOperationRecordDb.setOriginalOrderDetailJson(creation.getOriginalOrderDetailJson());
52 } 52 }
53 - return orderOperationRecordsDb; 53 + return orderOperationRecordDb;
54 }) 54 })
55 .collect(Collectors.toList()); 55 .collect(Collectors.toList());
56 return SpringUtil.getBean(OrderOperationRecordDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList(); 56 return SpringUtil.getBean(OrderOperationRecordDbServiceImpl.class).saveBatch(list) ? list : Collections.emptyList();
57 } 57 }
58 58
59 @Override 59 @Override
60 - public List<OrderOperationRecordsDb> getOrderOperationRecordsByOrderId( 60 + public List<OrderOperationRecordDb> getOrderOperationRecordsByOrderId(
61 GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest) { 61 GetOrderOperationRecordsByOrderIdRequest getOrderOperationRecordsByOrderIdRequest) {
62 - QueryWrapper<OrderOperationRecordsDb> wrapper = new QueryWrapper<>(); 62 + QueryWrapper<OrderOperationRecordDb> wrapper = new QueryWrapper<>();
63 wrapper.eq("enterpriseId", getOrderOperationRecordsByOrderIdRequest.getEnterpriseId()) 63 wrapper.eq("enterpriseId", getOrderOperationRecordsByOrderIdRequest.getEnterpriseId())
64 .eq("createdBy", getOrderOperationRecordsByOrderIdRequest.getOrderId()) 64 .eq("createdBy", getOrderOperationRecordsByOrderIdRequest.getOrderId())
65 .orderByDesc("createdAt"); 65 .orderByDesc("createdAt");
......