Merge branch 'feature/1113-vipCourse' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/MemberPriceSettingsController.java

@@ -46,6 +46,7 @@ public class MemberPriceSettingsController extends BaseController {
 	@ApiOperation(value = "查询分页", notes = "传入memberPriceSettingsSearch")
 	@PreAuthorize("@pcs.hasPermissions('memberPriceSettings/list')")
 	public HttpResponseResult<PageInfo<MemberPriceSettingsVo>> page(MemberPriceSettingsSearch query) {
+		query.setSearchType("VIP,SVIP");
 		IPage<MemberPriceSettingsVo> pages = memberPriceSettingsService.selectPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(pages));
 	}

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/MemberPriceSettingsController.java

@@ -11,15 +11,10 @@ import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,14 +23,11 @@ import java.util.Map;
 @Api(tags = "会员价格设置")
 @RestController
 public class MemberPriceSettingsController extends BaseController {
-	@Autowired
+	@Resource
 	private MemberPriceSettingsService memberPriceSettingsService;
-	@Autowired
+	@Resource
 	private SysConfigService sysConfigService;
 
-	/**
-	 * 查询单条
-	 */
 	@GetMapping("/detail/{id}")
 	@ApiOperation(value = "详情", notes = "传入id")
 	public HttpResponseResult<MemberPriceSettingsVo> detail(@PathVariable("id") Long id) {
@@ -46,15 +38,11 @@ public class MemberPriceSettingsController extends BaseController {
 	@ApiOperation(value = "查询列表")
 	public HttpResponseResult<MemberPriceVo> list(@RequestBody MemberPriceSettingsSearch query) {
 		query.setStatus(true);
+		query.setSearchType("VIP,SVIP");
 		MemberPriceVo memberPriceVo = memberPriceSettingsService.getVipShare(query);
 		return succeed(memberPriceVo);
 	}
 
-
-
-    /**
-     * 查询单条
-     */
     @GetMapping("/check/{id}")
     @ApiOperation(value = "检查会员是否有效", notes = "传入id")
     public HttpResponseResult<Boolean> check(@PathVariable("id") Long id) {
@@ -67,10 +55,6 @@ public class MemberPriceSettingsController extends BaseController {
         return succeed(true);
     }
 
-
-    /**
-     * 查询单条
-     */
     @PostMapping("/checkChange")
     @ApiOperation(value = "检查会员是否有效", notes = "传入id")
     public HttpResponseResult<Boolean> checkChange(@RequestBody @Validated MemberPriceSettingsWrapper.MemberChange memberChange) {

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/StudentController.java

@@ -26,17 +26,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -50,13 +43,10 @@ public class StudentController extends BaseController {
     private StudentService studentService;
     @Resource
     private SysUserFeignService sysUserFeignService;
-
     @Resource
     private SysUserService sysUserService;
-
     @Resource
     private SmsCodeService smsCodeService;
-
     @Resource
     private SubjectService subjectService;
 
@@ -85,19 +75,15 @@ public class StudentController extends BaseController {
     @ApiOperation(value = "查询学员")
     @GetMapping("/queryUser")
     public HttpResponseResult<Student> queryUser() {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        Student student = studentService.getById(user.getId());
+        Student student = studentService.getById(sysUserService.getUserId());
         return succeed(student);
     }
 
     @ApiOperation(value = "查询学员基本信息")
     @GetMapping("/queryUserInfo")
     public HttpResponseResult<StudentHomeVo> queryUserInfo() throws Exception {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId() || (user.getDelFlag()!=null && user.getDelFlag())) {
+        SysUser user = sysUserService.getUser();
+        if (user.getDelFlag()!=null && user.getDelFlag()) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         return succeed(studentService.queryUserInfo(user));
@@ -106,12 +92,7 @@ public class StudentController extends BaseController {
     @ApiOperation(value = "设置系统默认客服")
     @GetMapping("/updateUserCustomerService")
     public HttpResponseResult<String> updateUserCustomerService() {
-
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-
+        SysUser user = sysUserService.getUser();
         return succeed(studentService.updateUserCustomerService(user));
     }
 
@@ -121,22 +102,14 @@ public class StudentController extends BaseController {
         if (StringUtil.isEmpty(subjectIds)) {
             return failed("参数不能为空");
         }
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        return status(studentService.setSubject(user.getId(), subjectIds) > 0);
+        return status(studentService.setSubject(sysUserService.getUserId(), subjectIds) > 0);
     }
 
     @ApiOperation(value = "获取声部搜索下拉框")
     @PostMapping("/querySubjectItem")
     public HttpResponseResult<List<Subject>> querySubjectItem(
             @ApiParam(value = "类型 PRACTICE 陪练课 LIVE 直播课 VIDEO 视频课 PIANO_ROOM 琴房 MUSIC 曲目 ") String type) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        List<Subject> subjects = studentService.querySubjectItem(user.getId(), type);
+        List<Subject> subjects = studentService.querySubjectItem(sysUserService.getUserId(), type);
         subjectService.convertSubject(subjects);
         return succeed(subjects);
     }
@@ -144,11 +117,7 @@ public class StudentController extends BaseController {
     @ApiOperation(value = "我的关注")
     @PostMapping(value = "/queryMyFollow")
     public HttpResponseResult<PageInfo<MyFollow>> queryMyFollow(@RequestBody QueryMyFollowSearch query) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null || sysUser.getId() == null) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        query.setUserId(sysUser.getId());
+        query.setUserId(sysUserService.getUserId());
         IPage<MyFollow> pages = studentService.queryMyFollow(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));
     }
@@ -157,11 +126,7 @@ public class StudentController extends BaseController {
     @ApiOperation(value = "实名认证", notes = "传入realNameAuthDto")
     @ResponseBody
     public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthReq realNameAuthDto) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        IdcardInfoExtractor idcardInfoExtractor = sysUserService.updateUserCard(realNameAuthDto, user,
+        IdcardInfoExtractor idcardInfoExtractor = sysUserService.updateUserCard(realNameAuthDto, sysUserService.getUser(),
                 ClientEnum.STUDENT);
         return succeed(idcardInfoExtractor);
     }
@@ -169,13 +134,10 @@ public class StudentController extends BaseController {
     @PostMapping("/logoffAccount")
     @ApiOperation(value = "注销学生账户")
     public HttpResponseResult<Boolean> logoffAccount(@RequestParam("code") String code) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
         if (StringUtils.isEmpty(code)) {
             return failed("验证码不能为空");
         }
+        SysUser user = sysUserService.getUser();
         boolean validCode = smsCodeService.verifyValidCode(user.getPhone(), code, "");
         if (!validCode) {
             return failed("验证码错误");
@@ -195,7 +157,7 @@ public class StudentController extends BaseController {
     @PostMapping("/checkPassword")
     @ApiOperation(value = "校验密码")
     public Object checkPassword(@Validated @RequestBody StudentWrapper.StudentUpdatePassword updatePassword){
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        SysUser sysUser = sysUserService.getUser();
         BCryptPasswordEncoder encoder = new BCryptPasswordEncoder();
         if(!encoder.matches(updatePassword.getPassword(),sysUser.getPassword())){
             throw new BizException("原密码错误");

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Student.java

@@ -23,48 +23,37 @@ public class Student implements Serializable {
 	private static final long serialVersionUID = 1L;
     @TableId(value = "user_id_")
     private Long userId;
-    /** 
-    * 学员声部 
-    */
+
     @ApiModelProperty("学员声部 ")
 	@TableField(value = "subject_id_")
     private String subjectId;
-    /**
-    * 会员等级 
-    */
+
     @ApiModelProperty("会员等级 ")
 	@TableField(value = "member_rank_setting_id_")
     private Long memberRankSettingId;
-    /** 
-    * 有效期开始时间 
-    */
+
     @ApiModelProperty("有效期开始时间 ")
 	@TableField(value = "membership_start_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date membershipStartTime;
-    /** 
-    * 有效期结束时间 
-    */
+
     @ApiModelProperty("有效期结束时间 ")
 	@TableField(value = "membership_end_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date membershipEndTime;
-    /** 
-    * 小酷Ai连续使用天数 
-    */
+
     @ApiModelProperty("小酷Ai连续使用天数 ")
 	@TableField(value = "cloud_study_sequence_days_")
     private Integer cloudStudySequenceDays;
-    /** 
-    * 小酷Ai最后使用日期 
-    */
+
     @ApiModelProperty("小酷Ai最后使用日期 ")
 	@TableField(value = "cloud_study_use_last_day_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date cloudStudyUseLastDay;
+
     @ApiModelProperty("锁定状态 0-正常， 1=锁定")
     @TableField(value = "lock_flag_")
     private UserLockFlag lockFlag;
@@ -89,12 +78,12 @@ public class Student implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date createTime;
+
 	@TableField(value = "update_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date updateTime;
 
-
     @ApiModelProperty("机构ID ")
     @TableField(value = "tenant_id_")
     private Long tenantId;
@@ -119,147 +108,16 @@ public class Student implements Serializable {
     @TableField(value = "im_customer_id_")
     private String imCustomerId;
 
-    public Long getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(Long tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getSubjectId() {
-        return subjectId;
-    }
-
-    public void setSubjectId(String subjectId) {
-        this.subjectId = subjectId;
-    }
-
-    public Long getMemberRankSettingId() {
-        return memberRankSettingId;
-    }
-
-    public void setMemberRankSettingId(Long memberRankSettingId) {
-        this.memberRankSettingId = memberRankSettingId;
-    }
-
-    public Date getMembershipStartTime() {
-        return membershipStartTime;
-    }
-
-    public void setMembershipStartTime(Date membershipStartTime) {
-        this.membershipStartTime = membershipStartTime;
-    }
-
-    public Date getMembershipEndTime() {
-        return membershipEndTime;
-    }
-
-    public void setMembershipEndTime(Date membershipEndTime) {
-        this.membershipEndTime = membershipEndTime;
-    }
-
-    public Integer getCloudStudySequenceDays() {
-        return cloudStudySequenceDays;
-    }
-
-    public void setCloudStudySequenceDays(Integer cloudStudySequenceDays) {
-        this.cloudStudySequenceDays = cloudStudySequenceDays;
-    }
-
-    public Date getCloudStudyUseLastDay() {
-        return cloudStudyUseLastDay;
-    }
-
-    public void setCloudStudyUseLastDay(Date cloudStudyUseLastDay) {
-        this.cloudStudyUseLastDay = cloudStudyUseLastDay;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public UserLockFlag getLockFlag() {
-        return lockFlag;
-    }
-
-    public void setLockFlag(UserLockFlag lockFlag) {
-        this.lockFlag = lockFlag;
-    }
-
-    public Long getTrainTime() {
-        return trainTime;
-    }
-
-    public void setTrainTime(Long trainTime) {
-        this.trainTime = trainTime;
-    }
-
-    public Long getEvaluateTime() {
-        return evaluateTime;
-    }
-
-    public void setEvaluateTime(Long evaluateTime) {
-        this.evaluateTime = evaluateTime;
-    }
-
-    public Long getUnionId() {
-        return unionId;
-    }
-
-    public void setUnionId(Long unionId) {
-        this.unionId = unionId;
-    }
-
-    public Integer getHideFlag() {
-        return hideFlag;
-    }
-
-    public void setHideFlag(Integer hideFlag) {
-        this.hideFlag = hideFlag;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public Long getCustomerId() {
-        return customerId;
-    }
-
-    public void setCustomerId(Long customerId) {
-        this.customerId = customerId;
-    }
+    @ApiModelProperty("折扣开始时间")
+    @TableField(value = "discount_start_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date discountStartTime;
 
-    public String getImCustomerId() {
-        return imCustomerId;
-    }
+    @ApiModelProperty("折扣结束时间")
+    @TableField(value = "discount_end_time_")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date discountEndTime;
 
-    public void setImCustomerId(String imCustomerId) {
-        this.imCustomerId = imCustomerId;
-    }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -17,6 +17,8 @@
         <result column="tenant_group_id_" property="tenantGroupId"/>
         <result column="im_device_id_" property="imDeviceId"/>
         <result column="customer_id_" property="customerId"/>
+        <result column="discount_start_time_" property="discountStartTime"/>
+        <result column="discount_end_time_" property="discountEndTime"/>
     </resultMap>
 
     <!-- 表字段 -->
@@ -25,8 +27,6 @@
         , t.subject_id_ as `subjectId`
         , t.current_grade_num_ as `currentGradeNum`
         , t.member_rank_setting_id_ as `memberRankSettingId`
-<!--        , t.membership_start_time_ as `membershipStartTime`-->
-<!--        , t.membership_end_time_ as `membershipEndTime`-->
         , t.cloud_study_sequence_days_ as `cloudStudySequenceDays`
         , t.cloud_study_use_last_day_ as `cloudStudyUseLastDay`
         , t.train_time_ as trainTime
@@ -38,6 +38,8 @@
         , t.im_device_id_ as imDeviceId
         , t.customer_id_ as customerId
         , t.im_customer_id_ AS imCustomerId
+        , t.discount_start_time_ as discountStartTime
+        , t.discount_end_time_ as discountEndTime
         </sql>
     <update id="setSubject">
         update student set subject_id_ = #{subjectIds},update_time_ = now() where user_id_ = #{id}
@@ -145,14 +147,6 @@
                     and vcr2.vip_type_ = #{param.vipType}
                 </if>
             </if>
-<!--            <if test="null != param.isVip">-->
-<!--                <if test="1 == param.isVip.code">-->
-<!--                    and t.membership_end_time_ &gt; now()-->
-<!--                </if>-->
-<!--                <if test="0 == param.isVip.code">-->
-<!--                    and (t.membership_end_time_ is null or t.membership_end_time_ &lt;= now())-->
-<!--                </if>-->
-<!--            </if>-->
             <if test="param.startTime !=null">
                 <![CDATA[AND t.create_time_ >= #{param.startTime} ]]>
             </if>
@@ -165,12 +159,6 @@
             <if test="null != param.delFlag">
                 and u.del_flag_ = #{param.delFlag}
             </if>
-<!--            <if test="null != param.vipEndTime">-->
-<!--                and vcr.end_time_ &lt;= #{param.vipEndTime}-->
-<!--            </if>-->
-<!--            <if test="null != param.vipStartTime">-->
-<!--                and vcr.end_time_ &gt;= #{param.vipStartTime}-->
-<!--            </if>-->
             <if test="param.trainFlag != null">
                 AND t.train_time_ > 0
             </if>