Merge branch 'system_fee' of http://git.dayaedu.com/yonge/mec into goods_organ

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

@@ -2019,20 +2019,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if (cloudTeacherAmount != null) {
                 Date nowDate = new Date();
                 List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+                BigDecimal orderAmount = BigDecimal.ZERO;
                 if(cloudTeacherOrders.size() > 0){
                     List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();
-                    BigDecimal orderAmount = BigDecimal.ZERO;
                     for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
                         if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
                             quitCloudTeacherOrders.add(cloudTeacherOrder);
                             orderAmount = orderAmount.add(cloudTeacherOrder.getAmount());
                         }
                     }
-                    if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
-                        throw new BizException("云教练退费金额不能大于原始订单金额");
-                    }
                     cloudTeacherOrderService.quitCloudTeacherOrders(quitCloudTeacherOrders, cloudTeacherAmount);
                 }
+                if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
+                    throw new BizException("云教练退费金额不能大于原始订单金额");
+                }
                 amount = amount.add(cloudTeacherAmount);
                 //清除学员云教练
                 studentService.cleanMember(userId);
@@ -2269,20 +2269,20 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (cloudTeacherAmount != null) {
             Date nowDate = new Date();
             List<CloudTeacherOrder> cloudTeacherOrders = cloudTeacherOrderService.getStudentCloudTeacherOrder(userId, musicGroupId);
+            BigDecimal orderAmount = BigDecimal.ZERO;
             if(cloudTeacherOrders.size() > 0){
                 List<CloudTeacherOrder> quitCloudTeacherOrders = new ArrayList<>();
-                BigDecimal orderAmount = BigDecimal.ZERO;
                 for (CloudTeacherOrder cloudTeacherOrder : cloudTeacherOrders) {
                     if (cloudTeacherOrder.getEndTime() == null || cloudTeacherOrder.getEndTime().compareTo(nowDate) > 0) {
                         quitCloudTeacherOrders.add(cloudTeacherOrder);
                         orderAmount = orderAmount.add(cloudTeacherOrder.getAmount());
                     }
                 }
-                if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
-                    throw new BizException("云教练退费金额不能大于原始订单金额");
-                }
                 cloudTeacherOrderService.quitCloudTeacherOrders(quitCloudTeacherOrders, cloudTeacherAmount);
             }
+            if (cloudTeacherAmount.compareTo(orderAmount) > 0) {
+                throw new BizException("云教练退费金额不能大于原始订单金额");
+            }
             amount = amount.add(cloudTeacherAmount);
             //清除学员云教练
             studentService.cleanMember(userId);

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

@@ -836,7 +836,7 @@
                 AND DATEDIFF(MAX(cto.end_time_),NOW()) < 0
             </if>
             <if test="hasMember == 1">
-                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
+                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
             </if>
         </if>) c
     </select>
@@ -861,7 +861,7 @@
                 AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0
             </if>
             <if test="hasMember == 1">
-                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
+                AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
             </if>
         </if>
         <include refid="global.limit"/>

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

@@ -503,7 +503,7 @@
         MAX(mgpc.pay_user_type_) pay_user_type_,MAX(mgpc.memo_) memo_,MAX(mgpc.audit_memo_) audit_memo_,MAX(mgpc.status_) status_,
         CASE WHEN MAX(mgpc.payment_type_) = 'SPAN_GROUP_CLASS_ADJUST' THEN MAX(mgsca.master_class_course_times_) ELSE SUM(mgpccs.course_total_minuties_) END course_total_minuties_,
         CASE WHEN MAX(mgpc.payment_type_) = 'SPAN_GROUP_CLASS_ADJUST' THEN MAX(mgpc.payment_amount_) ELSE SUM(mgpccs.course_original_price_) END course_original_price_,
-        MAX(mgpccs.course_current_price_) course_current_price_,
+        SUM(mgpccs.course_current_price_) course_current_price_,
         mgpc.member_payment_amount_,
         mgpc.original_member_payment_amount_,
         MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,MAX(mgpc.payment_pattern_)payment_pattern_

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

@@ -1547,7 +1547,7 @@
         </if>
         GROUP BY cto.student_id_ HAVING MIN(cto.status_) != 1
         <if test="memberEndAutoQuitMusic != null">
-            AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(NOW(),MAX(cto.end_time_)) >= 0
+            AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt;= #{memberEndAutoQuitMusic} AND DATEDIFF(MAX(cto.end_time_),NOW()) >= 0
         </if>
         <if test="memberEndAutoQuitMusic == null">
             AND DATEDIFF(MAX(cto.end_time_),NOW()) &lt; 0