Merge remote-tracking branch 'origin/dev_group_point' into dev_group_point

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java

@@ -41,6 +41,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.Collator;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
@@ -195,7 +196,8 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
 
         }));
         list =
-                list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed().thenComparing(GroupPointRankingResultDTO::getGroupName))
+                list.stream().sorted(Comparator.comparing(GroupPointRankingResultDTO :: getPoint, Comparator.comparingInt(Integer::parseInt)).reversed()
+                        .thenComparing(GroupPointRankingResultDTO::getGroupName, Collator.getInstance(Locale.CHINA)))
                 .collect(Collectors.toList());
         AtomicInteger i = new AtomicInteger(1);
         list.forEach(dto -> {

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java

@@ -427,6 +427,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         action.setCreatedBy(grantPoint.getOperatorId());
         action.setUpdatedBy(grantPoint.getOperatorId());
         action.setSourceId(grantPoint.getSourceId());
+        action.setSourceType("activity");
         action.setOperatorAgencyId(grantPoint.getOpAgencyId());
         baseDao.insert(action);
         //2.新增/修改用户积分日统计