需求

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/ChangeOrderLogic.java

@@ -465,10 +465,16 @@ public class ChangeOrderLogic {
 
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
-        //OrderInfo orderInfo = orderInfoService.getById(pgOrderBase.getSaleOrderId());
+        OrderInfo orderInfo = orderInfoService.getById(pgOrderBase.getSaleOrderId());
+
+        if (orderInfo == null)
+            return;
 
         List<OrderOldProduct> list = orderOldProductService.lambdaQuery().eq(OrderOldProduct::getOrderId, pgOrderBase.getSaleOrderId()).list();
 
+        if (CollectionUtils.isEmpty(list))
+            return;
+
         List<OrderOldProductItem> orderOldProductItems = orderOldProductItemService.lambdaQuery().eq(OrderOldProductItem::getOrderId, pgOrderBase.getSaleOrderId()).list();
 
         OldProductManagerAdd oldProductManagerAdd = new OldProductManagerAdd();