Merge remote-tracking branch 'origin/master_exclusive_shop_20250718' into master_exclusive_shop_20250718

fs-service-system/src/main/java/com/fs/live/service/ILiveOrderService.java

@@ -167,7 +167,7 @@ public interface ILiveOrderService {
     LiveOrder getById(String orderId);
 
     R refundOrderMoney(Long orderId);
-    R refundOrderMoney(Long orderId, LiveAfterSales liveAfterSales);
+    R refundOrderMoney(Long orderId, LiveAfterSales liveAfterSales,String operator);
 
     List<LiveOrder> selectUpdateExpress();
 

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

@@ -255,6 +255,7 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
 
         }
         baseMapper.updateLiveAfterSales(storeAfterSales);
+
         return R.ok();
     }
 
@@ -284,12 +285,14 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
     @Autowired
     private ILiveAfterSalesService liveAfterSalesService;
     @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public R refundMoney(LiveAfterSalesRefundParam param) {
         LiveAfterSales liveAfterSales = liveAfterSalesService.selectLiveAfterSalesById(param.getSalesId());
         if(ObjectUtil.isNull(liveAfterSales)) {
             throw new IllegalArgumentException("售后单不存在！");
         }
-        return liveOrderService.refundOrderMoney(liveAfterSales.getOrderId(),liveAfterSales);
+
+        return liveOrderService.refundOrderMoney(liveAfterSales.getOrderId(),liveAfterSales,param.getOperator());
     }
 
     /**

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

@@ -58,10 +58,7 @@ import com.fs.live.vo.LiveOrderVo;
 import com.fs.store.cache.IFsExpressCacheService;
 import com.fs.store.domain.*;
 import com.fs.store.dto.*;
-import com.fs.store.enums.OrderInfoEnum;
-import com.fs.store.enums.OrderLogEnum;
-import com.fs.store.enums.ShipperCodeEnum;
-import com.fs.store.enums.ShippingTempEnum;
+import com.fs.store.enums.*;
 import com.fs.store.mapper.*;
 import com.fs.store.param.FsStoreOrderAddTuiMoneyParam;
 import com.fs.store.param.LiveOrderComputedParam;
@@ -984,8 +981,12 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         return R.ok();
     }
 
+    @Autowired
+    private LiveAfterSalesLogsMapper liveAfterSalesLogsMapper;
+
     @Override
-    public R refundOrderMoney(Long orderId, LiveAfterSales liveAfterSales) {
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
+    public R refundOrderMoney(Long orderId, LiveAfterSales liveAfterSales,String operator) {
         LiveOrder order = baseMapper.selectLiveOrderByOrderId(String.valueOf(orderId));
         if(order.getStatus()==-2){
             return R.error("已退款");
@@ -1040,6 +1041,17 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveAfterSales.setStatus(4);
         liveAfterSales.setSalesStatus(3);
         liveAfterSalesMapper.updateLiveAfterSales(liveAfterSales);
+
+
+        LiveAfterSalesLogs storeAfterSalesStatus = new LiveAfterSalesLogs();
+        storeAfterSalesStatus.setStoreAfterSalesId(liveAfterSales.getId());
+        storeAfterSalesStatus.setChangeType(3);
+        storeAfterSalesStatus.setChangeMessage(AfterSalesStatusEnum.STATUS_4.getDesc());
+        storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
+        storeAfterSalesStatus.setOperator(operator);
+        liveAfterSalesLogsMapper.insertLiveAfterSalesLogs(storeAfterSalesStatus);
+
+
         return R.ok();
     }