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

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ActivityQueryDto.java

@@ -34,6 +34,16 @@ public class ActivityQueryDto{
 
     private Boolean enable;
 
+    private Integer activityChannel;
+
+    public Integer getActivityChannel() {
+        return activityChannel;
+    }
+
+    public void setActivityChannel(Integer activityChannel) {
+        this.activityChannel = activityChannel;
+    }
+
     public Boolean getEnable() {
         return enable;
     }

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

@@ -67,6 +67,9 @@ public class Organization {
 	@ApiModelProperty(value = "维修技师",required = false)
 	private String repairId;
 
+	@ApiModelProperty(value = "衔接老师",required = false)
+	private String joinTeacherId;
+
 	@ApiModelProperty(value = "分部经理",required = false)
 	private String organManagerName;
 
@@ -76,6 +79,25 @@ public class Organization {
 	@ApiModelProperty(value = "维修技师",required = false)
 	private String repairName;
 
+	@ApiModelProperty(value = "衔接老师",required = false)
+	private String joinTeacherName;
+
+	public String getJoinTeacherId() {
+		return joinTeacherId;
+	}
+
+	public void setJoinTeacherId(String joinTeacherId) {
+		this.joinTeacherId = joinTeacherId;
+	}
+
+	public String getJoinTeacherName() {
+		return joinTeacherName;
+	}
+
+	public void setJoinTeacherName(String joinTeacherName) {
+		this.joinTeacherName = joinTeacherName;
+	}
+
 	public String getOrganManagerName() {
 		return organManagerName;
 	}

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

@@ -154,9 +154,31 @@ public class VipGroupActivity {
 	@ApiModelProperty(value = "活动价格")
 	private BigDecimal marketPrice = BigDecimal.ZERO;
 
+	@ApiModelProperty(value = "活动原价")
+	private BigDecimal originalPrice = BigDecimal.ZERO;
+
 	//用于标记活动类型，购买的活动类型1、1v1 20节，2、1v1 40节，3、1v2 20节，4、1v2 40节，5、乐理课
 	private Integer code;
 
+	@ApiModelProperty(value = "活动渠道，1乐团渠道，2常规活动")
+	private Integer activityChannel;
+
+	public BigDecimal getOriginalPrice() {
+		return originalPrice;
+	}
+
+	public void setOriginalPrice(BigDecimal originalPrice) {
+		this.originalPrice = originalPrice;
+	}
+
+	public Integer getActivityChannel() {
+		return activityChannel;
+	}
+
+	public void setActivityChannel(Integer activityChannel) {
+		this.activityChannel = activityChannel;
+	}
+
 	public Integer getCode() {
 		return code;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupActivityQueryInfo.java

@@ -33,6 +33,16 @@ public class VipGroupActivityQueryInfo extends QueryInfo {
 
     private Integer newStudent;
 
+    private Integer activityChannel;
+
+    public Integer getActivityChannel() {
+        return activityChannel;
+    }
+
+    public void setActivityChannel(Integer activityChannel) {
+        this.activityChannel = activityChannel;
+    }
+
     public Integer getMemberFlag() {
         return memberFlag;
     }

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

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.MapDto;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.OrganizationQueryInfo;
+import com.ym.mec.common.entity.Mapper;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 
@@ -45,4 +47,6 @@ public interface OrganizationService extends BaseService<Integer, Organization>
     int updateOrgan(Organization organization);
 
     Long add(Organization organization);
+
+    Map<String,List<Mapper>> getOrganRole(Integer id);
 }

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

@@ -3,13 +3,18 @@ package com.ym.mec.biz.service.impl;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dto.MapDto;
 import com.ym.mec.biz.dal.enums.FivePlusGradeEnum;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.SixPlusGradeEnum;
+import com.ym.mec.common.entity.Mapper;
 import com.ym.mec.common.exception.BizException;
+import com.ym.mec.util.collection.MapUtil;
+import com.ym.mec.util.json.JsonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -121,6 +126,52 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
 		return organizationDao.insert(initOrganization(organization));
 	}
 
+	@Override
+	public Map<String,List<Mapper>> getOrganRole(Integer id) {
+		Organization organization = organizationDao.get(id);
+		if(organization == null){
+			throw new BizException("分部信息不存在");
+		}
+		String organManager = organization.getOrganManager();
+		String repairId = organization.getRepairId();
+		String educationId = organization.getEducationId();
+		String joinTeacherId = organization.getJoinTeacherId();
+		String organManagerUserIds = concatOrganManager(organManager, repairId, educationId, joinTeacherId);
+		Map<String,List<Mapper>> resultMap = new HashMap<>(4);
+		if(organManagerUserIds.length() > 0){
+			Map<Integer, String> educationalTeacherNameMap = MapUtil.convertMybatisMap(teacherDao.queryNameByIds(organManagerUserIds));
+			resultMap.put("organManager",getOrganManagerName(educationalTeacherNameMap,organManager));
+			resultMap.put("repairId",getOrganManagerName(educationalTeacherNameMap,repairId));
+			resultMap.put("educationId",getOrganManagerName(educationalTeacherNameMap,educationId));
+			resultMap.put("joinTeacherId",getOrganManagerName(educationalTeacherNameMap,joinTeacherId));
+		}
+		return resultMap;
+	}
+
+	private List<Mapper> getOrganManagerName(Map<Integer, String> nameMap, String organManager){
+		List<Mapper> mapperList = new ArrayList<>();
+		if(StringUtils.isNotEmpty(organManager)){
+			List<Integer> organIds = Arrays.stream(organManager.split(",")).map(id -> Integer.valueOf(id)).collect(Collectors.toList());
+			for (Integer organId : organIds) {
+				mapperList.add(new Mapper(organId,nameMap.get(organId)));
+			}
+		}
+		return mapperList;
+	}
+
+	private String concatOrganManager(String... userIds){
+		StringBuffer sb = new StringBuffer();
+		for (String userId : userIds) {
+			if(StringUtils.isNotEmpty(userId)){
+				sb.append(userId).append(",");
+			}
+		}
+		if(sb.length() > 0){
+			return sb.substring(0,sb.length() - 1);
+		}
+		return null;
+	}
+
 	private Organization initOrganization(Organization organization){
 		if(StringUtils.isNotEmpty(organization.getOrganManager())){
 			organization.setOrganManagerName(teacherDao.queryTeacherNameByTeacherIds(organization.getOrganManager()));

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

@@ -20,6 +20,8 @@
         <result column="address_" property="address"/>
         <result column="organ_manager_" property="organManager"/>
         <result column="education_id_" property="educationId"/>
+        <result column="join_teacher_id_" property="joinTeacherId"/>
+        <result column="join_teacher_name_" property="joinTeacherName"/>
         <result column="repair_id_" property="repairId"/>
         <result column="organ_manager_name_" property="organManagerName"/>
         <result column="education_name_" property="educationName"/>
@@ -41,11 +43,12 @@
     <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.Organization" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO organization (id_,name_,area_id_,create_time_,update_time_,
-                                  register_date_,linkman_,mobile_,address_,grade_type_,organ_manager_,education_id_,repair_id_,
-                                  organ_manager_name_,education_name_,repair_name_)
+                                  register_date_,linkman_,mobile_,address_,grade_type_,organ_manager_,education_id_,repair_id_,join_teacher_id_,
+                                  organ_manager_name_,education_name_,repair_name_,join_teacher_name_)
         VALUES(#{id},#{name},#{areaId},now(),now(),#{registerDate},#{linkman},#{mobile},#{address},
                #{gradeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-               ,#{organManager},#{educationId},#{repairId},#{organManagerName},#{educationName},#{repairName})
+               ,#{organManager},#{educationId},#{repairId},#{joinTeacherId},#{organManagerName},
+               #{educationName},#{repairName},#{joinTeacherName})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -58,9 +61,11 @@
                 organ_manager_ = #{organManager},
                 education_id_ = #{educationId},
                 repair_id_ = #{repairId},
+                join_teacher_id_ = #{joinTeacherId},
                 organ_manager_name_ = #{organManagerName},
                 education_name_ = #{educationName},
                 repair_name_ = #{repairName},
+                join_teacher_name_ = #{joinTeacherName},
             <if test="areaId != null">
                 area_id_ = #{areaId},
             </if>

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

@@ -52,6 +52,8 @@
 		<result property="marketPrice" column="market_price_"/>
 		<result property="enable" column="enable_"/>
 		<result property="code" column="code_"/>
+		<result property="activityChannel" column="activity_channel_"/>
+		<result property="originalPrice" column="original_price_"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -73,13 +75,14 @@
 										single_course_time_,discount_,full_minus_course_times_,give_course_type_,give_category_id_,give_course_num_
 										,member_rank_id_,member_time_,give_member_rank_id_,give_member_time_,course_type_,
 		                                activity_type_,give_sign_course_time_,is_pay_to_balance_,teach_mode_,give_teach_mode_,
-		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_)
+		                                period_,give_period_,status_,market_price_,give_allow_online_to_offline_,give_prize_num_,activity_channel_,original_price_)
 		VALUES(#{name},#{description},#{vipGroupCategoryIdList},#{startTime},#{endTime},#{organId},#{coursesStartTime},#{coursesEndTime},
 		       now(),now(),#{salarySettlementJson},#{delFlag},#{onlineClassJoinGradientRewards},
 		       #{offlineClassJoinGradientRewards},#{minCourseNum},#{maxCourseNum},#{studentMaxUsedTimes},#{applyToStudentType},#{allowOnlineToOffline},
 			   #{singleCourseTime},#{discount},#{fullMinusCourseTimes},#{giveCourseType},#{giveCategoryId},#{giveCourseNum}
 				  ,#{memberRankId},#{memberTime},#{giveMemberRankId},#{giveMemberTime},#{courseType},#{activityType},#{giveSingleCourseTime},
-		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},#{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum})
+		       #{isPayToBalance},#{teachMode},#{giveTeachMode},#{periodEnum},#{givePeriodEnum},#{status},
+		       #{marketPrice},#{giveAllowOnlineToOffline},#{givePrizeNum},#{activityChannel},#{originalPrice})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -98,7 +101,9 @@
 		online_class_join_gradient_rewards_=#{onlineClassJoinGradientRewards},
 		offline_class_join_gradient_rewards_=#{offlineClassJoinGradientRewards},min_course_num_=#{minCourseNum},
 		max_course_num_=#{maxCourseNum},student_max_used_times_=#{studentMaxUsedTimes},apply_to_student_type_=#{applyToStudentType},
-		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},update_time_ = NOW(),give_allow_online_to_offline_ = #{giveAllowOnlineToOffline},give_prize_num_ = #{givePrizeNum} WHERE id_ = #{id}
+		allow_online_to_offline_=#{allowOnlineToOffline},end_time_ = #{endTime},market_price_ = #{marketPrice},update_time_ = NOW(),
+		give_allow_online_to_offline_ = #{giveAllowOnlineToOffline},
+		give_prize_num_ = #{givePrizeNum},activity_channel_ = #{activityChannel},original_price_ = #{originalPrice} WHERE id_ = #{id}
 	</update>
 
 	<!-- 根据主键删除一条记录 -->
@@ -109,6 +114,9 @@
 	<sql id="queryCondition">
 		<where>
 			vga.del_flag_ = 0
+			<if test="activityChannel != null">
+				AND vga.activity_channel_ = #{activityChannel}
+			</if>
 			<if test="courseType != null and courseType != ''">
 				AND vga.course_type_ = #{courseType}
 			</if>
@@ -207,6 +215,9 @@
 		<if test="activityQueryDto.memberNum == null">
 			AND ast.member_flag_ = -1
 		</if>
+		<if test="activityQueryDto.activityChannel != null">
+			AND vga.activity_channel_ = #{activityQueryDto.activityChannel}
+		</if>
 		ORDER BY vga.create_time_ DESC
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">

mec-common/common-core/src/main/java/com/ym/mec/common/entity/Mapper.java

@@ -6,6 +6,14 @@ public class Mapper {
 
 	private Object value;
 
+	public Mapper() {
+	}
+
+	public Mapper(Object key, Object value) {
+		this.key = key;
+		this.value = value;
+	}
+
 	public Object getKey() {
 		return key;
 	}

mec-student/src/main/java/com/ym/mec/student/controller/PracticeGroupController.java

@@ -14,7 +14,6 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.PracticeGroupType;
 import com.ym.mec.biz.service.PracticeGroupService;
-import com.ym.mec.biz.service.StudentPaymentOrderService;
 import com.ym.mec.biz.service.SysMessageService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
@@ -23,10 +22,8 @@ import com.ym.mec.thirdparty.message.MessageSenderPluginContext;
 import com.ym.mec.util.date.DateUtil;
 import com.ym.mec.util.http.HttpUtil;
 import com.yonge.log.model.AuditLogAnnotation;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
@@ -62,10 +59,6 @@ public class PracticeGroupController extends BaseController {
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
     @Autowired
     private StudentDao studentDao;
-    @Autowired
-    private StudentPaymentOrderService studentPaymentOrderService;
-
-//    private static final Set<Integer> ENABLE_APPLY_ORGANIDS = new HashSet<>(Arrays.asList(new Integer[]{28,34,37}));
 
     @ApiOperation("获取学生的陪练课")
     @GetMapping(value = "/findUserPracticeCourses")

mec-web/src/main/java/com/ym/mec/web/config/ResourceServerConfig.java

@@ -38,7 +38,10 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                         "/replacementInstrumentActivity/queryReplacementsStat", "/eduStudentRegistration/queryPreApplyList",
                         "/eduSubject/findSubSubjects", "/eduFinancialExpenditure/batchAdd", "/eduSendNotice/*",
                         "/oaContracts/*", "/eduStudent/organStudentOverView", "/activity/countCloudTeacherActive",
-                        "/activity/organDoubleEleven2021Statis", "/activity/doubleEleven2021Statis", "/questionnaireTopic/getDetail", "/questionnaireUserResult/add").permitAll().anyRequest().authenticated().and().httpBasic();
+                        "/activity/organDoubleEleven2021Statis", "/activity/doubleEleven2021Statis", "/questionnaireTopic/getDetail", "/questionnaireUserResult/add",
+                        "/tenantInfo/info"
+                )
+                .permitAll().anyRequest().authenticated().and().httpBasic();
     }
 
     @Override

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

@@ -88,6 +88,14 @@ public class OrganizationController extends BaseController {
         return succeed(organizationService.get(id));
     }
 
+    @ApiOperation(value = "根据分部角色列表map")
+    @GetMapping("/getOrganRole")
+    @PreAuthorize("@pcs.hasPermissions('organization/getOrganRole')")
+    @ApiParam(value = "分部编号", required = true)
+    public Object getOrganRole(Integer id){
+        return succeed(organizationService.getOrganRole(id));
+    }
+
     @ApiOperation(value = "获取用户所在分部的年级列表）")
     @GetMapping("/getGradeList")
     @PreAuthorize("@pcs.hasPermissions('organization/getGradeList')")

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

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.dto.TenantOrderRecordDto;
 import com.ym.mec.biz.dal.entity.TenantOrderRecord;
 import com.ym.mec.biz.service.TenantOrderRecordService;
 import com.ym.mec.common.controller.BaseController;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -20,6 +21,7 @@ import javax.annotation.Resource;
  * @since 2021-12-20 10:08:27
  */
 @RestController
+@Api(tags = "机构付款记录")
 @RequestMapping("/tenantOrderRecord")
 public class TenantOrderRecordController extends BaseController {
     /**