维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/order/OrderFollow.java

@@ -1,8 +1,5 @@
 package com.fjhx.entity.order;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
@@ -26,7 +23,7 @@ public class OrderFollow extends BaseEntity {
     /**
      * 订单id
      */
-    private Long oredrInfoId;
+    private Long orderInfoId;
 
     /**
      * 售后状态 1跟进中(补发中、未补发未收到退货) 2已补发 3未补发收到退货 4已补发收到退货 5已补发未收到退货 6结束

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/order/OrderInfoMapper.xml

@@ -20,6 +20,7 @@
                oi.phone_prefix_type,
                oi.remark,
                oi.create_time,
+               oi.after_sales_status,
                ci.name customerName
         from order_info oi
                  left join customer_info ci on oi.customer_info_id = ci.id

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderFollowServiceImpl.java

@@ -58,7 +58,7 @@ public class OrderFollowServiceImpl extends ServiceImpl<OrderFollowMapper, Order
         save(orderFollow);
 
         OrderInfo orderInfo = new OrderInfo();
-        orderInfo.setId(orderFollow.getOredrInfoId());
+        orderInfo.setId(orderFollow.getOrderInfoId());
         orderInfo.setAfterSalesStatus(orderFollow.getAfterSalesStatus());
         orderInfoService.updateById(orderInfo);
     }

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderInfoInfoServiceImpl.java

@@ -289,7 +289,7 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
         orderInfo.setStatus(1);
         orderInfo.setIssueStatus(1);
         orderInfo.setAfterSalesStatus(1);
-        orderInfo.setRemark(orderInfo.getRemark());
+        orderInfo.setRemark(orderInfoVo.getRemark());
         save(orderInfo);
 
         if (orderInfoVo.getType().equals(4)) {
@@ -301,7 +301,6 @@ public class OrderInfoInfoServiceImpl extends ServiceImpl<OrderInfoMapper, Order
             orderDetails.setId(null);
             orderDetails.setOrderId(orderInfo.getId());
             orderDetails.setNotIssuedQuantity(orderDetails.getQuantity());
-            orderDetails.setRemark(null);
         }
         orderDetailsService.saveBatch(list);
     }