sop

fs-admin/src/main/java/com/fs/company/controller/CompanyRedPackageLogsController.java

@@ -0,0 +1,128 @@
+package com.fs.company.controller;
+
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ServletUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.company.domain.CompanyRedPackageLogs;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyRedPackageLogsService;
+import com.fs.core.security.LoginUser;
+import com.fs.core.web.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 公司红包余额日志Controller
+ * 
+ * @author 吴树波
+ * @date 2025-04-15
+ */
+@RestController
+@RequestMapping("/company/CompanyRedPackageLogs")
+public class CompanyRedPackageLogsController extends BaseController
+{
+    @Autowired
+    private ICompanyRedPackageLogsService companyRedPackageLogsService;
+    @Autowired
+    private TokenService tokenService;
+
+    /**
+     * 查询公司红包余额日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CompanyRedPackageLogs companyRedPackageLogs)
+    {
+        startPage();
+        List<CompanyRedPackageLogs> list = companyRedPackageLogsService.selectCompanyRedPackageLogsList(companyRedPackageLogs);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出公司红包余额日志列表
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:export')")
+    @Log(title = "公司红包余额日志", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(CompanyRedPackageLogs companyRedPackageLogs)
+    {
+        List<CompanyRedPackageLogs> list = companyRedPackageLogsService.selectCompanyRedPackageLogsList(companyRedPackageLogs);
+        ExcelUtil<CompanyRedPackageLogs> util = new ExcelUtil<CompanyRedPackageLogs>(CompanyRedPackageLogs.class);
+        return util.exportExcel(list, "公司红包余额日志数据");
+    }
+
+    /**
+     * 获取公司红包余额日志详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(companyRedPackageLogsService.selectCompanyRedPackageLogsById(id));
+    }
+
+    /**
+     * 新增公司红包余额日志
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:add')")
+    @Log(title = "公司红包余额日志", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody CompanyRedPackageLogs companyRedPackageLogs)
+    {
+        return toAjax(companyRedPackageLogsService.insertCompanyRedPackageLogs(companyRedPackageLogs));
+    }
+
+    /**
+     * 修改公司红包余额日志
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:edit')")
+    @Log(title = "公司红包余额日志", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody CompanyRedPackageLogs companyRedPackageLogs)
+    {
+        return toAjax(companyRedPackageLogsService.updateCompanyRedPackageLogs(companyRedPackageLogs));
+    }
+
+    /**
+     * 删除公司红包余额日志
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:remove')")
+    @Log(title = "公司红包余额日志", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(companyRedPackageLogsService.deleteCompanyRedPackageLogsByIds(ids));
+    }
+
+    /**
+     * 删除公司红包余额日志
+     */
+    @PreAuthorize("@ss.hasPermi('company:CompanyRedPackageLogs:add')")
+    @Log(title = "充值余额", businessType = BusinessType.INSERT)
+	@PostMapping("/recharge")
+    public R recharge(@RequestBody CompanyRedPackageLogs companyRedPackageLogs){
+        companyRedPackageLogsService.recharge(companyRedPackageLogs);
+        return R.ok();
+    }
+
+
+
+    @GetMapping(value = "/getMoneyPri")
+    public R getMoneyPri(){
+        return R.ok().put("data", companyRedPackageLogsService.getMoneyPri());
+    }
+    // 充值审核
+    @PostMapping(value = "/rew")
+    public R rew(@RequestBody CompanyRedPackageLogs companyRedPackageLogs){
+        companyRedPackageLogsService.rew(companyRedPackageLogs);
+        return R.ok();
+    }
+}

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

@@ -9,6 +9,7 @@ import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.course.domain.FsCourseTrafficLog;
+import com.fs.course.mapper.FsUserCourseVideoMapper;
 import com.fs.course.param.FsCourseTrafficLogParam;
 import com.fs.course.service.IFsCourseTrafficLogService;
 import com.fs.course.service.IFsUserCourseService;
@@ -40,6 +41,8 @@ public class FsCourseTrafficLogController extends BaseController
 
     @Autowired
     private IFsUserCourseService fsUserCourseMapper;
+    @Autowired
+    private FsUserCourseVideoMapper fsUserCourseVideoMapper;
     /**
      * 查询短链课程流量记录列表
      */
@@ -133,4 +136,11 @@ public class FsCourseTrafficLogController extends BaseController
         List<OptionsVO> optionsVOS = fsUserCourseMapper.selectFsUserCourseAllList();
         return R.ok().put("list", optionsVOS);
     }
+
+    @GetMapping(value = "/videoList/{id}")
+    public R videoList(@PathVariable("id") Long id)
+    {
+        List<OptionsVO> optionsVOS = fsUserCourseVideoMapper.selectFsUserCourseVodeAllList(id);
+        return R.ok().put("list", optionsVOS);
+    }
 }

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

@@ -2,8 +2,12 @@ package com.fs.course.controller;
 
 import java.util.List;
 
