xdd

fs-company/src/main/java/com/fs/company/controller/live/LiveController.java

@@ -94,6 +94,7 @@ public class LiveController extends BaseController
         // 设置企业ID和企业用户ID
         setCompanyId(live);
 
+
         List<Live> list = liveService.selectLiveList(live);
         ExcelUtil<Live> util = new ExcelUtil<Live>(Live.class);
         return util.exportExcel(list, "直播数据");

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

@@ -354,7 +354,6 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
                 //审核通过
                 liveAfterSales.setStatus(3);
                 baseMapper.updateLiveAfterSales(liveAfterSales);
-
             }
             //仅退款待收货处理
             else if(liveAfterSales.getOrderStatus().equals(OrderInfoEnum.STATUS_2.getValue())){
@@ -362,6 +361,9 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
                 baseMapper.updateLiveAfterSales(liveAfterSales);
 
             } else if(liveAfterSales.getOrderStatus().equals(3)) {
+                liveAfterSales.setStatus(2);
+                baseMapper.updateLiveAfterSales(liveAfterSales);
+            } else if(liveAfterSales.getOrderStatus().equals(4)){
                 liveAfterSales.setStatus(1);
                 baseMapper.updateLiveAfterSales(liveAfterSales);
             }

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

@@ -681,6 +681,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
         liveOrder.setDeliverySn(deliveryDTO.getDeliverId());
         liveOrder.setDeliveryCode(deliveryDTO.getDeliverSn());
+        liveOrder.setStatus(3);
         liveOrderService.updateLiveOrder(liveOrder);