Merge branch 'master' into yonge

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

@@ -498,6 +498,6 @@
     </resultMap>
     <select id="getLuckStatis" resultMap="luckStatis">
         SELECT o.name_ organName, SUM(spo.actual_amount_) money ,COUNT(spo.id_) nums FROM student_payment_order spo LEFT JOIN organization o ON o.id_=spo.organ_id_
-        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY spo.organ_id_
+        WHERE spo.type_='LUCK' AND spo.status_='SUCCESS' GROUP BY spo.organ_id_ ORDER BY nums DESC;
     </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -14,12 +14,9 @@ import io.swagger.annotations.ApiOperation;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -128,6 +125,7 @@ public class StudentOrderController extends BaseController {
             List<Goods> goodsList = studentPaymentOrderDetailService.findApplyOrderGoods(orderByOrderNo.getId());
             orderDetail.put("goods", goodsList);
             orderDetail.put("course", musicGroup.getCourseForm());
+            orderDetail.put("ownershipType",musicGroup.getOwnershipType());
         } else if (orderByOrderNo.getGroupType().equals(GroupType.VIP)) {
             VipBuyResultDto vipBuyResultInfo = vipGroupService.findVipBuyResultInfo(Integer.valueOf(orderByOrderNo.getMusicGroupId()));
             orderDetail.put("detail", vipBuyResultInfo);
@@ -300,15 +298,13 @@ public class StudentOrderController extends BaseController {
         List<Organization> organs = organizationDao.findAllOrgans();
         List<OrderStatisDto> orders = studentPaymentOrderDao.getLuckStatis();
 
-        BigDecimal totalMoney = BigDecimal.ZERO;
-        Integer totalNum = 0;
+
         for (Organization organ : organs) {
             boolean flag = false;
             for (OrderStatisDto order : orders) {
-                totalMoney = totalMoney.add(order.getMoney());
-                totalNum += order.getNums();
                 if (organ.getName().equals(order.getOrganName())) {
                     flag = true;
+                    break;
                 }
             }
             if (!flag) {
@@ -320,6 +316,16 @@ public class StudentOrderController extends BaseController {
             }
         }
 
+        BigDecimal totalMoney = BigDecimal.ZERO;
+        Integer totalNum = 0;
+        for (OrderStatisDto order : orders) {
+            if (order.getOrganName().equals("总部国际") || order.getOrganName().equals("阳光总部国际") || order.getOrganName().equals("武汉小学"))
+                continue;
+            totalMoney = totalMoney.add(order.getMoney());
+            totalNum += order.getNums();
+        }
+        orders = orders.stream().sorted(Comparator.comparing(OrderStatisDto::getNums).reversed()).collect(Collectors.toList());
+
         LuckStatisDto luckStatisDto = new LuckStatisDto();
         luckStatisDto.setOrderStatisDtoList(orders);
         luckStatisDto.setTotalNum(totalNum);