+import com.fs.common.core.domain.R;
+import com.fs.course.domain.FsUserCoursePeriodDays;
+import com.fs.course.service.IFsUserCoursePeriodDaysService;
 import com.fs.course.vo.FsUserCoursePeriodVO;
 import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,11 +34,11 @@ import com.fs.common.core.page.TableDataInfo;
  * @date 2025-04-11
  */
 @RestController
+@AllArgsConstructor
 @RequestMapping("/course/period")
-public class FsUserCoursePeriodController extends BaseController
-{
-    @Autowired
-    private IFsUserCoursePeriodService fsUserCoursePeriodService;
+public class FsUserCoursePeriodController extends BaseController {
+    private final IFsUserCoursePeriodService fsUserCoursePeriodService;
+    private final IFsUserCoursePeriodDaysService fsUserCoursePeriodDaysService;
 
     /**
      * 查询会员营期列表
@@ -112,4 +116,20 @@ public class FsUserCoursePeriodController extends BaseController
     {
         return toAjax(fsUserCoursePeriodService.deleteFsUserCoursePeriodByIds(periodIds));
     }
+
+    @GetMapping("/getDays")
+    public TableDataInfo getDays(FsUserCoursePeriodDays fsUserCoursePeriodDays){
+        startPage();
+        List<FsUserCoursePeriodDays> list = fsUserCoursePeriodDaysService.selectFsUserCoursePeriodDaysList(fsUserCoursePeriodDays);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/addCourse")
+    public R addCourse(@RequestBody FsUserCoursePeriodDays entity){
+        return fsUserCoursePeriodDaysService.addCourse(entity);
+    }
+    @PostMapping("/updateListCourseData")
+    public R updateListCourseData(@RequestBody List<FsUserCoursePeriodDays> entity){
+        return fsUserCoursePeriodDaysService.updateListCourseData(entity);
+    }
 }

fs-service-generator/src/main/resources/vm/java/controller.java.vm

@@ -76,7 +76,7 @@ public class ${ClassName}Controller extends BaseController
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {
-        return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}));
+        return AjaxResult.success(${className}Service.select${ClassName}ById(${pkColumn.javaField}));
     }
 
     /**
@@ -109,6 +109,6 @@ public class ${ClassName}Controller extends BaseController
 	@DeleteMapping("/{${pkColumn.javaField}s}")
     public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
-        return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s));
+        return toAjax(${className}Service.delete${ClassName}ByIds(${pkColumn.javaField}s));
     }
 }

fs-service-generator/src/main/resources/vm/java/mapper.java.vm

@@ -20,7 +20,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>{
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -52,7 +52,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>{
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 批量删除${functionName}
@@ -60,7 +60,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>{
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 #if($table.sub)
 
     /**
@@ -69,7 +69,7 @@ public interface ${ClassName}Mapper extends BaseMapper<${ClassName}>{
      * @param ${pkColumn.javaField}s 需要删除的数据主键集合
      * @return 结果
      */
-    int delete${subClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${subClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
     
     /**
      * 批量新增${subTable.functionName}

fs-service-generator/src/main/resources/vm/java/service.java.vm

@@ -17,7 +17,7 @@ public interface I${ClassName}Service extends IService<${ClassName}>{
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return ${functionName}
      */
-    ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
 
     /**
      * 查询${functionName}列表
@@ -49,7 +49,7 @@ public interface I${ClassName}Service extends IService<${ClassName}>{
      * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
      * @return 结果
      */
-    int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s);
+    int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s);
 
     /**
      * 删除${functionName}信息
@@ -57,5 +57,5 @@ public interface I${ClassName}Service extends IService<${ClassName}>{
      * @param ${pkColumn.javaField} ${functionName}主键
      * @return 结果
      */
-    int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField});
+    int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField});
 }

fs-service-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -37,9 +37,9 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
     {
-        return baseMapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return baseMapper.select${ClassName}ById(${pkColumn.javaField});
     }
 
     /**
@@ -98,7 +98,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
 #end
 #end
 #if($table.sub)
-        baseMapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}());
+        baseMapper.delete${subClassName}By${subTableFkClassName}(${className}.getId());
         insert${subClassName}(${className});
 #end
         return baseMapper.update${ClassName}(${className});
@@ -114,12 +114,12 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     @Transactional
 #end
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s)
+    public int delete${ClassName}ByIds(${pkColumn.javaType}[] ${pkColumn.javaField}s)
     {
 #if($table.sub)
         baseMapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s);
 #end
-        return baseMapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s);
+        return baseMapper.delete${ClassName}ByIds(${pkColumn.javaField}s);
     }
 
     /**
@@ -129,12 +129,12 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
      * @return 结果
      */
     @Override
-    public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField})
+    public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
     {
 #if($table.sub)
         baseMapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField});
 #end
-        return baseMapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField});
+        return baseMapper.delete${ClassName}ById(${pkColumn.javaField});
     }
 #if($table.sub)
 
