提成优化，视频管理优化

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysCommision.java

@@ -9,6 +9,7 @@ import com.stdiet.common.core.domain.BaseEntity;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 业务提成比例对象 sys_commision
@@ -30,6 +31,8 @@ public class SysCommision extends BaseEntity {
      */
     private Long userId;
 
+    private List<Long> userIds;
+
     /**
      * 岗位id
      */

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysNutritionalVideo.java

@@ -32,6 +32,9 @@ public class SysNutritionalVideo extends BaseEntity
     @Excel(name = "视频封面URL")
     private String coverUrl;
 
+    //预览URL
+    private String previewUrl;
+
     /** 视频标题 */
     @Excel(name = "视频标题")
     private String title;

stdiet-custom/src/main/java/com/stdiet/custom/mapper/SysCommisionMapper.java

@@ -68,4 +68,6 @@ public interface SysCommisionMapper
      * @return
      */
     List<SysCommision> getAfterSaleAndNutri(SysCommision sysCommision);
+
+    List<Long> getAfterSaleId(SysCommision sysCommision);
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommisionService.java

@@ -62,4 +62,11 @@ public interface ISysCommisionService
     public int deleteSysCommisionById(Long ruleId);
 
     public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision);
+
+    /**
+     * 查询售后、营养师用户信息
+     * @param sysCommision
+     * @return
+     */
+    List<Long> getAfterSaleId(SysCommision sysCommision);
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/ISysCommissionDayService.java

@@ -39,4 +39,11 @@ public interface ISysCommissionDayService {
      */
     AjaxResult calculateOrderCommissionDetail(SysCommision sysCommision);
 
+    /**
+     * 根据开始生效时间分类提成比例
+     * @param tmpComList
+     * @return
+     */
+    Map<String, List<SysCommision>> getRateMapByStartTime(List<SysCommision> tmpComList);
+
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommisionServiceImpl.java

@@ -98,4 +98,14 @@ public class SysCommisionServiceImpl implements ISysCommisionService
     public List<SysCommision> selectSysCommisionDetail(SysCommision sysCommision) {
         return sysCommisionMapper.selectSysCommisionDetail(sysCommision);
     }
+
+    /**
+     * 查询售后、营养师用户信息
+     * @param sysCommision
+     * @return
+     */
+    @Override
+    public List<Long> getAfterSaleId(SysCommision sysCommision){
+        return sysCommisionMapper.getAfterSaleId(sysCommision);
+    }
 }

stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java

@@ -407,6 +407,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
      * @param tmpComList
      * @return
      */
+    @Override
     public Map<String, List<SysCommision>> getRateMapByStartTime(List<SysCommision> tmpComList){
         Map<String, List<SysCommision>> result = new TreeMap<>(new MyComparator());
         for (SysCommision sysCommision : tmpComList) {

stdiet-custom/src/main/resources/mapper/custom/SysCommisionMapper.xml

@@ -115,6 +115,12 @@
         <where>
             <if test="postId != null and postId != ''">and post_id = #{postId}</if>
             <if test="userId != null and userId != ''">and user_id = #{userId}</if>
+            <if test="userIds != null">
+                and user_id in
+                <foreach item="id" collection="userIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
         </where>
     </select>
 
@@ -213,4 +219,11 @@
         <if test="postId != null and postId != ''">and sp.post_id = #{postId}</if>
         <if test="userId != null and userId != ''">and su.user_id = #{userId}</if>
     </select>
+
+    <select id="getAfterSaleId" parameterType="SysCommision" resultType="Long">
+        SELECT su.user_id FROM sys_user su
+        LEFT JOIN sys_user_post sup ON sup.user_id = su.user_id
+        LEFT JOIN sys_post sp ON sp.post_id = sup.post_id
+        WHERE su.del_flag = 0 and sp.post_id = #{postId}
+    </select>
 </mapper>