逻辑删除订单

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

@@ -126,7 +126,7 @@ public class LiveController {
 
 		LinkedHashMap<String,Object> result = (LinkedHashMap<String,Object>) params.get("WorkflowExecution");
 		String string = result.get("Object").toString();
-		videoService.updateFinishStatus(videoUrl + string.replace(".mp4", "-1080.m3u8"));
+		videoService.updateFinishStatus(string.replace(".mp4", ".m3u8"));
 
 		return R.ok();
 //		{app=200149.push.tlivecloud.com, appid=1319721001, appname=live, channel_id=673,

fs-service/src/main/java/com/fs/hisStore/param/MergedOrderDeleteParam.java

@@ -0,0 +1,25 @@
+package com.fs.hisStore.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * 合并订单删除参数
+ *
+ * @author fs
+ * @date 2025-01-XX
+ */
+@Data
+public class MergedOrderDeleteParam implements Serializable
+{
+    /** 订单ID */
+    @NotNull(message = "订单ID不能为空")
+    private Long orderId;
+
+    /** 订单类型 1商城订单 2直播订单 */
+    @NotNull(message = "订单类型不能为空")
+    private Integer orderType;
+}
+

fs-service/src/main/java/com/fs/hisStore/service/IMergedOrderService.java

@@ -70,5 +70,14 @@ public interface IMergedOrderService
      * @return 售后详情
      */
     MergedAfterSalesVO selectMergedAfterSalesById(Long salesId, Integer afterSalesType);
+
+    /**
+     * 删除订单（逻辑删除）
+     *
+     * @param userId 用户ID
+     * @param param 删除参数
+     * @return 结果
+     */
+    R deleteOrder(String userId, MergedOrderDeleteParam param);
 }
 

fs-service/src/main/java/com/fs/hisStore/service/impl/MergedOrderServiceImpl.java

@@ -309,5 +309,55 @@ public class MergedOrderServiceImpl implements IMergedOrderService
         
         return vo;
     }
+
+    @Override
+    public R deleteOrder(String userId, MergedOrderDeleteParam param) {
+        Long orderId = param.getOrderId();
+        Integer orderType = param.getOrderType();
+        
+        if (orderType == null) {
+            return R.error("订单类型不能为空");
+        }
+        
+        if (orderType == 1) {
+            // 商城订单
+            com.fs.hisStore.domain.FsStoreOrderScrm storeOrder = storeOrderService.selectFsStoreOrderById(orderId);
+            if (storeOrder == null) {
+                return R.error("订单不存在");
+            }
+            // 检查订单是否属于当前用户
+            if (!storeOrder.getUserId().equals(Long.parseLong(userId))) {
+                return R.error("无权删除该订单");
+            }
+            // 逻辑删除：设置 isDel = 1
+            storeOrder.setIsDel(1);
+            int result = storeOrderService.updateFsStoreOrder(storeOrder);
+            if (result > 0) {
+                return R.ok("删除成功");
+            } else {
+                return R.error("删除失败");
+            }
+        } else if (orderType == 2) {
+            // 直播订单
+            com.fs.live.domain.LiveOrder liveOrder = liveOrderService.selectLiveOrderByOrderId(String.valueOf(orderId));
+            if (liveOrder == null) {
+                return R.error("订单不存在");
+            }
+            // 检查订单是否属于当前用户
+            if (!liveOrder.getUserId().equals(userId)) {
+                return R.error("无权删除该订单");
+            }
+            // 逻辑删除：设置 isDel = "1"
+            liveOrder.setIsDel("1");
+            int result = liveOrderService.updateLiveOrder(liveOrder);
+            if (result > 0) {
+                return R.ok("删除成功");
+            } else {
+                return R.error("删除失败");
+            }
+        } else {
+            return R.error("订单类型错误");
+        }
+    }
 }
 

fs-service/src/main/java/com/fs/live/mapper/LiveVideoMapper.java

@@ -92,6 +92,6 @@ public interface LiveVideoMapper
     List<LiveVideo> selectByAll();
 
 
-    @Update("update live_video set finish_status = 1 where video_url = #{fileName}")
+    @Update("update live_video set finish_status = 1 where video_url like concat('%',#{fileName})")
     void updateFinishStatus(@Param("fileName") String fileName);
 }

fs-user-app/src/main/java/com/fs/app/controller/live/OrderController.java

@@ -99,4 +99,12 @@ public class OrderController extends AppBaseController {
         MergedAfterSalesVO vo = mergedOrderService.selectMergedAfterSalesById(salesId, afterSalesType);
         return R.ok().put("sales", vo);
     }
+
+    @Login
+    @PostMapping("/deleteOrder")
+    @ApiOperation(value = "删除订单", notes = "删除订单（逻辑删除）")
+    @RepeatSubmit
+    public R deleteOrder(@Validated @RequestBody MergedOrderDeleteParam param) {
+        return mergedOrderService.deleteOrder(getUserId(), param);
+    }
 }