Merge branch 'doubleEleven2020'

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());