@@ -146,7 +146,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
     public void insert${subClassName}(${ClassName} ${className})
     {
         List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List();
-        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}();
+        ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.getId();
         if (StringUtils.isNotNull(${subclassName}List))
         {
             List<${subClassName}> list = new ArrayList<${subClassName}>();

fs-service-generator/src/main/resources/vm/java/sub-domain.java.vm

@@ -0,0 +1,73 @@
+package ${packageName}.domain;
+
+#foreach ($import in $subImportList)
+import ${import};
+#end
+import com.fs.common.annotation.Excel;
+
+/**
+ * ${subTable.functionName}对象 ${subTableName}
+ * 
+ * @author ${author}
+ * @date ${datetime}
+ */
+public class ${subClassName} extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+    /** $column.columnComment */
+#if($column.list)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#if($parentheseIndex != -1)
+    @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
+#elseif($column.javaType == 'Date')
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd")
+#else
+    @Excel(name = "${comment}")
+#end
+#end
+    private $column.javaType $column.javaField;
+
+#end
+#end
+#foreach ($column in $subTable.columns)
+#if(!$table.isSuperColumn($column.javaField))
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+    public void set${AttrName}($column.javaType $column.javaField) 
+    {
+        this.$column.javaField = $column.javaField;
+    }
+
+    public $column.javaType get${AttrName}() 
+    {
+        return $column.javaField;
+    }
+#end
+#end
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+#foreach ($column in $subTable.columns)
+#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
+#set($AttrName=$column.javaField)
+#else
+#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+#end
+            .append("${column.javaField}", get${AttrName}())
+#end
+            .toString();
+    }
+}

fs-service-generator/src/main/resources/vm/xml/mapper.xml.vm

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="select${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
+    <select id="select${ClassName}ById" parameterType="${pkColumn.javaType}" resultMap="#if($table.sub)${ClassName}${subClassName}Result#else${ClassName}Result#end">
 #if($table.crud || $table.tree)
         <include refid="select${ClassName}Vo"/>
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
@@ -102,11 +102,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where ${pkColumn.columnName} = #{${pkColumn.javaField}}
     </update>
 
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}" parameterType="${pkColumn.javaType}">
+    <delete id="delete${ClassName}ById" parameterType="${pkColumn.javaType}">
         delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}}
     </delete>
 
-    <delete id="delete${ClassName}By${pkColumn.capJavaField}s" parameterType="String">
+    <delete id="delete${ClassName}ByIds" parameterType="String">
         delete from ${tableName} where ${pkColumn.columnName} in 
         <foreach item="${pkColumn.javaField}" collection="array" open="(" separator="," close=")">
             #{${pkColumn.javaField}}

fs-service-system/src/main/java/com/fs/company/domain/CompanyRedPackageLogs.java

@@ -3,6 +3,7 @@ package com.fs.company.domain;
 import java.math.BigDecimal;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fs.common.annotation.Excel;
 import lombok.Data;
@@ -67,5 +68,8 @@ public class CompanyRedPackageLogs extends BaseEntity{
     @Excel(name = "拒绝图片")
     private String rejectImages;
 
+    @TableField(exist = false)
+    private String companyName;
+
 
 }

fs-service-system/src/main/java/com/fs/company/vo/CompanyVO.java

@@ -73,6 +73,7 @@ public class CompanyVO implements Serializable
     private Integer limitUserCount;
 
     private Integer voiceCallerNumber;
+    private Integer redPackageMoney;
 
 
 

fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriod.java

@@ -1,10 +1,14 @@
 package com.fs.course.domain;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +18,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author fs
  * @date 2025-04-15
  */
