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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -402,18 +402,6 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     List<Mapper> getMoneyInMusicApply(@Param("musicGroupIds") List<String> musicGroupIds);
 
     /**
-     * 获取学员购买的云教练活动订单
-     *
-     * @param userId
-     * @param activeRemark
-     * @param remark
-     * @return
-     */
-    StudentPaymentOrder findByUserAndActive(@Param("userId") Integer userId,
-                                            @Param("activeRemark") Integer activeRemark,
-                                            @Param("remark") String remark, @Param("status") String status);
-
-    /**
      * 获取购买了乐器的报名订单
      *
      * @param musicGroupId

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

@@ -43,10 +43,21 @@ public class ImSendGroupMessage {
     @ApiModelProperty(value = "定时发送时间")
     private Date sendTime;
 
+    @ApiModelProperty(value = "创建人")
+    private String operator;
+
     private Date createTime;
 
     private Date updateTime;
 
+    public String getOperator() {
+        return operator;
+    }
+
+    public void setOperator(String operator) {
+        this.operator = operator;
+    }
+
     public Date getCreateTime() {
         return createTime;
     }

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

@@ -16,4 +16,8 @@ public interface ImSendGroupMessageService extends BaseService<Long, ImSendGroup
     void updateGroupMessage(ImSendGroupMessage imSendGroupMessage);
 
     void deleteGroupMessage(Long id);
+
+    void deleteGroupList(Long imSendGroupMessageId, String groupIds);
+
+    void addGroupList(Long imSendGroupMessageId, String groupIds);
 }

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

@@ -36,4 +36,5 @@ public interface MemberRankSettingService extends BaseService<Integer, MemberRan
      */
     boolean orderCallback(StudentPaymentOrder studentPaymentOrder);
 
+    HttpResponseResult activeBuy(MemberPayParamDto memberPayParamDto) throws Exception;
 }

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

