Merge branch 'master' of http://git.dayaedu.com/yonge/mec

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentWithdraw.java

@@ -1,12 +1,13 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.biz.dal.enums.DealStatusEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
-import java.math.BigDecimal;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.DealStatusEnum;
 
 /**
  * 对应数据库表(student_withdraw):
@@ -23,10 +24,6 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "用户编号",required = false)
 	private Integer userId;
 
-	/** 用户编号 */
-	@ApiModelProperty(value = "用户名",required = false)
-	private String realName;
-	
 	/** 银行卡号 */
 	@ApiModelProperty(value = "银行卡号",required = false)
 	private String bankCardNo;
@@ -43,10 +40,6 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "提现金额",required = false)
 	private BigDecimal amount;
 
-	/** 提现金额 */
-	@ApiModelProperty(value = "可用余额",required = false)
-	private BigDecimal balance;
-	
 	/** 用户承担的费用（单位：分） */
 	@ApiModelProperty(value = "用户承担的费用",required = false)
 	private BigDecimal feeUser;
@@ -63,50 +56,30 @@ public class StudentWithdraw {
 	@ApiModelProperty(value = "备注",required = false)
 	private String comment;
 
-	/** 描述 */
-	@ApiModelProperty(value = "支付渠道",required = false)
-	private String channel;
-
-	/** 备注 */
-	@ApiModelProperty(value = "平台账户号",required = false)
-	private String platformAccountNo;
-	
 	/** 创建时间 */
 	private java.util.Date createTime;
 	
 	/** 修改时间 */
 	private java.util.Date modifyTime;
+	
+	private SysUserCashAccountDetail detail = new SysUserCashAccountDetail();
+	
+	private SysUser user = new SysUser();
 
-	public String getRealName() {
-		return realName;
-	}
-
-	public void setRealName(String realName) {
-		this.realName = realName;
-	}
-
-	public BigDecimal getBalance() {
-		return balance;
-	}
-
-	public void setBalance(BigDecimal balance) {
-		this.balance = balance;
-	}
-
-	public String getChannel() {
-		return channel;
+	public SysUser getUser() {
+		return user;
 	}
 
-	public void setChannel(String channel) {
-		this.channel = channel;
+	public void setUser(SysUser user) {
+		this.user = user;
 	}
 
-	public String getPlatformAccountNo() {
-		return platformAccountNo;
+	public SysUserCashAccountDetail getDetail() {
+		return detail;
 	}
 
-	public void setPlatformAccountNo(String platformAccountNo) {
-		this.platformAccountNo = platformAccountNo;
+	public void setDetail(SysUserCashAccountDetail detail) {
+		this.detail = detail;
 	}
 
 	public String getWithdrawNo() {

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysUserCashAccountDetail.java

@@ -2,8 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.DealStatusEnum;
 import com.ym.mec.biz.dal.enums.PlatformCashAccountDetailTypeEnum;
-
 import com.ym.mec.biz.dal.enums.TransTypeEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -63,6 +63,14 @@ public class SysUserCashAccountDetail {
 
 	private String attribute;
 
+	/** 描述 */
+	@ApiModelProperty(value = "支付渠道",required = false)
+	private String channel;
+
+	/** 备注 */
+	@ApiModelProperty(value = "平台账户号",required = false)
+	private String platformAccountNo;
+
 	public String getAttribute() {
 		return attribute;
 	}
@@ -167,6 +175,22 @@ public class SysUserCashAccountDetail {
 		this.transType = transType;
 	}
 
+	public String getChannel() {
+		return channel;
+	}
+
+	public void setChannel(String channel) {
+		this.channel = channel;
+	}
+
+	public String getPlatformAccountNo() {
+		return platformAccountNo;
+	}
+
+	public void setPlatformAccountNo(String platformAccountNo) {
+		this.platformAccountNo = platformAccountNo;
+	}
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -12,8 +12,6 @@ import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
-import org.snaker.engine.access.Page;
 
 import java.util.List;
 
@@ -303,4 +301,13 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      */
     List<HighClassGroupDto> findClassGroupByMusicGroupIdAndSubjectId(String musicGroupId,Integer subjectId);
-}
+
+    /**
+     * @describe 批量更新指定班级人数
+     * @author Joburgess
+     * @date 2019/11/12
+     * @param classGroupIds: 班级编号列表
+     * @return int
+     */
+    int batchUpdateClassCourseTimes(List<Integer> classGroupIds);
+}

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

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.service.impl;
 
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
@@ -450,7 +449,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
 
                 if(musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)){
-                    courseType = "CLASSROOM_SALARY";
+                    courseType = "CLASSROOM";
                 }
 
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
@@ -1628,4 +1627,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         }
         return highClassGroupList;
     }
+
+    @Override
+    public int batchUpdateClassCourseTimes(List<Integer> classGroupIds) {
+
+        return 0;
+    }
 }

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

@@ -82,7 +82,6 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 		studentWithdraw.setModifyTime(date);
 		studentWithdraw.setStatus(status);
 		studentWithdraw.setTransNo(transNo);
-		studentWithdraw.setPlatformAccountNo(platformAccountNo);
 
 		studentWithdrawDao.update(studentWithdraw);
 
@@ -113,6 +112,7 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 			sysUserCashAccountDetail.setTransNo(transNo);
 			sysUserCashAccountDetail.setTransType(transType);
 			sysUserCashAccountDetail.setBalance(sysUserCashAccount.getBalance());
+			sysUserCashAccountDetail.setPlatformAccountNo(platformAccountNo);
 
 			cashAccountDetailService.insert(sysUserCashAccountDetail);
 
@@ -178,7 +178,6 @@ public class StudentWithdrawServiceImpl extends BaseServiceImpl<Integer, Student
 				account.setUpdateTime(date);
 				sysUserCashAccountDao.update(account);
 
-				withdraw.setBalance(subtract);
 				studentWithdrawDao.insert(withdraw);
 
 				SysUserCashAccountDetail cashAccountDetail = new SysUserCashAccountDetail();

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

@@ -20,10 +20,10 @@
         <result column="withdraw_no_" property="withdrawNo"/>
         <result column="create_time_" property="createTime"/>
         <result column="modify_time_" property="modifyTime"/>
-        <result column="channel_" property="channel"/>
-        <result column="platform_account_no_" property="platformAccountNo"/>
-        <result column="balance_" property="balance"/>
-        <result column="real_name_" property="realName"/>
+        <result column="channel_" property="detail.channel"/>
+        <result column="platform_account_no_" property="detail.platformAccountNo"/>
+        <result column="balance_" property="detail.balance"/>
+        <result column="real_name_" property="user.realName"/>
     </resultMap>
     
     <!-- 根据主键查询一条记录 -->

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

@@ -346,7 +346,7 @@
     <sql id="queryMusicGroupTeachersSql">
         <where>
             <if test="search != null and search != ''">
-                AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+                AND (su.real_name_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.id_=#{search})
             </if>
             <if test="musicGroupId != null and musicGroupId != ''">
                 AND cgtm.music_group_id_ = #{musicGroupId}

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

@@ -31,12 +31,12 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="VipGroupActivity" >
-		SELECT * FROM vip_group_activity WHERE id_ = #{id} 
+		SELECT * FROM vip_group_activity WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity ORDER BY id_
+		SELECT * FROM vip_group_activity WHERE del_flag_=0 ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -111,12 +111,13 @@
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM vip_group_activity WHERE id_ = #{id}
+		UPDATE vip_group_activity SET del_flag_=1 WHERE id_ = #{id}
 	</delete>
 
 	<sql id="queryCondition">
 		<where>
-			organ_id_=#{organId}
+			del_flag_=0
+			AND organ_id_=#{organId}
 		</where>
 	</sql>
 
@@ -146,8 +147,9 @@
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
 			AND NOW() &lt; end_time_
+			AND del_flag_=0
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">
-		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds})
+		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds}) AND del_flag_=0
 	</select>
 </mapper>

mec-web/src/main/java/com/ym/mec/web/controller/VipGroupCategoryController.java

@@ -46,9 +46,11 @@ public class VipGroupCategoryController extends BaseController {
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		if(StringUtils.isEmpty(organId)){
-			Employee employee = employeeDao.get(sysUser.getId());
-			organId = employee.getOrganIdList();
+		if(!sysUser.getIsSuperAdmin()){
+			if(StringUtils.isEmpty(organId)){
+				Employee employee = employeeDao.get(sysUser.getId());
+				organId=employee.getOrganIdList();
+			}
 		}
 		return succeed(vipGroupCategoryService.findAllByOrgan(organId));
 	}