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

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

@@ -15,39 +15,39 @@ public class PracticeGroupSellPrice extends BaseEntity {
 
     private String organName;
 
-    private BigDecimal onceOriginalPrice;
+    private BigDecimal onceOriginalPrice = BigDecimal.ZERO;
 
-    private BigDecimal onceActivityPrice;
+    private BigDecimal onceActivityPrice = BigDecimal.ZERO;
 
-    private BigDecimal onceQuartActivityPrice;
+    private BigDecimal onceQuartActivityPrice = BigDecimal.ZERO;
 
-    private BigDecimal twiceOriginalPrice;
+    private BigDecimal twiceOriginalPrice = BigDecimal.ZERO;
 
-    private BigDecimal twiceActivityPrice;
+    private BigDecimal twiceActivityPrice = BigDecimal.ZERO;
 
-    private BigDecimal twiceQuartActivityPrice;
+    private BigDecimal twiceQuartActivityPrice = BigDecimal.ZERO;
 
-    private BigDecimal vipOneStudentTwelveCourseOriginalPriceWithNewUser;
+    private BigDecimal vipOneStudentTwelveCourseOriginalPriceWithNewUser = BigDecimal.ZERO;
 
-    private BigDecimal vipOneStudentTwelveCourseActivityPriceWithNewUser;
+    private BigDecimal vipOneStudentTwelveCourseActivityPriceWithNewUser = BigDecimal.ZERO;
 
-    private BigDecimal vipOneStudentTwelveCourseOriginalPriceWithOldUser;
+    private BigDecimal vipOneStudentTwelveCourseOriginalPriceWithOldUser = BigDecimal.ZERO;
 
-    private BigDecimal vipOneStudentTwelveCourseActivityPriceWithOldUser;
+    private BigDecimal vipOneStudentTwelveCourseActivityPriceWithOldUser = BigDecimal.ZERO;
 
-    private BigDecimal highOnlineTenCourseOriginalPriceWithNewUser;
+    private BigDecimal highOnlineTenCourseOriginalPriceWithNewUser = BigDecimal.ZERO;
 
-    private BigDecimal highOnlineTenCourseActivityPriceWithNewUser;
+    private BigDecimal highOnlineTenCourseActivityPriceWithNewUser = BigDecimal.ZERO;
 
-    private BigDecimal highOnlineTenCourseOriginalPriceWithOldUser;
+    private BigDecimal highOnlineTenCourseOriginalPriceWithOldUser = BigDecimal.ZERO;
 
-    private BigDecimal highOnlineTenCourseActivityPriceWithOldUser;
+    private BigDecimal highOnlineTenCourseActivityPriceWithOldUser = BigDecimal.ZERO;
 
-    private BigDecimal carePackagePrice;
+    private BigDecimal carePackagePrice = BigDecimal.ZERO;
 
-    private BigDecimal comeOnPackagePrice;
+    private BigDecimal comeOnPackagePrice = BigDecimal.ZERO;
 
-    private BigDecimal singleClassMinutesPrice;
+    private BigDecimal singleClassMinutesPrice = BigDecimal.ZERO;
 
     private Date createTime;
 

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

@@ -12,7 +12,7 @@ public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum>
     OTHER("OTHER", "其他"),
     COURSE("COURSE", "课程"),
     HIGH_ONLINE_COURSE("HIGH_ONLINE_COURSE", "网络基础训练"),
-    SINGLE("SINGLE", "单技课"),
+    SINGLE("SINGLE", "声部课"),
     MIX("MIX", "合奏课"),
     HIGH("HIGH", "小班课"),
     VIP("VIP", "vip课"),
@@ -27,8 +27,8 @@ public enum OrderDetailTypeEnum implements BaseEnum<String, OrderDetailTypeEnum>
     CLASSROOM("CLASSROOM", "课堂课"),
 	DEGREE_REGISTRATION("DEGREE_REGISTRATION", "考级报名"),
     MAINTENANCE("MAINTENANCE","乐保服务"),
-    CLOUD_TEACHER("CLOUD_TEACHER","云教练"),
-    CLOUD_TEACHER_PLUS("CLOUD_TEACHER_PLUS","云教练+"),
+    CLOUD_TEACHER("CLOUD_TEACHER","团练宝"),
+    CLOUD_TEACHER_PLUS("CLOUD_TEACHER_PLUS","团练宝"),
     THEORY_COURSE("THEORY_COURSE", "乐理课");
 
     private String code;

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

@@ -2975,7 +2975,10 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         BigDecimal studentSingleCourseCost = amount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
 
         BigDecimal oneMonthOriginalPrice = practiceGroupBuyParams.getDrillTimesOnWeek() == 1 ? practiceGroupSellPrice.getOnceOriginalPrice() : practiceGroupSellPrice.getTwiceOriginalPrice();
-        BigDecimal originalAmount = oneMonthOriginalPrice.multiply(new BigDecimal(practiceGroupBuyParams.getBuyMonths()));
+        BigDecimal originalAmount = ZERO;
+        if (Objects.nonNull(oneMonthOriginalPrice)) {
+            originalAmount = oneMonthOriginalPrice.multiply(new BigDecimal(practiceGroupBuyParams.getBuyMonths()));
+        }
         BigDecimal studentSingleCourseOriginalCost = originalAmount.divide(new BigDecimal(practiceCourses.size()), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
 
         //使用优惠券