缴费项目外部订单导入

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

@@ -99,7 +99,6 @@ public interface StudentRegistrationService extends BaseService<Long, StudentReg
     StudentPaymentOrder addOrder(StudentRegistration studentRegistration,
                                  StudentPaymentOrder studentPaymentOrder, MusicGroupApplyGoodsDto goodsDto, RegisterPayDto registerPayDto, CouponPayParam couponPayParam) throws Exception;
 
-    @Transactional(rollbackFor = Exception.class)
     void addOrder1(StudentPaymentOrder studentPaymentOrder,
                    MusicGroupPaymentCalender calender,
                    List<MusicGroupPaymentCalenderCourseSettings> newCourses,

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

@@ -455,7 +455,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 	public void importStudentToMusicGroup1(List<MusicGroupPaymentImportDto> importDtos, MusicGroupPaymentCalender calender) throws Exception {
 		String musicGroupId = calender.getMusicGroupId();
 		//查询导入的声部是否正确
-    	List<String> subjectNameList = importDtos.stream().distinct().map(t->t.getSubjectName()).collect(Collectors.toList());
+    	List<String> subjectNameList = importDtos.stream().distinct().map(t->t.getSubjectName()).distinct().collect(Collectors.toList());
 
     	List<MusicGroupSubjectPlan> musicGroupSubjectPlanList = musicGroupSubjectPlanDao.getMusicSubjectClassPlan(musicGroupId);
 
@@ -468,16 +468,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     			throw new BizException("当前乐团不支持[{}]声部", subName);
     		}
     	}
-    	MusicGroupPaymentCalender musicGroupPaymentCalender = musicGroupPaymentCalenderDao.findByMusicGroupRegCalender(musicGroupId);
-    	if(musicGroupPaymentCalender == null){
-    		throw new BizException("请先创建乐团报名缴费");
-    	}
-        if(musicGroupPaymentCalender.getPaymentType() != MUSIC_APPLY){
-            throw new BizException("当前入口仅支持报名缴费项目导入");
-        }
 		Date now = new Date();
-		Long calenderId = musicGroupPaymentCalender.getId();
-		Boolean freeFlag = musicGroupPaymentCalender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0;
+		Long calenderId = calender.getId();
+		Boolean freeFlag = calender.getCurrentTotalAmount().compareTo(BigDecimal.ZERO) == 0;
 		List<String> phones = importDtos.stream().map(e -> e.getPhone()).collect(Collectors.toList());
         List<BasicUserDto> userList = teacherDao.queryUserByPhones(phones);
 		List<String> existPhones = studentDao.queryExistStuByPhone(phones);
@@ -510,6 +503,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				sysUser.setCreateTime(now);
 				sysUser.setUpdateTime(now);
 				teacherDao.addSysUser(sysUser);
+				si.setUserId(sysUser.getId());
             }
 			Integer userId = si.getUserId();
 			if(!existPhones.contains(si.getPhone())){
@@ -573,7 +567,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			studentPaymentOrderService.insert(studentPaymentOrder);
 			studentRegistrationService.addOrder1(studentPaymentOrder,calender,courseSettings, calenderMember, calenderRepair, calenderActivities);
 			studentPaymentRouteOrderService.addRouteOrder(orderNo, calender.getOrganId(), calender.getCurrentTotalAmount());
-			studentPaymentOrderDetailService.addOrderDetailTo(studentPaymentOrder, musicGroup, studentRegistration);
 		}
 		if (CollectionUtils.isNotEmpty(insertList)) {
 			studentRegistrationService.batchInsert(insertList);
@@ -603,35 +596,35 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				musicGroupSubjectPlanDao.update(musicOneSubjectClassPlan);
 			}
 			// 更新实际缴费人数
