Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysUserCashAccountServiceImpl.java

@@ -65,15 +65,7 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
 			throw new BizException("用户[{}]现金账户不存在", userId);
 		}
 
-		if (cashAccount.getStatus() != PlatformCashAccountStatusEnum.NORMAL) {
-			throw new BizException("账户不可用");
-		}
-		BigDecimal balance = cashAccount.getCourseBalance().add(decimal);
-		if (balance.doubleValue() < 0) {
-			throw new BizException("现金账户[{}]余额不足，可用余额剩{}元", userId, cashAccount.getCourseBalance().doubleValue());
-		}
-
-		cashAccount.setCourseBalance(balance);
+		cashAccount.setCourseBalance(decimal);
 		cashAccount.setUpdateTime(new Date());
 
 		sysUserCashAccountDao.update(cashAccount);

mec-biz/src/main/resources/config/mybatis/VipGroupMapper.xml

@@ -108,9 +108,9 @@
             vgc.name_ vip_group_category_
         FROM
             class_group_student_mapper cgsm
-            LEFT JOIN vip_group vg ON vgcgm.vip_group_id_=vg.id_
+            LEFT JOIN vip_group vg ON cgsm.music_group_id_=vg.id_
             LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
-        WHERE cgsm.music_group_id_=vg.id_ AND cgsm.user_id_=#{userId}
+        WHERE cgsm.music_group_id_=vg.id_ AND cgsm.user_id_=#{userId} AND cgsm.group_type_ = 'VIP'
     </select>
 
     <!-- 全查询 -->