需求

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

@@ -465,22 +465,22 @@ public class ChangeOrderLogic {
 
         PgOrderBase pgOrderBase = pgOrderBaseService.getById(id);
 
-        OrderInfo orderInfo = orderInfoService.getById(pgOrderBase.getSaleOrderId());
+        //OrderInfo orderInfo = orderInfoService.getById(pgOrderBase.getSaleOrderId());
 
         List<OrderOldProduct> list = orderOldProductService.lambdaQuery().eq(OrderOldProduct::getOrderId, pgOrderBase.getSaleOrderId()).list();
 
         List<OrderOldProductItem> orderOldProductItems = orderOldProductItemService.lambdaQuery().eq(OrderOldProductItem::getOrderId, pgOrderBase.getSaleOrderId()).list();
 
         OldProductManagerAdd oldProductManagerAdd = new OldProductManagerAdd();
-        oldProductManagerAdd.setCompanyName(orderInfo.getCompanyName());
-        oldProductManagerAdd.setCompanyWechatId(orderInfo.getCompanyWechatId());
-        oldProductManagerAdd.setOrderId(orderInfo.getOrderId());
+        oldProductManagerAdd.setCompanyName(pgOrderBase.getCompanyWechatName());
+        oldProductManagerAdd.setCompanyWechatId(pgOrderBase.getCompanyWechatId());
+        oldProductManagerAdd.setOrderId(pgOrderBase.getSaleOrderId());
         oldProductManagerAdd.setPgOrderId(pgOrderBase.getId());
         oldProductManagerAdd.setStatus("IN");
         oldProductManagerAdd.setUserName(pgOrderBase.getUserName());
         oldProductManagerAdd.setUserPhone(pgOrderBase.getUserMobile());
         oldProductManagerAdd.setUserAddress(pgOrderBase.getAddress());
-        oldProductManagerAdd.setSaleType(orderInfo.getSaleType());
+        oldProductManagerAdd.setSaleType(pgOrderBase.getSaleType());
         oldProductManagerAdd.setOverTime(pgOrderBase.getOverTime());
         oldProductManagerAdd.setRemark(pgOrderBase.getRemark());
         oldProductManagerAdd.setProvince(pgOrderBase.getProvince());