Merge branch 'dev_group_point' into dev_temp

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

@@ -353,7 +353,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             if (("resi_group").equals(event.getEventClass())) {
                 //2021.04.20 小组积分统计
                 //个人小组积分
-                BizPointUserTotalDetailDTO userTotalDetailDTO = bizPointUserTotalDetailService.getDataByObject("group", event.getSourceId(),
+                BizPointUserTotalDetailDTO userTotalDetailDTO = bizPointUserTotalDetailService.getDataByObject("group", event.getGroupId(),
                         event.getUserId());
                 if (null == userTotalDetailDTO) {
                     userTotalDetailDTO = new BizPointUserTotalDetailDTO();
@@ -363,17 +363,17 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
                     userTotalDetailDTO.setUserId(event.getUserId());
                     userTotalDetailDTO.setBizType("group");
                     userTotalDetailDTO.setObjectId(event.getGroupId());
-                    userTotalDetailDTO.setTotalPoint(event.getPoint());
+                    userTotalDetailDTO.setTotalPoint(ruleInfo.getPoint());
                     bizPointUserTotalDetailService.save(userTotalDetailDTO);
                 } else {
-                    userTotalDetailDTO.setTotalPoint(userTotalDetailDTO.getTotalPoint() + event.getPoint());
+                    userTotalDetailDTO.setTotalPoint(userTotalDetailDTO.getTotalPoint() + ruleInfo.getPoint());
                     userTotalDetailDTO.setUpdatedTime(new Date());
                     bizPointUserTotalDetailService.update(userTotalDetailDTO);
                 }
 
                 //小组总积分
-                BizPointTotalDetailDTO totalDetailDTO = bizPointTotalDetailService.getDataByObject("group", event.getSourceId());
+                BizPointTotalDetailDTO totalDetailDTO = bizPointTotalDetailService.getDataByObject("group", event.getGroupId());
-                Integer total = bizPointUserTotalDetailService.getTotalByObject("group", event.getSourceId());
+                Integer total = bizPointUserTotalDetailService.getTotalByObject("group", event.getGroupId());
                 if (null == totalDetailDTO) {
                     totalDetailDTO = new BizPointTotalDetailDTO();
                     totalDetailDTO.setCustomerId(event.getCustomerId());