Merge remote-tracking branch 'origin/master'

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

@@ -155,7 +155,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             if (info.getMaxAmount() != null && info.getPaidAmount().compareTo(BigDecimal.ZERO) > 0) {
                 List<SporadicChargeInfo> activeInfos = sporadicChargeInfoDao.getOrganActiveInfo(info.getOrganId(), 12);
                 for (SporadicChargeInfo activeInfo : activeInfos) {
-                    activeInfo.setPaidAmount(activeInfo.getPaidAmount().subtract(info.getAmount()));
+                    activeInfo.setPaidAmount(activeInfo.getPaidAmount().subtract(studentPaymentOrder.getActualAmount()));
                     activeInfo.setUpdateTime(new Date());
                     int update = sporadicChargeInfoDao.update(activeInfo);
                     if (update <= 0) {

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

@@ -101,7 +101,7 @@
                 paid_amount_ = #{paidAmount},
             </if>
             <if test="openMaxTerm != null">
-                open_max_term_ = #{openMaxTerm},
+                open_max_term_ = #{openMaxTerm,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
             <if test="version != null">
                 version_ = version_+1,

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -85,7 +85,7 @@ public class ActivityController extends BaseController {
                 order.setScale(order.getMoney().multiply(new BigDecimal(100)).divide(order.getMaxAmount(), 2, BigDecimal.ROUND_HALF_UP));
             }
         }
-        orders.sort(Comparator.comparing(OrderStatisDto::getMoney).reversed());
+        orders.sort(Comparator.comparing(OrderStatisDto::getScale).reversed());
 
         LuckStatisDto luckStatisDto = new LuckStatisDto();
         luckStatisDto.setOrderStatisDtoList(orders);