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

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

@@ -3900,7 +3900,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         BigDecimal totalPrice = BigDecimal.ZERO;
         if (practice.getAllCourseNum() != null) {
             BigDecimal onlineClassNum = new BigDecimal(practice.getAllCourseNum());
-            totalPrice = practiceGroupSellPrice.getSingleClassMinutesPrice().multiply(onlineClassNum);
+            totalPrice = practiceGroupSellPrice.getSingleClassMinutesPrice().multiply(onlineClassNum).setScale(0, BigDecimal.ROUND_CEILING);
         }
 
         //课程购买费用计算
@@ -3917,7 +3917,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             if(vipGroupActivity.getFixedCourseNumFlag()){
                 totalPrice = vipGroupActivity.getMarketPrice();
             }else {
-                totalPrice = totalPrice.multiply(vipGroupActivity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN);
+                totalPrice = totalPrice.multiply(vipGroupActivity.getDiscount()).divide(new BigDecimal(100), CommonConstants.DECIMAL_PLACE, ROUND_DOWN).setScale(0, BigDecimal.ROUND_CEILING);
             }
         }
         //教师课酬线上单课酬计算
@@ -3934,7 +3934,7 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
             }
         }
 
-        results.put("totalPrice", totalPrice.setScale(0, BigDecimal.ROUND_CEILING));
+        results.put("totalPrice", totalPrice);
         results.put("onlineTeacherSalary", teacherDefaultSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
         results.put("giveTeacherDefaultSalary", giveTeacherDefaultSalary.setScale(2, BigDecimal.ROUND_HALF_UP));
         return results;

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

@@ -630,7 +630,7 @@
     </select>
     <select id="sumGroupIncomeFee" resultType="java.math.BigDecimal">
         SELECT
-        (CASE WHEN c.c IS NULL THEN 0 ELSE c.c END) +
+        (CASE WHEN a.a > 0 THEN a.a ELSE c.c END) +
         (CASE WHEN d.d IS NULL THEN 0 ELSE d.d END) +
         (CASE WHEN e.e IS NULL THEN 0 ELSE e.e END) -
         (CASE WHEN b.b IS NULL THEN 0 ELSE b.b END) amount_