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

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

@@ -28,7 +28,8 @@ public class ImGroup extends BaseEntity {
 	private String tags;
 	
 	private String img;
-	
+
+	/** 乐团群 MUSIC，班级群 CLASS，训练营 TRAINING */
 	private String type;
 	
 	/**  */

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

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -92,6 +93,29 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 		return imGroup;
 	}
 
+	public void create1(String groupId,List<String> userIdList,String groupName){
+		List<GroupMember> groupMembers = new ArrayList<>();
+		for (String userId : userIdList) {
+			GroupMember groupMember = new GroupMember();
+			groupMember.setGroupId(groupId);
+			groupMember.setId(userId);
+			groupMembers.add(groupMember);
+		}
+		GroupMember[] members = new GroupMember[groupMembers.size()];
+		groupMembers.toArray(members);
+		Date date = new Date();
+		ImGroup imGroup = new ImGroup();
+		imGroup.setId(groupId);
+		imGroup.setCreateTime(date);
+		imGroup.setIntroduce(groupName);
+		imGroup.setMemberNum(userIdList.size());
+		imGroup.setName(groupName);
+		imGroup.setType("TRAINING");
+		imGroup.setUpdateTime(date);
+		imGroupDao.insert(imGroup);
+		imFeignService.groupCreate(new GroupModel(groupId,members,groupName));
+	}
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public boolean cancel(Long imGroupId) {

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

@@ -235,8 +235,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
     @Transactional(rollbackFor = Exception.class,isolation = Isolation.READ_COMMITTED)
     public HttpResponseResult activeBuy(MemberPayParamDto memberPayParamDto) throws Exception {
         SysUser sysUser = Optional.of(sysUserFeignService.queryUserInfo()).orElseThrow(()-> new BizException("请登录"));
+        Student student = studentService.getLocked(sysUser.getId());
         //判断用户是否已存在订单
-        List<StudentPaymentOrder> memberIngOrders = studentPaymentOrderService.queryByCondition(GroupType.ACTIVITY,null,sysUser.getId(), DealStatusEnum.ING,OrderTypeEnum.MEMBER);
+        List<StudentPaymentOrder> memberIngOrders = studentPaymentOrderService.queryByCondition(GroupType.ACTIVITY,null,student.getUserId(), DealStatusEnum.ING,OrderTypeEnum.MEMBER);
         if (CollectionUtils.isNotEmpty(memberIngOrders)) {
             HttpResponseResult result = studentPaymentOrderService.checkRepeatPay(memberIngOrders.get(0), memberPayParamDto.getRepeatPay());
             if (result.getCode() != 200) {

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

@@ -4895,6 +4895,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult studentCreateActivityPracticeGroup(PracticeGroupBuyDto practiceGroupBuyParams) {
         SysUser sysUser = Optional.of(sysUserFeignService.queryUserInfo()).orElseThrow(() -> new BizException("请登录"));
+        studentDao.getLocked(sysUser.getId());
         practiceGroupBuyParams.setStudentId(sysUser.getId());
         String activeConfig = sysConfigDao.findConfigValue("cloud_teacher_active_config");
         List<Cloud2022ActivityDto> cloud2022ActivityDtos = JSONArray.parseArray(activeConfig, Cloud2022ActivityDto.class);
@@ -5130,7 +5131,8 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             throw new BizException("请设置教师课酬");
         }
 
-        BigDecimal actualPrice = activityUserMappers.get(0).getActualPrice();
+        ActivityUserMapper activityUserMapper = activityUserMappers.get(0);
+        BigDecimal actualPrice = activityUserMapper.getActualPrice();
         BigDecimal divide = actualPrice.divide(new BigDecimal(practiceCourses.size()), ROUND_DOWN);
         BigDecimal firstAmount = actualPrice.subtract(divide.multiply(new BigDecimal(practiceCourses.size()))).add(divide);
         for (int i = 0; i < practiceCourses.size(); i++) {
@@ -5197,6 +5199,9 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
             return BaseController.failed(HttpStatus.FOUND, errMessage);
         }
+        activityUserMapper.setGivePracticeFlag(2);
+        activityUserMapper.setPracticeGroupId(practiceGroupBuyParams.getId());
+        activityUserMapperService.update(activityUserMapper);
         return BaseController.succeed();
     }
 }

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

@@ -62,7 +62,7 @@
 	</update>
 	<update id="updateStatus">
 		UPDATE live_goods_mapper SET status_ = #{status},update_time_ = NOW()
-		WHERE
+		WHERE 1=1
 		<if test="liveId != null and liveId != ''">
 		AND live_id_ = #{liveId}
 		</if>