+@Data
 public class FsUserCoursePeriod
 {
     private static final long serialVersionUID = 1L;
@@ -27,19 +32,7 @@ public class FsUserCoursePeriod
 
     /** 公司id */
     @Excel(name = "公司id")
-    private Long companyId;
-
-    /** 公司id */
-    @Excel(name = "公司id,多个用逗号隔开")
-    private List<Long> companyIdList;
-
-    /** 课程id */
-    @Excel(name = "课程id")
-    private Long courseId;
-
-    /** 视频id */
-    @Excel(name = "视频id")
-    private Long videoId;
+    private String companyId;
 
     /** 训练营id */
     @Excel(name = "训练营id")
@@ -48,12 +41,12 @@ public class FsUserCoursePeriod
     /** 创建时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "创建时间")
-    private Date createTime;
+    private LocalDateTime createTime;
 
     /** 更新时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "更新时间")
-    private Date updateTime;
+    private LocalDateTime updateTime;
 
     /** 课程风格url */
     @Excel(name = "课程风格url")
@@ -74,163 +67,13 @@ public class FsUserCoursePeriod
     /** 开营日期-开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date periodStartingTime;
+    private LocalDate periodStartingTime;
 
     /** 开营日期-结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date periodEndTime;
-
-    public void setPeriodId(Long periodId)
-    {
-        this.periodId = periodId;
-    }
-
-    public Long getPeriodId()
-    {
-        return periodId;
-    }
-    public void setPeriodName(String periodName)
-    {
-        this.periodName = periodName;
-    }
-
-    public String getPeriodName()
-    {
-        return periodName;
-    }
-    public void setCompanyId(Long companyId)
-    {
-        this.companyId = companyId;
-    }
-
-    public Long getCompanyId()
-    {
-        return companyId;
-    }
-    public void setCourseId(Long courseId)
-    {
-        this.courseId = courseId;
-    }
-
-    public List<Long> getCompanyIdList() {
-        return companyIdList;
-    }
-
-    public void setCompanyIdList(List<Long> companyIdList) {
-        this.companyIdList = companyIdList;
-    }
-
-    public Long getCourseId()
-    {
-        return courseId;
-    }
-    public void setVideoId(Long videoId)
-    {
-        this.videoId = videoId;
-    }
-
-    public Long getVideoId()
-    {
-        return videoId;
-    }
-    public void setTrainingCampId(Long trainingCampId)
-    {
-        this.trainingCampId = trainingCampId;
-    }
-
-    public Long getTrainingCampId()
-    {
-        return trainingCampId;
-    }
-    public void setCourseStyle(String courseStyle)
-    {
-        this.courseStyle = courseStyle;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getCourseStyle()
-    {
-        return courseStyle;
-    }
-    public void setLiveRoomStyle(String liveRoomStyle)
-    {
-        this.liveRoomStyle = liveRoomStyle;
-    }
-
-    public String getLiveRoomStyle()
-    {
-        return liveRoomStyle;
-    }
-    public void setRedPacketGrantMethod(Long redPacketGrantMethod)
-    {
-        this.redPacketGrantMethod = redPacketGrantMethod;
-    }
-
-    public Long getRedPacketGrantMethod()
-    {
-        return redPacketGrantMethod;
-    }
-    public void setPeriodType(Long periodType)
-    {
-        this.periodType = periodType;
-    }
-
-    public Long getPeriodType()
-    {
-        return periodType;
-    }
-    public void setPeriodStartingTime(Date periodStartingTime)
-    {
-        this.periodStartingTime = periodStartingTime;
-    }
-
-    public Date getPeriodStartingTime()
-    {
-        return periodStartingTime;
-    }
-    public void setPeriodEndTime(Date periodEndTime)
-    {
-        this.periodEndTime = periodEndTime;
-    }
-
-    public Date getPeriodEndTime()
-    {
-        return periodEndTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("periodId", getPeriodId())
-            .append("periodName", getPeriodName())
-            .append("companyId", getCompanyId())
-            .append("courseId", getCourseId())
-            .append("videoId", getVideoId())
-            .append("trainingCampId", getTrainingCampId())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .append("courseStyle", getCourseStyle())
-            .append("liveRoomStyle", getLiveRoomStyle())
-            .append("redPacketGrantMethod", getRedPacketGrantMethod())
-            .append("periodType", getPeriodType())
-            .append("periodStartingTime", getPeriodStartingTime())
-            .append("periodEndTime", getPeriodEndTime())
-            .toString();
-    }
+    private LocalDate periodEndTime;
+
+    @TableField(exist = false)
+    private List<String> companyIdList;
 }

fs-service-system/src/main/java/com/fs/course/domain/FsUserCoursePeriodDays.java

@@ -0,0 +1,73 @@
+package com.fs.course.domain;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fs.common.annotation.Excel;
+import com.fs.common.core.domain.BaseEntityTow;
+import lombok.Data;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 营期课程对象 fs_user_course_period_days
+ *
+ * @author fs
+ * @date 2025-04-16
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class FsUserCoursePeriodDays extends BaseEntityTow {
+
+    /** id */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /** 营期ID */
+    @Excel(name = "营期ID")
+    private Long periodId;
+
+    /** 第几节课 */
+    @Excel(name = "第几节课")
+    private Integer lesson;
+
+    /** 开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime startDateTime;
+
+    /** 结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime endDateTime;
+
+    /** 课程ID */
+    @Excel(name = "课程ID")
+    private Long courseId;
+
+    /** 视频ID */
+    @Excel(name = "视频ID")
+    private Long videoId;
+
+    /** 红包金额 */
+    @Excel(name = "红包金额")
+    private BigDecimal money;
+
+    /** 开课状态;0未开始1一开始2已结束 */
+    @Excel(name = "开课状态;0未开始1一开始2已结束")
+    private Integer status;
+
+    @TableField(exist = false)
+    private List<Long> videoIds;
+    @TableField(exist = false)
+    private String courseName;
+    @TableField(exist = false)
+    private String videoName;
+}

fs-service-system/src/main/java/com/fs/course/mapper/FsUserCoursePeriodDaysMapper.java

