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

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

@@ -140,7 +140,6 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         }
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
             if (info.getMaxNum() != null && info.getPaidNum() > 0) {
-                info = sporadicChargeInfoDao.get(info.getId());
                 info.setPaidNum(info.getPaidNum() - 1);
                 info.setUpdateTime(new Date());
                 int update = sporadicChargeInfoDao.update(info);

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

@@ -235,12 +235,16 @@ public class SysUserCashAccountServiceImpl extends BaseServiceImpl<Integer, SysU
         sysUserCashAccountDao.update(cashAccount);
 
         if (decimal.compareTo(BigDecimal.ZERO) != 0) {
+           String comment = description;
             SysUser sysUser = sysUserFeignService.queryUserInfo();
+            if(sysUser != null && sysUser.getId()!=null){
+                comment +=  "-" + sysUser.getId();
+            }
             SysUserCoursesAccountDetail sysUserCoursesAccountDetail = new SysUserCoursesAccountDetail();
             sysUserCoursesAccountDetail.setUserId(userId);
             sysUserCoursesAccountDetail.setAmount(decimal);
             sysUserCoursesAccountDetail.setBalance(balance);
-            sysUserCoursesAccountDetail.setComment(description + "-" + sysUser.getId());
+            sysUserCoursesAccountDetail.setComment(comment);
             sysUserCoursesAccountDetail.setStatus(DealStatusEnum.SUCCESS);
             sysUserCoursesAccountDetail.setType(type);
             sysUserCoursesAccountDetail.setUpdateTime(date);

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

@@ -66,9 +66,10 @@ public class ActivityController extends BaseController {
             totalNum += order.getNums();
             totalMoney = totalMoney.add(order.getMoney());
             if (order.getEstimatedNums() <= 0) {
-                order.setEstimatedNums(1);
+                order.setScale(new BigDecimal(order.getNums()).multiply(new BigDecimal(100)).divide(new BigDecimal(1), 2, BigDecimal.ROUND_HALF_UP));
+            }else {
+                order.setScale(new BigDecimal(order.getNums()).multiply(new BigDecimal(100)).divide(new BigDecimal(order.getEstimatedNums()), 2, BigDecimal.ROUND_HALF_UP));
             }
-            order.setScale(new BigDecimal(order.getNums()).multiply(new BigDecimal(100)).divide(new BigDecimal(order.getEstimatedNums()), 2, BigDecimal.ROUND_HALF_UP));
         }
         orders.sort(Comparator.comparing(OrderStatisDto::getMoney).reversed());