@@ -24,8 +24,6 @@ import java.util.Map;
 
 public interface StudentPaymentOrderService extends BaseService<Long, StudentPaymentOrder> {
 
-    StudentPaymentOrder findByUserAndActive(Integer userId, Integer activeRemark, String remark, String status);
-
     Map createOrder(StudentPaymentOrder studentPaymentOrder, List<StudentPaymentOrderDetail> details, String payReceiver) throws Exception;
 
     /**

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

@@ -1,8 +1,11 @@
 package com.ym.mec.biz.service;
 
 import com.ym.mec.biz.dal.entity.SysConfig;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.service.BaseService;
+import com.ym.mec.util.date.DateUtil;
 
+import java.util.Date;
 import java.util.List;
 
 public interface SysConfigService extends BaseService<Long, SysConfig> {
@@ -391,6 +394,19 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     //平台收款账户
     String PLATFORM_PAYEE_ACCOUNT = "platform_payee_account";
 
+    static Date checkActivityDate(String startTimeStr, String endTimeStr) {
+        Date now = new Date();
+        Date startTime = DateUtil.stringToDate(startTimeStr);
+        if (startTime.compareTo(now) > 0) {
+            throw new BizException("活动还未开始，谢谢关注");
+        }
+        Date endTime = DateUtil.stringToDate(endTimeStr);
+        if (endTime.compareTo(now) <= 0) {
+            throw new BizException("活动已结束，谢谢关注");
+        }
+        return now;
+    }
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

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

@@ -22,10 +22,8 @@ import java.awt.image.BufferedImage;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendGroupMessage>  implements ImSendGroupMessageService {
@@ -60,6 +58,7 @@ public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendG
 	public void sendGroupMessage(ImSendGroupMessage messageDto) throws Exception {
 		SysUser user = Optional.of(sysUserFeignService.queryUserInfo()).orElseThrow(() -> new BizException("用户不存在"));
 		messageDto.setSenderId(user.getId().toString());
+		messageDto.setOperator(user.getRealName());
 		if(Objects.isNull(messageDto.getSendTime())){
 			messageDto.setSendFlag(true);
 			send(messageDto);
@@ -93,9 +92,47 @@ public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendG
         imSendGroupMessageDao.delete(id);
     }
 
-    private void send(ImSendGroupMessage messageDto) throws Exception {
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void deleteGroupList(Long imSendGroupMessageId, String groupIds) {
+		ImSendGroupMessage sendGroupMessage =
+				Optional.of(imSendGroupMessageDao.get(imSendGroupMessageId)).orElseThrow(() -> new BizException("消息不存在"));
+		if(sendGroupMessage.getSendFlag()){
+			throw new BizException("消息已发送");
+		}
+		//剔除指定的群列表
+		List<String> groupIdList = Arrays.stream(groupIds.split(",")).collect(Collectors.toList());
+		List<String> targetIdList = Arrays.stream(sendGroupMessage.getTargetIds().split(",")).collect(Collectors.toList());
+		targetIdList.removeAll(groupIdList);
+		if (targetIdList.size() == 0) {
+			throw new BizException("消息没有指定群组");
+		}
+		sendGroupMessage.setTargetIds(String.join(",", targetIdList));
+		imSendGroupMessageDao.update(sendGroupMessage);
+	}
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void addGroupList(Long imSendGroupMessageId, String groupIds) {
+		ImSendGroupMessage sendGroupMessage =
+				Optional.of(imSendGroupMessageDao.get(imSendGroupMessageId)).orElseThrow(() -> new BizException("消息不存在"));
+		if(sendGroupMessage.getSendFlag()){
+			throw new BizException("消息已发送");
+		}
+		//添加指定的群列表
+		Set<String> groupIdList = Arrays.stream(groupIds.split(",")).collect(Collectors.toSet());
+		Set<String> targetIdList = Arrays.stream(sendGroupMessage.getTargetIds().split(",")).collect(Collectors.toSet());
+		targetIdList.addAll(groupIdList);
+		sendGroupMessage.setTargetIds(String.join(",", targetIdList));
+		imSendGroupMessageDao.update(sendGroupMessage);
+	}
+
+	private void send(ImSendGroupMessage messageDto) throws Exception {
 		if (Objects.equals(messageDto.getMessageType(), ImSendTypeEnum.IMG)) {
-			String content = imageToBase64(Thumbnails.of(new URL(messageDto.getFileUrl())).scale(0.5f).outputQuality(0.25f).asBufferedImage());
+			URL url = new URL(messageDto.getFileUrl());
+			String path = url.getPath();
+			String suffix = path.substring(path.lastIndexOf(".") + 1);
+			String content = imageToBase64(Thumbnails.of(url).scale(0.5f).outputQuality(0.25f).asBufferedImage(),suffix);
 			sysMessageService.batchSendImGroupMessage(content,messageDto.getSenderId(),
 					messageDto.getExtra(),messageDto.getFileUrl(),messageDto.getTargetIds().split(","));
 		} else if (Objects.equals(messageDto.getMessageType(),ImSendTypeEnum.FILE)) {
@@ -107,11 +144,11 @@ public class ImSendGroupMessageServiceImpl extends BaseServiceImpl<Long, ImSendG
 		}
 	}
 
-	public static String imageToBase64(BufferedImage bufferedImage) {
+	public static String imageToBase64(BufferedImage bufferedImage,String suffix) {
 		Base64 encoder = new Base64();
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
 		try {
-			ImageIO.write(bufferedImage, "jpg", baos);
+			ImageIO.write(bufferedImage, suffix, baos);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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

@@ -1,9 +1,10 @@
 package com.ym.mec.biz.service.impl;
 
+import com.alibaba.fastjson.JSONArray;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
-import com.ym.mec.biz.dal.dto.CloudTeacherOrderDto;
+import com.ym.mec.biz.dal.dto.Cloud2022ActivityDto;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
@@ -28,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
@@ -82,6 +82,8 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     private ActivityUserMapperDao activityUserMapperDao;
     @Autowired
     private MemberFeeSettingService memberFeeSettingService;
+    @Autowired
+    private TeacherDao teacherDao;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -163,8 +165,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         if (student == null) {
             throw new BizException("非法访问");
         }
-        SysUser user = sysUserFeignService.queryUserById(userId);
-
+        SysUser user = teacherDao.getUser(userId);
         Integer organId = user.getOrganId();
         if (organId == null) {
             throw new BizException("学生没有分部编号");
@@ -174,9 +175,12 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         String[] checkCoupon = CouponDetailTypeEnum.getAllowType(MEMBER);
         //校验优惠券
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(), actualAmount, true, checkCoupon);
+        studentPaymentOrder.setUserId(userId);
+        studentPaymentOrder.setOrganId(organId);
         studentPaymentOrder.setMusicGroupId(paymentId.toString());
         studentPaymentOrder.setMemo(cloudCoachPaymentProgram.getRemark());
-        Map<String, Object> result = getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(), userId, organId, studentPaymentOrder);
+        studentPaymentOrder.setGroupType(GroupType.MEMBER);
+        Map<String, Object> result = getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(),studentPaymentOrder);
         return BaseController.succeed(result);
     }
 
@@ -201,8 +205,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         String[] checkCoupon = CouponDetailTypeEnum.getAllowType(MEMBER);
         //校验优惠券
         StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(), actualAmount, true, checkCoupon);
+        studentPaymentOrder.setUserId(sysUser.getId());
+        studentPaymentOrder.setOrganId(sysUser.getOrganId());
         studentPaymentOrder.setMemo("学员团练宝购买");
-        Map<String, Object> result = getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(), sysUser.getId(), sysUser.getOrganId(), studentPaymentOrder);
+        studentPaymentOrder.setGroupType(GroupType.MEMBER);
+        Map<String, Object> result = getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(),studentPaymentOrder);
         //生产团练宝订单
         CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
         cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
@@ -217,6 +224,46 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         return BaseController.succeed(result);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
+    public HttpResponseResult activeBuy(MemberPayParamDto memberPayParamDto) throws Exception {
+        SysUser sysUser = Optional.of(sysUserFeignService.queryUserInfo()).orElseThrow(()-> new BizException("请登录"));
+        String activeConfig = sysConfigDao.findConfigValue("cloud_teacher_active_config");
+        List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, Cloud2022ActivityDto.class);
+        Cloud2022ActivityDto activityDto = cloud2022ActivityDtos.stream().filter(e -> e.getOrganId().contains(sysUser.getOrganId().toString())).findFirst().get();
+        if(Objects.isNull(activityDto)){
+            throw new BizException("当前分部暂未开通活动");
+        }
+        //是否还有购买资格
+        Integer activityId = Integer.parseInt(activityDto.getActivityId());
+        VipGroupActivity vipGroupActivity = Optional.of(vipGroupActivityDao.get(activityId)).orElseThrow(()-> new BizException("活动不存在"));
+        if(vipGroupActivity.getStudentMaxUsedTimes() != -1){
+            //获取活动购买次数
+            int activityBuyNum = activityUserMapperDao.countActivityBuyNum(vipGroupActivity.getId(),sysUser.getId());
+            if(activityBuyNum >= vipGroupActivity.getStudentMaxUsedTimes()){
+                throw new BizException("您已达到购买次数上限");
+            }
+        }
+        //判断用户是否已存在订单
+        List<StudentPaymentOrder> memberIngOrders = studentPaymentOrderService.queryByCondition(GroupType.ACTIVITY,null,sysUser.getId(), DealStatusEnum.ING,OrderTypeEnum.MEMBER);
+        if (CollectionUtils.isNotEmpty(memberIngOrders)) {
+            HttpResponseResult result = studentPaymentOrderService.checkRepeatPay(memberIngOrders.get(0), memberPayParamDto.getRepeatPay());
+            if (result.getCode() != 200) {
+                return result;
+            }
+        }
+        //优惠券使用范围
+        String[] checkCoupon = CouponDetailTypeEnum.getAllowType(MEMBER);
+        //校验优惠券
+        StudentPaymentOrder studentPaymentOrder = sysCouponCodeService.use(memberPayParamDto.getCouponIdList(), vipGroupActivity.getMarketPrice(), true, checkCoupon);
+        studentPaymentOrder.setUserId(sysUser.getId());
+        studentPaymentOrder.setOrganId(sysUser.getOrganId());
+        studentPaymentOrder.setMemo("小小训练营活动购买");
+        studentPaymentOrder.setGroupType(GroupType.ACTIVITY);
+        Map<String, Object> result = getMap(memberPayParamDto.getAmount(), memberPayParamDto.getUseBalancePayment(),studentPaymentOrder);
+        return BaseController.succeed(result);
+    }
+
     public static final String BUY_2_QQHE_LOCK = "BUY_2_QQHE_LOCK:";
 
     @Override
@@ -286,7 +333,10 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
         cache.set(cacheMap, 40, TimeUnit.MINUTES);
         //创建订单
         studentPaymentOrder.setOrderNo(orderNo);
-        Map<String, Object> result = getMap(dto.getAmount(), dto.getUseBalancePayment(), sysUser.getId(), sysUser.getOrganId(), studentPaymentOrder);
+        studentPaymentOrder.setUserId(sysUser.getId());
+        studentPaymentOrder.setOrganId(sysUser.getOrganId());
+        studentPaymentOrder.setGroupType(GroupType.MEMBER);
+        Map<String, Object> result = getMap(dto.getAmount(), dto.getUseBalancePayment(),studentPaymentOrder);
         return BaseController.succeed(result);
     }
 
@@ -377,23 +427,19 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     }
 
     //写入支付数据
-    private Map<String, Object> getMap(BigDecimal amount, Boolean UseBalance, Integer userId, Integer organId, StudentPaymentOrder studentPaymentOrder) throws Exception {
+    private Map<String, Object> getMap(BigDecimal amount, Boolean UseBalance,StudentPaymentOrder studentPaymentOrder) throws Exception {
         Date date = new Date();
         BigDecimal actualAmount = studentPaymentOrder.getActualAmount();
-        studentPaymentOrder.setUserId(userId);
-        studentPaymentOrder.setOrganId(organId);
-        studentPaymentOrder.setRoutingOrganId(organId);
+        studentPaymentOrder.setRoutingOrganId(studentPaymentOrder.getOrganId());
         studentPaymentOrder.setCreateTime(date);
         studentPaymentOrder.setUpdateTime(date);
         studentPaymentOrder.setBalancePaymentAmount(BigDecimal.ZERO);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
         studentPaymentOrder.setVersion(0);
         studentPaymentOrder.setType(OrderTypeEnum.MEMBER);
-        studentPaymentOrder.setGroupType(GroupType.MEMBER);
         studentPaymentOrder.setRemitFee(BigDecimal.ZERO);
         studentPaymentOrder.setCourseRemitFee(BigDecimal.ZERO);
         studentPaymentOrder.setPaymentChannel("BALANCE");
-        studentPaymentOrder.setMemo(OrderTypeEnum.MEMBER.getMsg());
         // 判断金额是否正确
         if (actualAmount.compareTo(amount) != 0) {
             throw new BizException("非法请求");
@@ -437,7 +483,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
+    @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
     public boolean orderCallback(StudentPaymentOrder studentPaymentOrder) {
         //查询原定的是否已处理
         StudentPaymentOrder orignStudentPaymentOrder = studentPaymentOrderService.lockOrder(studentPaymentOrder.getId());
@@ -448,15 +494,6 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             return false;
         }
         Integer userId = studentPaymentOrder.getUserId();
-        Student student = studentService.get(userId);
-        if (student == null) {
-            throw new BizException("学员信息不存在");
-        }
-        SysUser sysUser = sysUserFeignService.queryUserById(userId);
-        if (sysUser == null) {
-            throw new BizException("学员信息不存在");
-        }
-
         Date nowDate = new Date();
         // 更新订单信息
         studentPaymentOrder.setUpdateTime(nowDate);
@@ -467,6 +504,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
             studentPaymentOrderService.returnBalanceAndCoupon(studentPaymentOrder, "购买会员支付失败");
             return true;
         }
+        SysUser sysUser = teacherDao.getUser(userId);
 
         // 支付成功
         if (studentPaymentOrder.getStatus() == DealStatusEnum.SUCCESS) {
@@ -479,11 +517,11 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setLevel(1);
                 cloudTeacherOrder.setStatus(1);
                 cloudTeacherOrder.setType(activity.getPeriodEnum());
-                if(activity.getGiveCouponNum() == 1 && activity.getPeriodEnum() == PeriodEnum.MONTH){
-                    cloudTeacherOrder.setTime(studentPaymentOrder.getActivityBuyNum() * 2);
-                }else {
+//                if(activity.getGiveCouponNum() == 1 && activity.getPeriodEnum() == PeriodEnum.MONTH){
+//                    cloudTeacherOrder.setTime(studentPaymentOrder.getActivityBuyNum() * 2);
+//                }else {
                     cloudTeacherOrder.setTime(studentPaymentOrder.getActivityBuyNum());
-                }
+//                }
                 cloudTeacherOrder.setStudentId(studentPaymentOrder.getUserId());
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
@@ -493,16 +531,16 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 activityUserMapper.setUserId(studentPaymentOrder.getUserId());
                 activityUserMapper.setActivityId(activity.getId());
                 activityUserMapper.setActualPrice(studentPaymentOrder.getExpectAmount());
-                activityUserMapper.setGiveCouponId(activity.getGiveCouponId());
+                activityUserMapper.setGivePracticeFlag(1);
                 activityUserMapper.setReturnFee(false);
                 activityUserMapperDao.insert(activityUserMapper);
                 //赠送优惠券
-                Integer giveCouponId = activity.getGiveCouponId();
-                Integer giveCouponNum = activity.getGiveCouponNum();
-                if(Objects.nonNull(giveCouponId) && Objects.nonNull(giveCouponNum)){
-                    sysCouponCodeService.exchangeCoupon(userId,giveCouponId,
-                            studentPaymentOrder.getId(),giveCouponNum,2,null);
-                }
+//                Integer giveCouponId = activity.getGiveCouponId();
+//                Integer giveCouponNum = activity.getGiveCouponNum();
+//                if(Objects.nonNull(giveCouponId) && Objects.nonNull(giveCouponNum)){
+//                    sysCouponCodeService.exchangeCoupon(userId,giveCouponId,
+//                            studentPaymentOrder.getId(),giveCouponNum,2,null);
+//                }
             }else {
                 //齐齐哈尔购买成功默认激活
                 // 活动时间:
@@ -519,6 +557,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 //分部编号59 并且下单时间大于等于activityDateStr  todo 并且redis能查询到的就算齐齐哈尔活动购买的
                 if (sysUser.getOrganId() == 59 && studentPaymentOrder.getCreateTime().after(activityDate) && cache.isExists()) {
                     //齐齐哈尔会员活动
+                    Student student = studentService.get(userId);
                     qqheMemberActivity(studentPaymentOrder, student, sysUser, cache);
                     //删除标记
                     cache.delete();

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

@@ -118,11 +118,6 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     private final static Logger LOGGER = LoggerFactory.getLogger(StudentPaymentOrderServiceImpl.class);
 
     @Override
-    public StudentPaymentOrder findByUserAndActive(Integer userId, Integer activeRemark, String remark, String status) {
-        return studentPaymentOrderDao.findByUserAndActive(userId, activeRemark, remark, status);
-    }
-
-    @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public Map createOrder(StudentPaymentOrder studentPaymentOrder, List<StudentPaymentOrderDetail> details, String payReceiver) throws Exception {
 

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

@@ -18,6 +18,7 @@
 		<result column="message_type_" property="messageType" />
 		<result column="send_flag_" property="sendFlag" />
 		<result column="send_time_" property="sendTime" />
+		<result column="operator_" property="operator" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -34,13 +35,18 @@
 	
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ImSendGroupMessage" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO im_send_group_message (message_content_,sender_id_,extra,target_ids_,file_url_,file_name_,file_size_,message_type_,send_flag_,send_time_,create_time_,update_time_)
-		VALUES(#{messageContent},#{senderId},#{extra},#{targetIds},#{fileUrl},#{fileName},#{fileSize},#{messageType},#{sendFlag},#{sendTime},NOW(),NOW())
+		INSERT INTO im_send_group_message (message_content_,sender_id_,extra,target_ids_,file_url_,file_name_,
+		                                   file_size_,message_type_,send_flag_,send_time_,create_time_,update_time_,operator_)
+		VALUES(#{messageContent},#{senderId},#{extra},#{targetIds},#{fileUrl},#{fileName},#{fileSize},
+		       #{messageType},#{sendFlag},#{sendTime},NOW(),NOW(),#{operator})
 	</insert>
 	
 	<!-- 根据主键查询一条记录 -->
 	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ImSendGroupMessage">
 		UPDATE im_send_group_message <set>
+			<if test="operator != null">
+				operator_ = #{operator},
+			</if>
 			<if test="senderId != null">
 			sender_id_ = #{senderId},
 			</if>

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

@@ -976,16 +976,6 @@
         AND spo.type_ = 'APPLY' AND spo.status_ = 'SUCCESS' AND sr.music_group_id_ = spo.music_group_id_ AND sr.music_group_status_ = 'NORMAL'
 		GROUP BY spo.music_group_id_
     </select>
-    <select id="findByUserAndActive" resultMap="StudentPaymentOrder">
-        SELECT spo.* FROM cloud_teacher_order cto
-        LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
-        WHERE spo.status_ IN ('SUCCESS','ING') AND cto.active_remark_ = #{activeRemark}
-        AND cto.remark_ = #{remark} AND cto.student_id_ = #{userId}
-        <if test="status != null and status != ''">
-            AND spo.status_ = #{status}
-        </if>
-        LIMIT 1
-    </select>
     <select id="getOrderIdByMusical" resultType="java.lang.Integer">
         SELECT DISTINCT spo.id_ FROM student_payment_order spo
         LEFT JOIN student_payment_order_detail spod ON spo.id_ = spod.payment_order_id_

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,5 +1,6 @@
 package com.ym.controller;
 
+import com.google.common.collect.Lists;
 import com.ym.mec.common.entity.ImMessageDto;
 import com.ym.pojo.NoticeMessage;
 import com.ym.service.GroupService;
@@ -7,6 +8,7 @@ import com.ym.service.MessageService;
 import io.rong.messages.FileMessage;
 import io.rong.messages.ImgMessage;
 import io.rong.messages.TxtMessage;
+import io.rong.models.Result;
 import io.rong.models.group.GroupMember;
 import io.rong.models.group.GroupModel;
 import io.rong.models.group.UserGroup;
@@ -19,7 +21,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by weiqinxiao on 2019/2/25.
@@ -50,11 +54,20 @@ public class GroupController{
             TxtMessage txtMessage = new TxtMessage(imMessageDto.getMessageContent(),imMessageDto.getExtra());
             groupMessage.setContent(txtMessage);
         }
-        groupMessage.setTargetId(imMessageDto.getTargetIds());
         groupMessage.setSenderId(imMessageDto.getSenderId());
         groupMessage.setObjectName(imMessageDto.getObjectName());
         groupMessage.setIsIncludeSender(1);
-        return messageService.groupSend(groupMessage);
+        //融云只支持3个群以内的群发
+        String[] targetIds = imMessageDto.getTargetIds();
+        List<String> imGroupIds = Arrays.stream(targetIds).collect(Collectors.toList());
+        List<List<String>> partition = Lists.partition(imGroupIds, 3);
+        Result result = null;
+        for (List<String> integers : partition) {
+            String[] strings = integers.toArray(new String[integers.size()]);
+            groupMessage.setTargetId(strings);
+            result = messageService.groupSend(groupMessage);
+        }
+        return result;
     }
 
     @RequestMapping(value = "/sendDirection", method = RequestMethod.POST)

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

@@ -2,16 +2,13 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.biz.dal.dto.MemberPayParamDto;
 import com.ym.mec.biz.dal.entity.MemberRankSetting;
 import com.ym.mec.biz.dal.page.CloudTeacherOrderQueryInfo;
-import com.ym.mec.biz.service.CloudTeacherOrderService;
-import com.ym.mec.biz.service.MemberFeeSettingService;
-import com.ym.mec.biz.service.MemberRankPrivilegesService;
-import com.ym.mec.biz.service.MemberRankSettingService;
+import com.ym.mec.biz.service.*;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +36,8 @@ public class MemberRankController extends BaseController {
 
     @Autowired
     private SysUserFeignService sysUserFeignService;
+    @Autowired
+    private SysConfigDao sysConfigDao;
 
     @ApiOperation(value = "获取所有的收费标准")
     @GetMapping("/queryList")
@@ -112,40 +111,13 @@ public class MemberRankController extends BaseController {
         return memberRankSettingService.closeBuy2Qqhe(orderNo);
     }
 
-    @ApiOperation(value = "2021-09活动购买会员")
+    @ApiOperation(value = "2022小小训练营活动购买会员")
     @PostMapping("/activeBuy")
     public HttpResponseResult ActiveBuy(@RequestBody MemberPayParamDto memberPayParamDto) throws Exception {
-        throw new BizException("活动已结束，谢谢关注");
-//		Date nowTime = new Date();
-//		String startTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_start_time");
-//		Date startTime = DateUtil.stringToDate(startTimeStr);
-//		if (startTime.compareTo(nowTime) > 0) {
-//			throw new BizException("活动还未开始，谢谢关注");
-//		}
-//		String endTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_end_time");
-//		Date endTime = DateUtil.stringToDate(endTimeStr);
-//		if (endTime.compareTo(nowTime) <= 0) {
-//			throw new BizException("活动已结束，谢谢关注");
-//		}
-//		SysUser sysUser = sysUserFeignService.queryUserInfo();
-//		if (sysUser == null) {
-//			return failed(HttpStatus.FORBIDDEN, "请登录");
-//		}
-//		if(sysUser.getOrganId() == 43){
-//			throw new BizException("活动仅对乐团老生学员开放");
-//		}
-//		//买2赠1、买3赠2
-//		Integer buyNum = memberPayParamDto.getBuyNum();
-//		int giveNum = buyNum == 2?1:buyNum == 3?2:0;
-//		String remark = buyNum == 2?"2赠1":buyNum == 3?"3赠2":buyNum == 1?"单月":"其他";
-//		return memberRankSettingService.ActiveBuy(sysUser.getId(),
-//				memberPayParamDto.getMemberRankId(),
-//				PeriodEnum.MONTH,
-//				memberPayParamDto.getAmount(),
-//				memberPayParamDto.isUseBalance(),
-//				buyNum,
-//				giveNum,
-//				202109,remark,memberPayParamDto.isRepay());
+		String startTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_start_time");
+		String endTimeStr = sysConfigDao.findConfigValue("cloud_teacher_active_end_time");
+        SysConfigService.checkActivityDate(startTimeStr,endTimeStr);
+		return memberRankSettingService.activeBuy(memberPayParamDto);
     }
 
     @ApiOperation(value = "查询订单列表")

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

@@ -57,6 +57,22 @@ public class ImSendGroupMessageController extends BaseController {
         imSendGroupMessageService.deleteGroupMessage(id);
         return succeed();
     }
+    @ApiOperation("删除未发送消息的群列表")
+    @PostMapping(value = "/deleteGroupList")
+    public HttpResponseResult deleteGroupList(Long imSendGroupMessageId,String groupIds) throws Exception {
+        Optional.ofNullable(groupIds).orElseThrow(() -> new BizException("群组id不能为空"));
+        Optional.ofNullable(imSendGroupMessageId).orElseThrow(() -> new BizException("群消息id不能为空"));
+        imSendGroupMessageService.deleteGroupList(imSendGroupMessageId,groupIds);
+        return succeed();
+    }
+    @ApiOperation("添加未发送消息的群列表")
+    @PostMapping(value = "/addGroupList")
+    public HttpResponseResult addGroupList(Long imSendGroupMessageId,String groupIds) throws Exception {
+        Optional.ofNullable(groupIds).orElseThrow(() -> new BizException("群组id不能为空"));
+        Optional.ofNullable(imSendGroupMessageId).orElseThrow(() -> new BizException("群消息id不能为空"));
+        imSendGroupMessageService.addGroupList(imSendGroupMessageId,groupIds);
+        return succeed();
+    }
 
     @ApiOperation("查询群列表（没有在消息列表的）")
     @PostMapping(value = "/queryGroupPage")