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

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

@@ -229,9 +229,8 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
                     LocalDate endTime = period.getPeriodEndTime();
 
                     boolean isActive = startTime != null && !startTime.isAfter(currentDate)
-                            && (endTime == null || !endTime.isBefore(currentDate));
-
-                    return isActive;
+                            && endTime != null && !endTime.isBefore(currentDate) && Long.valueOf(3).equals(period.getPeriodStatus());
+                    return !isActive;
                 })
                 .collect(Collectors.toList());
 
@@ -277,6 +276,7 @@ public class FsUserCoursePeriodServiceImpl implements IFsUserCoursePeriodService
         }
 
         fsUserCoursePeriod.setPeriodEndTime(LocalDate.now());
+        fsUserCoursePeriod.setPeriodStatus(Long.valueOf(3));
         fsUserCoursePeriodMapper.updateFsUserCoursePeriod(fsUserCoursePeriod);
 
         // 修改大于当前时间的课程状态

fs-service/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -89,6 +89,10 @@ public class FsUserPageListParam implements Serializable {
      */
     private Boolean isHidePhoneMiddle = Boolean.TRUE;
 
+    //private Integer status;  //用户状态
+    private Integer isBuy;
+    private String source;
+    private String phoneMk;
 
 }
 

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -380,6 +380,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null">
                 AND ucu.project_id = #{projectId}
             </if>
+            <if test="source != null  and source != ''">
+                and fs_user.source = #{source}
+            </if>
+            <if test="status != null  and status != ''">
+                and fs_user.status = #{status}
+            </if>
+            <if test="isBuy != null  and isBuy != ''">
+                and fs_user.is_buy = #{isBuy}
+            </if>
         </where>
         ORDER BY fs_user.create_time DESC
     </select>