@@ -0,0 +1,61 @@
+package com.fs.course.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.course.domain.FsUserCoursePeriodDays;
+
+/**
+ * 营期课程Mapper接口
+ * 
+ * @author fs
+ * @date 2025-04-16
+ */
+public interface FsUserCoursePeriodDaysMapper extends BaseMapper<FsUserCoursePeriodDays>{
+    /**
+     * 查询营期课程
+     * 
+     * @param id 营期课程主键
+     * @return 营期课程
+     */
+    FsUserCoursePeriodDays selectFsUserCoursePeriodDaysById(Long id);
+
+    /**
+     * 查询营期课程列表
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 营期课程集合
+     */
+    List<FsUserCoursePeriodDays> selectFsUserCoursePeriodDaysList(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 新增营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    int insertFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 修改营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    int updateFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 删除营期课程
+     * 
+     * @param id 营期课程主键
+     * @return 结果
+     */
+    int deleteFsUserCoursePeriodDaysById(Long id);
+
+    /**
+     * 批量删除营期课程
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    int deleteFsUserCoursePeriodDaysByIds(Long[] ids);
+}

fs-service-system/src/main/java/com/fs/course/service/IFsUserCoursePeriodDaysService.java

@@ -0,0 +1,66 @@
+package com.fs.course.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.common.core.domain.R;
+import com.fs.course.domain.FsUserCoursePeriodDays;
+
+/**
+ * 营期课程Service接口
+ * 
+ * @author fs
+ * @date 2025-04-16
+ */
+public interface IFsUserCoursePeriodDaysService extends IService<FsUserCoursePeriodDays>{
+    /**
+     * 查询营期课程
+     * 
+     * @param id 营期课程主键
+     * @return 营期课程
+     */
+    FsUserCoursePeriodDays selectFsUserCoursePeriodDaysById(Long id);
+
+    /**
+     * 查询营期课程列表
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 营期课程集合
+     */
+    List<FsUserCoursePeriodDays> selectFsUserCoursePeriodDaysList(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 新增营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    int insertFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 修改营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    int updateFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays);
+
+    /**
+     * 批量删除营期课程
+     * 
+     * @param ids 需要删除的营期课程主键集合
+     * @return 结果
+     */
+    int deleteFsUserCoursePeriodDaysByIds(Long[] ids);
+
+    /**
+     * 删除营期课程信息
+     * 
+     * @param id 营期课程主键
+     * @return 结果
+     */
+    int deleteFsUserCoursePeriodDaysById(Long id);
+
+    R addCourse(FsUserCoursePeriodDays entity);
+
+    R updateListCourseData(List<FsUserCoursePeriodDays> entity);
+}

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -0,0 +1,145 @@
+package com.fs.course.service.impl;
+
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fs.common.core.domain.R;
+import com.fs.common.exception.base.BaseException;
+import com.fs.common.utils.DateUtils;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.utils.date.DateUtil;
+import com.fs.common.utils.date.TimeTypeEnum;
+import com.fs.course.domain.FsUserCoursePeriod;
+import com.fs.course.mapper.FsUserCoursePeriodMapper;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+import com.fs.course.mapper.FsUserCoursePeriodDaysMapper;
+import com.fs.course.domain.FsUserCoursePeriodDays;
+import com.fs.course.service.IFsUserCoursePeriodDaysService;
+
+/**
+ * 营期课程Service业务层处理
+ * 
+ * @author fs
+ * @date 2025-04-16
+ */
+@Service
+@AllArgsConstructor
+public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCoursePeriodDaysMapper, FsUserCoursePeriodDays> implements IFsUserCoursePeriodDaysService {
+
+    private final FsUserCoursePeriodMapper fsUserCoursePeriodMapper;
+
+    /**
+     * 查询营期课程
+     * 
+     * @param id 营期课程主键
+     * @return 营期课程
+     */
+    @Override
+    public FsUserCoursePeriodDays selectFsUserCoursePeriodDaysById(Long id)
+    {
+        return baseMapper.selectFsUserCoursePeriodDaysById(id);
+    }
+
+    /**
+     * 查询营期课程列表
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 营期课程
+     */
+    @Override
+    public List<FsUserCoursePeriodDays> selectFsUserCoursePeriodDaysList(FsUserCoursePeriodDays fsUserCoursePeriodDays)
+    {
+        return baseMapper.selectFsUserCoursePeriodDaysList(fsUserCoursePeriodDays);
+    }
+
+    /**
+     * 新增营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    @Override
+    public int insertFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays)
+    {
+        fsUserCoursePeriodDays.setCreateTime(DateUtils.getNowDate());
+        return baseMapper.insert(fsUserCoursePeriodDays);
+    }
+
+    /**
+     * 修改营期课程
+     * 
+     * @param fsUserCoursePeriodDays 营期课程
+     * @return 结果
+     */
+    @Override
+    public int updateFsUserCoursePeriodDays(FsUserCoursePeriodDays fsUserCoursePeriodDays)
+    {
+        fsUserCoursePeriodDays.setUpdateTime(DateUtils.getNowDate());
+        return baseMapper.updateById(fsUserCoursePeriodDays);
+    }
+
+    /**
+     * 批量删除营期课程
+     * 
+     * @param ids 需要删除的营期课程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFsUserCoursePeriodDaysByIds(Long[] ids)
+    {
+        return baseMapper.deleteFsUserCoursePeriodDaysByIds(ids);
+    }
+
+    /**
+     * 删除营期课程信息
+     * 
+     * @param id 营期课程主键
+     * @return 结果
+     */
+    @Override
+    public int deleteFsUserCoursePeriodDaysById(Long id)
+    {
+        return baseMapper.deleteFsUserCoursePeriodDaysById(id);
+    }
+
+    @Override
+    public R addCourse(FsUserCoursePeriodDays entity) {
+        FsUserCoursePeriod period = fsUserCoursePeriodMapper.selectFsUserCoursePeriodById(entity.getPeriodId());
+        int num = count(new QueryWrapper<FsUserCoursePeriodDays>().eq("period_id", period.getPeriodId()));
+        long days;
+        if(period.getPeriodType() == 2){
+            days = 1;
+        }else{
+            days = DateUtil.differenceTime(period.getPeriodStartingTime(), period.getPeriodEndTime(), TimeTypeEnum.DAY);
+        }
+        if(num + entity.getVideoIds().size() > days) return R.error("课程不能超过营期范围");
+        AtomicInteger i = new AtomicInteger(1);
+        List<FsUserCoursePeriodDays> collect = entity.getVideoIds().stream().map(e -> {
+            FsUserCoursePeriodDays day = new FsUserCoursePeriodDays();
+            day.setPeriodId(entity.getPeriodId());
+            day.setLesson(num + i.getAndIncrement());
+            day.setCourseId(entity.getCourseId());
+            day.setVideoId(e);
+            day.setCreateTime(new Date());
+            return day;
+        }).collect(Collectors.toList());
+        super.saveBatch(collect);
+        return R.ok();
+    }
+
+    @Override
+    public R updateListCourseData(List<FsUserCoursePeriodDays> entity) {
+        List<FsUserCoursePeriodDays> collect = entity.stream().map(e -> {
+            FsUserCoursePeriodDays day = new FsUserCoursePeriodDays();
+            day.setId(e.getId());
+            day.setMoney(e.getMoney());
+            return day;
+        }).collect(Collectors.toList());
+        super.updateBatchById(collect);
+        return R.ok();
+    }
+}

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.course.service.impl;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import com.fs.common.utils.DateUtils;
 import com.fs.course.vo.FsUserCoursePeriodVO;
@@ -54,7 +55,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
     @Override
     public int insertFsUserCoursePeriod(FsUserCoursePeriod fsUserCoursePeriod)
     {
-        fsUserCoursePeriod.setCreateTime(DateUtils.getNowDate());
+        fsUserCoursePeriod.setCreateTime(LocalDateTime.now());
         return fsUserCoursePeriodMapper.insertFsUserCoursePeriod(fsUserCoursePeriod);
     }
 
@@ -67,7 +68,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
     @Override
     public int updateFsUserCoursePeriod(FsUserCoursePeriod fsUserCoursePeriod)
     {
-        fsUserCoursePeriod.setUpdateTime(DateUtils.getNowDate());
+        fsUserCoursePeriod.setUpdateTime(LocalDateTime.now());
         return fsUserCoursePeriodMapper.updateFsUserCoursePeriod(fsUserCoursePeriod);
     }
 

fs-service-system/src/main/java/com/fs/course/vo/FsUserCoursePeriodVO.java

@@ -5,6 +5,7 @@ import com.fs.common.annotation.Excel;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -24,7 +25,7 @@ public class FsUserCoursePeriodVO implements Serializable {
 
     /** 公司id */
     @Excel(name = "公司id")
-    private Long companyId;
+    private String companyId;
 
     @Excel(name = "公司名称")
     private Long companyName;
@@ -74,11 +75,11 @@ public class FsUserCoursePeriodVO implements Serializable {
     /** 开营日期-开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-开始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date periodStartingTime;
+    private LocalDate periodStartingTime;
 
     /** 开营日期-结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "开营日期-结束时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date periodEndTime;
+    private LocalDate periodEndTime;
 
 }

fs-service-system/src/main/java/com/fs/sop/params/SendSopParamDetailsC.java

@@ -10,7 +10,7 @@ public class SendSopParamDetailsC {
 
     private List<QwSopLogsDoSendListTVO> sendList;
 
-    private Integer type;//下一个外部联系人ID
+    private Integer type;//
     private String nextExternalUserId;//下一个外部联系人ID
     private Long nextExternalId;//下一个外部联系人ID
     private String appKey;

fs-service-system/src/main/java/com/fs/sop/service/impl/QwSopLogsServiceImpl.java

@@ -589,7 +589,6 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
             Long qwId=qwUser.getId();
 
             sopParamDetailsC.setAppKey(qwUser.getAppKey());
-            sopParamDetailsC.setType(0);
 
             // 客户的信息
             QwExternalContactHParam contactHParam = new QwExternalContactHParam();
@@ -622,7 +621,6 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                             }
                             break;
                         case 6:
-                            sopParamDetailsC.setType(1);
                             sendJsApiList.add(log);
                             break;
                         default:
@@ -754,6 +752,7 @@ public class QwSopLogsServiceImpl implements IQwSopLogsService
                 }
                 sopParamDetailsC.setNextExternalUserId(qwSopLogsByJsApiNext.getExternalUserId().trim());
                 sopParamDetailsC.setNextExternalId(qwSopLogsByJsApiNext.getExternalId());
+                sopParamDetailsC.setType(qwSopLogsByJsApiNext.getSendType() == 6 ? 1 : 0);
             }
 
             sopParamDetailsC.setSendList(new ArrayList<>(sendJsApiList));

fs-service-system/src/main/resources/mapper/company/CompanyRedPackageLogsMapper.xml

@@ -28,20 +28,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select id, company_id, operate_type, type, up_money, handl_money, handl_pri, money, status, images, reject_memo, reject_images, create_time, create_by, update_by, update_time, remark from company_red_package_logs
     </sql>
 
-    <select id="selectCompanyRedPackageLogsList" parameterType="CompanyRedPackageLogs" resultMap="CompanyRedPackageLogsResult">
-        <include refid="selectCompanyRedPackageLogsVo"/>
+    <select id="selectCompanyRedPackageLogsList" parameterType="CompanyRedPackageLogs" resultType="CompanyRedPackageLogs">
+        select a.*,b.company_name from company_red_package_logs a inner join company b on a.company_id = b.company_id
         <where>  
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="operateType != null "> and operate_type = #{operateType}</if>
-            <if test="type != null "> and type = #{type}</if>
-            <if test="upMoney != null "> and up_money = #{upMoney}</if>
-            <if test="handlMoney != null "> and handl_money = #{handlMoney}</if>
-            <if test="handlPri != null "> and handl_pri = #{handlPri}</if>
-            <if test="money != null "> and money = #{money}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="images != null  and images != ''"> and images = #{images}</if>
-            <if test="rejectMemo != null  and rejectMemo != ''"> and reject_memo = #{rejectMemo}</if>
-            <if test="rejectImages != null  and rejectImages != ''"> and reject_images = #{rejectImages}</if>
+            <if test="companyId != null "> and a.company_id = #{companyId}</if>
+            <if test="operateType != null "> and a.operate_type = #{operateType}</if>
+            <if test="type != null "> and a.type = #{type}</if>
+            <if test="upMoney != null "> and a.up_money = #{upMoney}</if>
+            <if test="handlMoney != null "> and a.handl_money = #{handlMoney}</if>
+            <if test="handlPri != null "> and a.handl_pri = #{handlPri}</if>
+            <if test="money != null "> and a.money = #{money}</if>
+            <if test="status != null "> and a.status = #{status}</if>
+            <if test="images != null  and images != ''"> and a.images = #{images}</if>
+            <if test="rejectMemo != null  and rejectMemo != ''"> and a.reject_memo = #{rejectMemo}</if>
+            <if test="rejectImages != null  and rejectImages != ''"> and a.reject_images = #{rejectImages}</if>
         </where>
         order by create_time desc
     </select>

fs-service-system/src/main/resources/mapper/course/FsUserCoursePeriodDaysMapper.xml

@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.course.mapper.FsUserCoursePeriodDaysMapper">
+    
+    <resultMap type="FsUserCoursePeriodDays" id="FsUserCoursePeriodDaysResult">
+        <result property="id"    column="id"    />
+        <result property="periodId"    column="period_id"    />
+        <result property="lesson"    column="lesson"    />
+        <result property="startDateTime"    column="start_date_time"    />
+        <result property="endDateTime"    column="end_date_time"    />
+        <result property="courseId"    column="course_id"    />
+        <result property="videoId"    column="video_id"    />
+        <result property="money"    column="money"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectFsUserCoursePeriodDaysVo">
+        select * from fs_user_course_period_days
+    </sql>
+
+    <select id="selectFsUserCoursePeriodDaysList" parameterType="FsUserCoursePeriodDays" resultType="FsUserCoursePeriodDays">
+        select a.*,b.course_name,c.title videoName from fs_user_course_period_days a
+        inner join fs_user_course b on a.course_id = b.course_id
+        inner join fs_user_course_video c on a.video_id = c.video_id
+        <where>
+            <if test="periodId != null "> and period_id = #{periodId}</if>
+            <if test="courseId != null "> and course_id = #{courseId}</if>
+            <if test="videoId != null "> and video_id = #{videoId}</if>
+        </where>
+    </select>
+    
+    <select id="selectFsUserCoursePeriodDaysById" parameterType="Long" resultMap="FsUserCoursePeriodDaysResult">
+        <include refid="selectFsUserCoursePeriodDaysVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertFsUserCoursePeriodDays" parameterType="FsUserCoursePeriodDays" useGeneratedKeys="true" keyProperty="id">
+        insert into fs_user_course_period_days
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="periodId != null">period_id,</if>
+            <if test="lesson != null">lesson,</if>
+            <if test="startTime != null">start_time,</if>
+            <if test="endTime != null">end_time,</if>
+            <if test="courseId != null">course_id,</if>
+            <if test="videoId != null">video_id,</if>
+            <if test="money != null">money,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="periodId != null">#{periodId},</if>
+            <if test="lesson != null">#{lesson},</if>
+            <if test="startTime != null">#{startTime},</if>
+            <if test="endTime != null">#{endTime},</if>
+            <if test="courseId != null">#{courseId},</if>
+            <if test="videoId != null">#{videoId},</if>
+            <if test="money != null">#{money},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateFsUserCoursePeriodDays" parameterType="FsUserCoursePeriodDays">
+        update fs_user_course_period_days
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="periodId != null">period_id = #{periodId},</if>
+            <if test="lesson != null">lesson = #{lesson},</if>
+            <if test="startTime != null">start_time = #{startTime},</if>
+            <if test="endTime != null">end_time = #{endTime},</if>
+            <if test="courseId != null">course_id = #{courseId},</if>
+            <if test="videoId != null">video_id = #{videoId},</if>
+            <if test="money != null">money = #{money},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteFsUserCoursePeriodDaysById" parameterType="Long">
+        delete from fs_user_course_period_days where id = #{id}
+    </delete>
+
+    <delete id="deleteFsUserCoursePeriodDaysByIds" parameterType="String">
+        delete from fs_user_course_period_days where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

fs-service-system/src/main/resources/mapper/course/FsUserCoursePeriodMapper.xml

@@ -8,8 +8,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodId"    column="period_id"    />
         <result property="periodName"    column="period_name"    />
         <result property="companyId"    column="company_id"    />
-        <result property="courseId"    column="course_id"    />
-        <result property="videoId"    column="video_id"    />
         <result property="trainingCampId"    column="training_camp_id"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -22,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserCoursePeriodVo">
-        select period_id, period_name, company_id, course_id, video_id, training_camp_id, create_time, update_time, course_style, live_room_style, red_packet_grant_method, period_type, period_starting_time, period_end_time from fs_user_course_period
+        select * from fs_user_course_period
     </sql>
 
     <select id="selectFsUserCoursePeriodList" parameterType="FsUserCoursePeriod" resultMap="FsUserCoursePeriodResult">
@@ -30,8 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="periodName != null  and periodName != ''"> and period_name like concat('%', #{periodName}, '%')</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="courseId != null "> and course_id = #{courseId}</if>
-            <if test="videoId != null "> and video_id = #{videoId}</if>
             <if test="trainingCampId != null "> and training_camp_id = #{trainingCampId}</if>
             <if test="courseStyle != null  and courseStyle != ''"> and course_style = #{courseStyle}</if>
             <if test="liveRoomStyle != null  and liveRoomStyle != ''"> and live_room_style = #{liveRoomStyle}</if>
@@ -47,8 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         period_id,
         period_name,
         fs_user_course_period.company_id,
-        course_id,
-        video_id,
         training_camp_id,
         fs_user_course_period.create_time,
         fs_user_course_period.update_time,
@@ -56,23 +50,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         live_room_style,
         red_packet_grant_method,
         period_type,
-        period_starting_time,
-        GROUP_CONCAT( company.company_name ) AS companyName
+        period_end_time,
+        period_starting_time
         FROM
         fs_user_course_period
-        LEFT JOIN company ON fs_user_course_period.company_id = company.company_id
         <where>
+            <if test="trainingCampId != null"> and training_camp_id = #{trainingCampId}</if>
             <if test="periodName != null  and periodName != ''"> and period_name like concat('%', #{periodName}, '%')</if>
-            <if test="companyIdList != null and companyIdList.size() > 0 ">
-                and fs_user_course_period.company_id in
-                <foreach item="companyId" index="index" collection="companyIdList"
-                         open="(" separator="," close=")">
-                    #{companyId}
-                </foreach>
-            </if>
             <if test="periodStartingTime != null "> and period_starting_time = #{periodStartingTime}</if>
             <if test="periodEndTime != null "> and period_end_time = #{periodEndTime}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectFsUserCoursePeriodById" parameterType="Long" resultMap="FsUserCoursePeriodResult">
@@ -86,8 +74,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">period_id,</if>
             <if test="periodName != null">period_name,</if>
             <if test="companyId != null">company_id,</if>
-            <if test="courseId != null">course_id,</if>
-            <if test="videoId != null">video_id,</if>
             <if test="trainingCampId != null">training_camp_id,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
@@ -102,8 +88,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">#{periodId},</if>
             <if test="periodName != null">#{periodName},</if>
             <if test="companyId != null">#{companyId},</if>
-            <if test="courseId != null">#{courseId},</if>
-            <if test="videoId != null">#{videoId},</if>
             <if test="trainingCampId != null">#{trainingCampId},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -121,8 +105,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="periodName != null">period_name = #{periodName},</if>
             <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="courseId != null">course_id = #{courseId},</if>
-            <if test="videoId != null">video_id = #{videoId},</if>
             <if test="trainingCampId != null">training_camp_id = #{trainingCampId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>