cid-主动加微-获客链接-益寿源迁移版

fs-admin/src/main/java/com/fs/course/controller/FsCourseRedPacketLogController.java

@@ -211,6 +211,13 @@ public class FsCourseRedPacketLogController extends BaseController
         return R.ok().put("list", optionsVOS);
     }
 
+    @GetMapping(value = "/videoListByWatch/{id}")
+    public R videoListByWatch(@PathVariable("id") Long id)
+    {
+        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllListByWatch(id);
+        return R.ok().put("list", optionsVOS);
+    }
+
 
     /**
     * 红包消耗统计

fs-company/src/main/java/com/fs/company/controller/course/FsCourseRedPacketLogController.java

@@ -267,4 +267,11 @@ public class FsCourseRedPacketLogController extends BaseController
         List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllList(id);
         return R.ok().put("list", optionsVOS);
     }
+
+    @GetMapping(value = "/videoListByWatch/{id}")
+    public R videoListByWatch(@PathVariable("id") Long id)
+    {
+        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllListByWatch(id);
+        return R.ok().put("list", optionsVOS);
+    }
 }

fs-service/src/main/java/com/fs/course/mapper/FsUserCourseVideoMapper.java

@@ -158,6 +158,9 @@ public interface FsUserCourseVideoMapper extends BaseMapper<FsUserCourseVideo> {
     @Select("select video_id dict_value, title dict_label  from fs_user_course_video where course_id=#{id} and is_del = 0 order by course_sort")
     List<OptionsVO> selectFsUserCourseVodeAllList(Long id);
 
+    @Select("select video_id dict_value, title dict_label,is_del  from fs_user_course_video where course_id=#{id}  order by course_sort")
+    List<OptionsVO> selectFsUserCourseVodeAllListByWatch(Long id);
+
     @Select("select video_id dict_value, title dict_label  from fs_user_course_video where course_id=#{id} and is_del = 0 and is_on_put = 0 order by course_sort, video_id")
     List<OptionsVO> selectFsUserCourseVideoAllListV2(@Param("id") Long id);
 

fs-service/src/main/java/com/fs/his/vo/OptionsVO.java

@@ -8,4 +8,5 @@ public class OptionsVO implements Serializable {
     Long dictValue;
     String dictLabel;
     String dictImgUrl;
+    Integer isDel;
 }

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

@@ -48,11 +48,13 @@ public class FsStoreOrderCreateParam implements Serializable
     //订单创建类型 1普通订单 2套餐订单 3制单
     private Integer orderCreateType;
 
+    private Integer orderType; //订单类型(0商城，2直播，3点播，5直播中奖，6秒杀,7限时折扣)
+
     private Long customerId;
 
     private BigDecimal amount; //货到付款代收金额
 
-    private Integer orderType; //订单类型
+
     private Integer orderMedium; //媒体来源
 
     private Boolean isUserApp = true;

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

@@ -1070,7 +1070,6 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
                 return R.error("地址不能为空!");
             }
         }
-
         FsStoreOrderComputedParam computedParam = new FsStoreOrderComputedParam();
         BeanUtils.copyProperties(param, computedParam);
         //计算金额

fs-service/src/main/java/com/fs/live/domain/LiveOrder.java

@@ -367,4 +367,11 @@ public class LiveOrder extends BaseEntity {
     @Excel(name = "小程序AppId")
     private String appId;
 
+    //订单创建类型 1普通订单 2套餐订单 3制单
+    @TableField(exist = false)
+    private Integer orderCreateType;
+
+    @TableField(exist = false)
+    private Integer orderType; //订单类型(0商城，2直播，3点播，5直播中奖，6秒杀,7限时折扣)
+
 }