add 6.1考级增加支付接口

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/OrderDetailTypeEnum.java

@@ -24,9 +24,10 @@ public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum>
     HIGH_ONLINE("HIGH_ONLINE", "网络基础训练课"),
     MUSIC_NETWORK("MUSIC_NETWORK", "乐团网管课"),
     CLASSROOM("CLASSROOM", "课堂课"),
-	DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
-    MAINTENANCE("MAINTENANCE","乐保服务"),
-    CLOUD_TEACHER("CLOUD_TEACHER","云教练");
+    DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
+    MAINTENANCE("MAINTENANCE", "乐保服务"),
+    CLOUD_TEACHER("CLOUD_TEACHER", "云教练"),
+    THEORY_COURSE("THEORY_COURSE", "乐理课");
 
     private String code;
 

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

@@ -21,6 +21,8 @@ import java.util.List;
 public class ChildrenDayDegreeDetailServiceImpl extends BaseServiceImpl<Integer, ChildrenDayDegreeDetail> implements ChildrenDayDegreeDetailService {
     @Autowired
     private ChildrenDayDegreeDetailDao childrenDayDegreeDetailDao;
+    @Autowired
+    private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
 
     @Override
     public BaseDAO<Integer, ChildrenDayDegreeDetail> getDAO() {
@@ -96,67 +98,42 @@ public class ChildrenDayDegreeDetailServiceImpl extends BaseServiceImpl<Integer,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public List<StudentPaymentOrderDetail> addOrderDetails(DegreePayDto degreePayDto, BigDecimal gradeFee, BigDecimal theoryLevelFee, BigDecimal vip1v1Fee, BigDecimal vip1v2Fee, BigDecimal theoryCourseFee) {
-
-//        Date nowDate = new Date();
-//        List<StudentPaymentOrderDetail> orderDetails = new ArrayList<>();
-//        if (degreePayDto.getMusicGradeLevel() != null) {
-//            StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
-//            detail.setType(OrderDetailTypeEnum.CLOUD_TEACHER);
-//            detail.setPrice(cloudTeacherPrice);
-//            detail.setRemitFee(BigDecimal.ZERO);
-//            detail.setCreateTime(nowDate);
-//            detail.setUpdateTime(nowDate);
-//            detail.setPaymentOrderId(degreePayDto.getOrderId());
-//            detail.setIsRenew(0);
-//            orderDetails.add(detail);
-//        }
-//        if (degreePayDto.getTheoryLevel() != null) {
-//            ChildrenDayDegreeDetail childrenDayDegreeDetail = new ChildrenDayDegreeDetail();
-//            childrenDayDegreeDetail.setReserveId(degreePayDto.getReserveId());
-//            childrenDayDegreeDetail.setUserId(degreePayDto.getUserId());
-//            childrenDayDegreeDetail.setType(2);
-//            childrenDayDegreeDetail.setLevel(degreePayDto.getTheoryLevel());
-//            childrenDayDegreeDetail.setPrice(theoryLevelFee);
-//            childrenDayDegreeDetail.setStatus(1);
-//            childrenDayDegreeDetail.setOrderId(degreePayDto.getOrderId());
-//            childrenDayDegreeDetails.add(childrenDayDegreeDetail);
-//        }
-//        if (degreePayDto.getVip1v1()) {
-//            ChildrenDayDegreeDetail childrenDayDegreeDetail = new ChildrenDayDegreeDetail();
-//            childrenDayDegreeDetail.setReserveId(degreePayDto.getReserveId());
-//            childrenDayDegreeDetail.setUserId(degreePayDto.getUserId());
-//            childrenDayDegreeDetail.setType(3);
-//            childrenDayDegreeDetail.setPrice(vip1v1Fee);
-//            childrenDayDegreeDetail.setStatus(1);
-//            childrenDayDegreeDetail.setOrderId(degreePayDto.getOrderId());
-//            childrenDayDegreeDetails.add(childrenDayDegreeDetail);
-//        }
-//        if (degreePayDto.getVip1v2()) {
-//            ChildrenDayDegreeDetail childrenDayDegreeDetail = new ChildrenDayDegreeDetail();
-//            childrenDayDegreeDetail.setReserveId(degreePayDto.getReserveId());
-//            childrenDayDegreeDetail.setUserId(degreePayDto.getUserId());
-//            childrenDayDegreeDetail.setType(4);
-//            childrenDayDegreeDetail.setPrice(vip1v2Fee);
-//            childrenDayDegreeDetail.setStatus(1);
-//            childrenDayDegreeDetail.setOrderId(degreePayDto.getOrderId());
-//            childrenDayDegreeDetails.add(childrenDayDegreeDetail);
-//        }
-//        if (degreePayDto.getTheoryCourse()) {
-//            ChildrenDayDegreeDetail childrenDayDegreeDetail = new ChildrenDayDegreeDetail();
-//            childrenDayDegreeDetail.setReserveId(degreePayDto.getReserveId());
-//            childrenDayDegreeDetail.setUserId(degreePayDto.getUserId());
-//            childrenDayDegreeDetail.setType(5);
-//            childrenDayDegreeDetail.setPrice(theoryCourseFee);
-//            childrenDayDegreeDetail.setStatus(1);
-//            childrenDayDegreeDetail.setOrderId(degreePayDto.getOrderId());
-//            childrenDayDegreeDetails.add(childrenDayDegreeDetail);
-//        }
-//        childrenDayDegreeDetailDao.batchAdd(childrenDayDegreeDetails);
-//        return childrenDayDegreeDetails;
-//
-//
-//        StudentPaymentOrderDetail cloudTeacherOrderDetail = new StudentPaymentOrderDetail();
-        return null;
-
+        Date nowDate = new Date();
+        List<StudentPaymentOrderDetail> orderDetails = new ArrayList<>();
+        if (degreePayDto.getMusicGradeLevel() != null || degreePayDto.getTheoryLevel() != null) {
+            StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
+            detail.setType(OrderDetailTypeEnum.DEGREE_REGISTRATION);
+            detail.setPrice(gradeFee.add(theoryLevelFee));
+            detail.setRemitFee(BigDecimal.ZERO);
+            detail.setCreateTime(nowDate);
+            detail.setUpdateTime(nowDate);
+            detail.setPaymentOrderId(degreePayDto.getOrderId());
+            detail.setIsRenew(0);
+            orderDetails.add(detail);
+        }
+        if (degreePayDto.getVip1v1() || degreePayDto.getVip1v2()) {
+            StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
+            detail.setType(OrderDetailTypeEnum.VIP);
+            detail.setPrice(vip1v1Fee.add(vip1v2Fee));
+            detail.setRemitFee(BigDecimal.ZERO);
+            detail.setCreateTime(nowDate);
+            detail.setUpdateTime(nowDate);
+            detail.setPaymentOrderId(degreePayDto.getOrderId());
+            detail.setIsRenew(0);
+            orderDetails.add(detail);
+        }
+        if (degreePayDto.getTheoryCourse()) {
+            StudentPaymentOrderDetail detail = new StudentPaymentOrderDetail();
+            detail.setType(OrderDetailTypeEnum.THEORY_COURSE);
+            detail.setPrice(theoryCourseFee);
+            detail.setRemitFee(BigDecimal.ZERO);
+            detail.setCreateTime(nowDate);
+            detail.setUpdateTime(nowDate);
+            detail.setPaymentOrderId(degreePayDto.getOrderId());
+            detail.setIsRenew(0);
+            orderDetails.add(detail);
+        }
+        studentPaymentOrderDetailDao.batchAdd(orderDetails);
+        return orderDetails;
     }
 }

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

@@ -286,6 +286,7 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
 
         //添加购买详情
         degreePayDto.setOrderId(studentPaymentOrder.getId());
+        childrenDayDegreeDetailService.addOrderDetails(degreePayDto, gradeFee, theoryLevelFee, vip1v1Fee, vip1v2Fee, theoryCourseFee);
         childrenDayDegreeDetailService.addDegreeDetails(degreePayDto, gradeFee, theoryLevelFee, vip1v1Fee, vip1v2Fee, theoryCourseFee);
 
         studentPaymentOrder.setVersion(0);