-			if (musicGroupPaymentCalender.getActualNum() == null) {
-				musicGroupPaymentCalender.setActualNum(allList.size());
+			if (calender.getActualNum() == null) {
+				calender.setActualNum(allList.size());
 			} else {
-				musicGroupPaymentCalender.setActualNum(musicGroupPaymentCalender.getActualNum() + allList.size());
+				calender.setActualNum(calender.getActualNum() + allList.size());
 			}
-			if (musicGroupPaymentCalender.getExpectNum() == null) {
-				musicGroupPaymentCalender.setExpectNum(allList.size());
+			if (calender.getExpectNum() == null) {
+				calender.setExpectNum(allList.size());
 			} else {
-				musicGroupPaymentCalender.setExpectNum(musicGroupPaymentCalender.getExpectNum() + allList.size());
+				calender.setExpectNum(calender.getExpectNum() + allList.size());
 			}
-			musicGroupPaymentCalender.setUpdateTime(now);
-			musicGroupPaymentCalenderDao.update(musicGroupPaymentCalender);
+			calender.setUpdateTime(now);
+			musicGroupPaymentCalenderDao.update(calender);
 
 			MusicGroupPaymentCalenderDetail musicGroupPaymentCalenderDetail = null;
 			List<MusicGroupPaymentCalenderDetail> insertMusicGroupPaymentCalenderDetailList = new ArrayList<>();
 			for (MusicGroupPaymentImportDto si : importDtos) {
 				musicGroupPaymentCalenderDetail = new MusicGroupPaymentCalenderDetail();
 				musicGroupPaymentCalenderDetail.setTenantId(calender.getTenantId());
-				musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+				musicGroupPaymentCalenderDetail.setMusicGroupPaymentCalenderId(calender.getId());
 				musicGroupPaymentCalenderDetail.setUserId(si.getUserId());
-				musicGroupPaymentCalenderDetail.setResponsibleUserId(musicGroupPaymentCalender.getOperator());
+				musicGroupPaymentCalenderDetail.setResponsibleUserId(calender.getOperator());
 				musicGroupPaymentCalenderDetail.setPaymentStatus(PAID_COMPLETED);
 				musicGroupPaymentCalenderDetail.setPayTime(now);
 				musicGroupPaymentCalenderDetail.setPaymentOrderId(null);
 				musicGroupPaymentCalenderDetail.setUseInCourse(0);
 				musicGroupPaymentCalenderDetail.setOpen(1);
 				musicGroupPaymentCalenderDetail.setUserStatus(null);
-				musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(musicGroupPaymentCalender.getDeadlinePaymentDate());
-				musicGroupPaymentCalenderDetail.setStartPaymentDate(musicGroupPaymentCalender.getStartPaymentDate());
+				musicGroupPaymentCalenderDetail.setDeadlinePaymentDate(calender.getDeadlinePaymentDate());
+				musicGroupPaymentCalenderDetail.setStartPaymentDate(calender.getStartPaymentDate());
 				insertMusicGroupPaymentCalenderDetailList.add(musicGroupPaymentCalenderDetail);
 			}
 			if (insertMusicGroupPaymentCalenderDetailList.size() > 0) {

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

@@ -1288,7 +1288,7 @@
     <select id="queryExistStuByPhone" resultType="java.lang.String">
         select su.phone_ from student s
         left join sys_user su ON su.id_ = s.user_id_
-        where su.del_flag_ = 0 AND tenant_id_ = 1 AND su.phone_ IN
+        where su.del_flag_ = 0 AND su.tenant_id_ = 1 AND su.phone_ IN
         <foreach collection="phones" item="phone" separator="," open="(" close=")">
             #{phone}
         </foreach>

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

@@ -1564,7 +1564,7 @@
     <select id="queryUserByPhones" resultType="com.ym.mec.biz.dal.dto.BasicUserDto">
         select id_ as userId,organ_id_ as organId,
         username_ as name,avatar_ as headUrl,phone_ as phone,
-        buser_type_ as userType from sys_user where tenant_id_ = 1 AND phone_ IN
+        user_type_ as userType from sys_user where tenant_id_ = 1 AND phone_ IN
         <foreach collection="phones" item="phone" separator="," open="(" close=")">
             #{phone}
         </foreach>

mec-web/src/main/resources/bootstrap-local.properties

@@ -3,7 +3,7 @@
 #\u670d\u52a1\u5668\u5730\u5740
 spring.cloud.nacos.config.server-addr=43.137.4.92:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
-spring.cloud.nacos.config.namespace=fcc00e52-a464-4ab8-96aa-3469b3f66062
+spring.cloud.nacos.config.namespace=d0699206-ca95-4404-a20d-420864a8029f
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e
 spring.cloud.nacos.config.group=DEFAULT_GROUP
 #\u6587\u4ef6\u540d -- \u5982\u679c\u6ca1\u6709\u914d\u7f6e\u5219\u9ed8\u8ba4\u4e3a ${spring.appliction.name}

mec-web/src/main/resources/columnMapper.ini

@@ -115,4 +115,9 @@ ID = id
 学员编号 = userId
 交易流水号 = transNo
 收款账户 = merNos
-交易日期 = payTime
+交易日期 = payTime
+学员姓名 = studentName
+性别 = gender
+手机号 = phone
+声部 = subjectName
+年级 = grade