zhuyifan

fix

...@@ -3,13 +3,13 @@ package com.tianting.infoloop.model.db; ...@@ -3,13 +3,13 @@ package com.tianting.infoloop.model.db;
3 import com.baomidou.mybatisplus.annotation.TableId; 3 import com.baomidou.mybatisplus.annotation.TableId;
4 import com.baomidou.mybatisplus.annotation.TableName; 4 import com.baomidou.mybatisplus.annotation.TableName;
5 import com.baomidou.mybatisplus.extension.activerecord.Model; 5 import com.baomidou.mybatisplus.extension.activerecord.Model;
6 -import com.fasterxml.jackson.databind.JsonNode;
7 -import java.io.Serializable;
8 -import java.time.LocalDateTime;
9 import lombok.Data; 6 import lombok.Data;
10 import lombok.EqualsAndHashCode; 7 import lombok.EqualsAndHashCode;
11 import lombok.experimental.Accessors; 8 import lombok.experimental.Accessors;
12 9
10 +import java.io.Serializable;
11 +import java.time.LocalDateTime;
12 +
13 /** 13 /**
14 * order operation records DB 14 * order operation records DB
15 * @TableName client_customer_order_operation_records 15 * @TableName client_customer_order_operation_records
...@@ -31,13 +31,13 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl ...@@ -31,13 +31,13 @@ public class OrderOperationRecordsDb extends Model<OrderOperationRecordsDb> impl
31 31
32 private Integer type; 32 private Integer type;
33 33
34 - private JsonNode originalOrderJson; 34 + private String originalOrderJson;
35 35
36 - private JsonNode adjustOrderJson; 36 + private String adjustOrderJson;
37 37
38 - private JsonNode originalOrderDetailJson; 38 + private String originalOrderDetailJson;
39 39
40 - private JsonNode adjustOrderDetailJson; 40 + private String adjustOrderDetailJson;
41 41
42 private String operator; 42 private String operator;
43 43
......
...@@ -3,23 +3,20 @@ package com.tianting.infoloop.service.impl; ...@@ -3,23 +3,20 @@ package com.tianting.infoloop.service.impl;
3 import cn.hutool.extra.spring.SpringUtil; 3 import cn.hutool.extra.spring.SpringUtil;
4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 4 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 5 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6 -import com.fasterxml.jackson.databind.ObjectMapper;
7 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest; 6 import com.infoloop.tianting.clientcustomerorderservice.BatchCreateOrderOperationRecordsRequest;
8 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest; 7 import com.infoloop.tianting.clientcustomerorderservice.GetOrderOperationRecordsByOrderIdRequest;
9 import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper; 8 import com.tianting.infoloop.mapper.OrderOperationRecordDbMapper;
10 -import com.tianting.infoloop.model.db.OrderDb;
11 -import com.tianting.infoloop.model.db.OrderDetailDb;
12 import com.tianting.infoloop.model.db.OrderOperationRecordsDb; 9 import com.tianting.infoloop.model.db.OrderOperationRecordsDb;
13 import com.tianting.infoloop.service.OrderOperationRecordDbService; 10 import com.tianting.infoloop.service.OrderOperationRecordDbService;
14 -import java.util.Collections;
15 -import java.util.List;
16 -import java.util.stream.Collectors;
17 import lombok.RequiredArgsConstructor; 11 import lombok.RequiredArgsConstructor;
18 import lombok.extern.slf4j.Slf4j; 12 import lombok.extern.slf4j.Slf4j;
19 import org.springframework.beans.factory.annotation.Autowired; 13 import org.springframework.beans.factory.annotation.Autowired;
20 -import org.springframework.core.annotation.Order;
21 import org.springframework.stereotype.Service; 14 import org.springframework.stereotype.Service;
22 15
16 +import java.util.Collections;
17 +import java.util.List;
18 +import java.util.stream.Collectors;
19 +
23 @Slf4j 20 @Slf4j
24 @Service 21 @Service
25 @RequiredArgsConstructor(onConstructor_ = @Autowired) 22 @RequiredArgsConstructor(onConstructor_ = @Autowired)
...@@ -32,7 +29,6 @@ public class OrderOperationRecordDbServiceImpl extends ...@@ -32,7 +29,6 @@ public class OrderOperationRecordDbServiceImpl extends
32 @Override 29 @Override
33 public List<OrderOperationRecordsDb> batchCreateOrderOperationRecords( 30 public List<OrderOperationRecordsDb> batchCreateOrderOperationRecords(
34 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) { 31 BatchCreateOrderOperationRecordsRequest batchCreateOrderOperationRecordsRequest) {
35 - ObjectMapper objectMapper = new ObjectMapper();
36 var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream() 32 var list = batchCreateOrderOperationRecordsRequest.getCreationsList().stream()
37 .map(creation -> { 33 .map(creation -> {
38 OrderOperationRecordsDb orderOperationRecordsDb = new OrderOperationRecordsDb(); 34 OrderOperationRecordsDb orderOperationRecordsDb = new OrderOperationRecordsDb();
...@@ -43,16 +39,16 @@ public class OrderOperationRecordDbServiceImpl extends ...@@ -43,16 +39,16 @@ public class OrderOperationRecordDbServiceImpl extends
43 orderOperationRecordsDb.setOrderId(creation.getOrderId()); 39 orderOperationRecordsDb.setOrderId(creation.getOrderId());
44 orderOperationRecordsDb.setType(creation.getTypeValue()); 40 orderOperationRecordsDb.setType(creation.getTypeValue());
45 if (creation.getShouldCreateAdjustOrderJson()) { 41 if (creation.getShouldCreateAdjustOrderJson()) {
46 - orderOperationRecordsDb.setAdjustOrderJson(objectMapper.valueToTree(creation.getAdjustOrderJson())); 42 + orderOperationRecordsDb.setAdjustOrderJson(creation.getAdjustOrderJson());
47 } 43 }
48 if (creation.getShouldCreateOriginalOrderJson()) { 44 if (creation.getShouldCreateOriginalOrderJson()) {
49 - orderOperationRecordsDb.setOriginalOrderJson(objectMapper.valueToTree(creation.getOriginalOrderJson())); 45 + orderOperationRecordsDb.setOriginalOrderJson(creation.getOriginalOrderJson());
50 } 46 }
51 if (creation.getShouldCreateAdjustOrderDetailJson()) { 47 if (creation.getShouldCreateAdjustOrderDetailJson()) {
52 - orderOperationRecordsDb.setAdjustOrderDetailJson(objectMapper.valueToTree(creation.getAdjustOrderDetailJson())); 48 + orderOperationRecordsDb.setAdjustOrderDetailJson(creation.getAdjustOrderDetailJson());
53 } 49 }
54 if (creation.getShouldCreateOriginalOrderDetailJson()) { 50 if (creation.getShouldCreateOriginalOrderDetailJson()) {
55 - orderOperationRecordsDb.setOriginalOrderDetailJson(objectMapper.valueToTree(creation.getOriginalOrderJson())); 51 + orderOperationRecordsDb.setOriginalOrderDetailJson(creation.getOriginalOrderJson());
56 } 52 }
57 return orderOperationRecordsDb; 53 return orderOperationRecordsDb;
58 }) 54 })
......