commit commit

src/main/java/com/example/afrishop_v3/models/TbCfOrder.java

@@ -157,10 +157,10 @@ public class TbCfOrder {
      */
     private String remarkInfo;
 
-    @JsonIgnore
-    @JoinColumn(columnDefinition = "user_id",name = "user_id")
-    @ManyToOne(fetch = FetchType.LAZY)
-    private TbCfUserInfo userInfo;
+//    @JsonIgnore
+//    @JoinColumn(columnDefinition = "user_id",name = "user_id")
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    private TbCfUserInfo userInfo;
 
     @Transient
     private TbCfExpressTemplate defaultTemplate;
@@ -177,10 +177,6 @@ public class TbCfOrder {
     private List<TbCfItemOrderR> itemOrderList = new ArrayList<>();
 
 
-    @JsonIgnore
-    public TbCfUserInfo getUserInfo() {
-        return userInfo;
-    }
 
     /**
      * 设置：订单id

src/main/java/com/example/afrishop_v3/models/TbCfPlatformOrder.java

@@ -77,9 +77,9 @@ public class TbCfPlatformOrder {
      */
     private Integer logisticsStatus;
 
-    @JsonIgnore @JoinColumn(columnDefinition = "order_id",name = "order_id")
-    @ManyToOne(fetch = FetchType.LAZY)
-    private TbCfOrder order;
+//    @JsonIgnore @JoinColumn(columnDefinition = "order_id",name = "order_id")
+//    @ManyToOne(fetch = FetchType.LAZY)
+//    private TbCfOrder order;
 
     /**
      * 设置：对应id
@@ -102,10 +102,7 @@ public class TbCfPlatformOrder {
     }
 
 
-    @JsonIgnore
-    public TbCfOrder getOrder() {
-        return order;
-    }
+
 
     /**
      * 获取：订单id

src/main/java/com/example/afrishop_v3/quartz/OrderTask.java

@@ -32,6 +32,7 @@ import java.util.concurrent.locks.ReentrantLock;
 public class OrderTask {
     private static Logger logger = LoggerFactory.getLogger(OrderTask.class);
     private final TbCfOrderRepository orderRepository;
+    private final UserRepository userRepository;
 
     private final TbCfItemOrderRepository itemOrderRepository;
 
@@ -70,8 +71,9 @@ public class OrderTask {
 
     private final Lock lock = new ReentrantLock();
 
-    public OrderTask(TbCfOrderRepository orderRepository, TbCfItemOrderRepository itemOrderRepository, TbCfToicouponRepository toicouponRepository, UserRepository userRepository, TbCfAddressRepository addressRepository, TbCfItemSkuRepository itemSkuRepository, TbCfStationItemRepository stationItemRepository, TbCfDescripitonRepository descripitonRepository, TbCfPlatformOrderRepository platformOrderRepository) {
+    public OrderTask(TbCfOrderRepository orderRepository, UserRepository userRepository1, TbCfItemOrderRepository itemOrderRepository, TbCfToicouponRepository toicouponRepository, UserRepository userRepository, TbCfAddressRepository addressRepository, TbCfItemSkuRepository itemSkuRepository, TbCfStationItemRepository stationItemRepository, TbCfDescripitonRepository descripitonRepository, TbCfPlatformOrderRepository platformOrderRepository) {
         this.orderRepository = orderRepository;
+        this.userRepository = userRepository1;
         this.itemOrderRepository = itemOrderRepository;
         this.toicouponRepository = toicouponRepository;
         this.addressRepository = addressRepository;
@@ -158,11 +160,18 @@ public class OrderTask {
 //        try {
             for (TbCfPlatformOrder platformOrder : orderList) {
                 //查询用户信息
-                TbCfOrder order = platformOrder.getOrder();
+                Optional<TbCfOrder> orderOptional = orderRepository.findById(platformOrder.getOrderId());
 
-                if( order == null ) continue;
+                if( !orderOptional.isPresent()) return;
 
-                TbCfUserInfo user = order.getUserInfo();
+                TbCfOrder order = orderOptional.get();
+
+
+                Optional<TbCfUserInfo> userInfoOptional = userRepository.findById(order.getUserId());
+
+                if( !userInfoOptional.isPresent() ) return;
+
+                TbCfUserInfo user = userInfoOptional.get();
 
                 Optional<TbCfItemOrderR> itemOrderOptional = itemOrderRepository.findById(platformOrder.getRelativeId());