|
@@ -20,6 +20,8 @@ import java.util.stream.Collectors;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.dal.dao.*;
|
|
import com.ym.mec.biz.service.*;
|
|
import com.ym.mec.biz.service.*;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
+import org.slf4j.Logger;
|
|
|
|
+import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
import org.springframework.transaction.annotation.Propagation;
|
|
@@ -243,6 +245,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
private SubjectDao subjectDao;
|
|
private SubjectDao subjectDao;
|
|
@Autowired
|
|
@Autowired
|
|
private SysUserCashAccountDao sysUserCashAccountDao;
|
|
private SysUserCashAccountDao sysUserCashAccountDao;
|
|
|
|
+ @Autowired
|
|
|
|
+ private ContractService contractService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private StudentPreRegistrationDao studentPreRegistrationDao;
|
|
private StudentPreRegistrationDao studentPreRegistrationDao;
|
|
@@ -253,6 +257,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
|
|
|
private SimpleDateFormat sdf_ymdhms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
private SimpleDateFormat sdf_ymdhms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
|
|
|
|
|
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public BaseDAO<String, MusicGroup> getDAO() {
|
|
public BaseDAO<String, MusicGroup> getDAO() {
|
|
return musicGroupDao;
|
|
return musicGroupDao;
|
|
@@ -2362,6 +2368,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
studentRegistration.getName(), studentPaymentOrder.getActualAmount());
|
|
studentRegistration.getName(), studentPaymentOrder.getActualAmount());
|
|
}
|
|
}
|
|
studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, studentPaymentOrder.getExpectAmount(), "乐团续费", userId);
|
|
studentRegistrationService.updateUserSurplusCourseFee(userId, musicGroupId, studentPaymentOrder.getExpectAmount(), "乐团续费", userId);
|
|
|
|
+
|
|
|
|
+ try {
|
|
|
|
+ contractService.transferProduceContract(userId, musicGroupId);
|
|
|
|
+ } catch (Exception e) {
|
|
|
|
+ logger.error("产品协议生成失败", e);
|
|
|
|
+ }
|
|
|
|
+
|
|
return true;
|
|
return true;
|
|
} else {
|
|
} else {
|
|
if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
|
|
if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().doubleValue() > 0) {
|