直播退款订单有些东西未生效

fs-service-system/src/main/java/com/fs/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -21,6 +21,7 @@ import com.fs.erp.dto.ErpRefundUpdateRequest;
 import com.fs.erp.mapper.FsJstAftersalePushMapper;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.erp.utils.ErpContextHolder;
+import com.fs.express.FsStoreDeliversService;
 import com.fs.express.enums.TaskStatusEnum;
 import com.fs.live.domain.*;
 import com.fs.live.dto.LiveAfterSalesProductDTO;
@@ -52,6 +53,7 @@ import com.fs.store.service.IFsUserService;
 import com.fs.system.config.SnowflakeUtils;
 import com.fs.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.util.Asserts;
 import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -143,6 +145,9 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
 
     @Autowired
     private IFsUserCacheService fsUserCacheService;
+
+    @Autowired
+    private FsStoreDeliversService fsStoreDeliversService;
     /**
      * 查询售后记录列表
      *
@@ -160,6 +165,24 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
                     item.setUserName(String.format("%s_%s",fsUser.getUserId(),fsUser.getNickname()));
                 }
             }
+
+            if(ObjectUtil.isNotNull(item.getCompanyUserNickName())) {
+                item.setCompanyUserNickName("-");
+            }
+
+            if(ObjectUtil.isNotNull(item.getCompanyName())){
+                item.setCompanyName("-");
+            }
+
+            if(ObjectUtil.isNotNull(item.getOrderId())){
+                List<FsStoreDelivers> byOrderIdWithType = fsStoreDeliversService.findByOrderIdWithType(item.getOrderId(), 1);
+                if(CollectionUtils.isNotEmpty(byOrderIdWithType)) {
+                    FsStoreDelivers delivers = byOrderIdWithType.get(0);
+                    item.setDeliveryStatus(String.valueOf(delivers.getStatus()));
+                    item.setDeliveryId(delivers.getDeliverId());
+                }
+            }
+
         }
         return liveAfterSalesVos;
     }

fs-service-system/src/main/java/com/fs/live/vo/LiveAfterSalesVo.java

@@ -115,4 +115,14 @@ public class LiveAfterSalesVo {
     private String orderCode;
     private String userPhone;
 
+    /**
+     * 物流状态
+     */
+    private String deliveryStatus;
+
+    /**
+     * 物流单号
+     */
+    private String deliveryId;
+
 }

fs-service-system/src/main/resources/mapper/live/LiveAfterSalesMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select las.id, las.live_id, las.store_id, las.order_id, las.refund_amount,
         las.refund_type, las.reasons, las.explains, las.explain_img, las.delivery_code, las.delivery_sn, las.delivery_name, las.status, las.sales_status,
         las.order_status, las.create_time, las.is_del, las.user_id, las.consignee, las.phone_number, las.address, las.company_id, las.company_user_id, las.dept_id,
-        cu.nick_name as company_user_nick_name, c.company_name,lo.order_code,lo.user_phone,las.user_id
+        cu.nick_name as company_user_nick_name, c.company_name,lo.order_code,lo.user_phone,las.user_id,
         from live_after_sales las
         left join live_order lo on lo.order_id = las.order_id
         left join company_user cu on cu.user_id = las.company_user_id