去掉用户敏感信息返回

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/AttentionUserDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -25,7 +25,7 @@ public class AttentionUserDTO implements Serializable {
   /**
    * 用户信息
    */
-  private UserDTO userDTO;
+  private BaseUserDTO userDTO;
 
   /**
    * 关注状态(0-自己关注，对方未关注；1-对方已关注，自己未关注；2-互相关注)

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/CommentDTO.java

@@ -1,16 +1,16 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.framework.common.model.File;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
 /**
  * 商品评价信息
  *
@@ -70,5 +70,5 @@ public class CommentDTO implements Serializable {
     /**
      * 用户信息
      */
-    private UserDTO user;
+    private BaseUserDTO user;
 }

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/DynamicCommentDTO.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -108,5 +108,5 @@ public class DynamicCommentDTO implements Serializable {
     /**
      * 用户信息
      */
-    UserDTO userDTO;
+    BaseUserDTO userDTO;
 }

vehicle-client/src/main/java/com/chelvc/cloud/vehicle/client/dto/DynamicContentDTO.java

@@ -1,7 +1,6 @@
 package com.chelvc.cloud.vehicle.client.dto;
 
-import com.chelvc.cloud.user.client.dto.UserDTO;
-import com.chelvc.cloud.user.client.dto.UserRecordsDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -105,5 +104,5 @@ public class DynamicContentDTO implements Serializable {
   /**
    * 用户信息
    */
-  private UserRecordsDTO userDTO;
+  private BaseUserDTO userDTO;
 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/AttentionServiceImpl.java

@@ -3,7 +3,7 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chelvc.cloud.user.client.UserClient;
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.vehicle.client.constant.AttentionType;
 import com.chelvc.cloud.vehicle.client.dto.AttentionTotalDTO;
 import com.chelvc.cloud.vehicle.client.dto.AttentionUserDTO;
@@ -200,8 +200,8 @@ public class AttentionServiceImpl implements AttentionService {
         .reverseRange(cacheKey, start, end);
     if (set != null && set.size() > 0) {
       List<Long> userIds = set.stream().map(e -> (Long) e).collect(Collectors.toList());
-      List<UserDTO> users = this.userClient.listUsers(userIds);
-      Map<Long, UserDTO> map = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
+      List<BaseUserDTO> users = this.userClient.listBaseInfoUsers(userIds);
+      Map<Long, BaseUserDTO> map = users.stream().collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
       set.forEach(e -> {
         AttentionUserDTO attentionUserDTO = new AttentionUserDTO();
         attentionUserDTO.setUserDTO(map.get((Long)e));

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CommentServiceImpl.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.user.client.UserClient;
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.vehicle.client.dto.CommentDTO;
 import com.chelvc.cloud.vehicle.client.param.AddGoodsCommentParam;
 import com.chelvc.cloud.vehicle.client.param.CommentQueryParam;
@@ -43,8 +43,8 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         Set<Long> userIds = CollectionUtils.isEmpty(comments) ? Collections.emptySet() :
                 comments.stream().map(CommentDTO::getUserId).filter(Objects::nonNull).collect(Collectors.toSet());
         if (!CollectionUtils.isEmpty(userIds)) {
-            Map<Long, UserDTO> users = this.userClient.listUsers(userIds).stream()
-                    .collect(Collectors.toMap(UserDTO::getId, user -> user));
+            Map<Long, BaseUserDTO> users = this.userClient.listBaseInfoUsers(new ArrayList<>(userIds)).stream()
+                    .collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
             comments.forEach(comment -> comment.setUser(users.get(comment.getUserId())));
         }
         return comments;
@@ -65,8 +65,8 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
         Set<Long> userIds = CollectionUtils.isEmpty(comments) ? Collections.emptySet() :
                 comments.stream().map(CommentDTO::getUserId).filter(Objects::nonNull).collect(Collectors.toSet());
         if (!CollectionUtils.isEmpty(userIds)) {
-            Map<Long, UserDTO> users = this.userClient.listUsers(userIds).stream()
-                    .collect(Collectors.toMap(UserDTO::getId, user -> user));
+            Map<Long, BaseUserDTO> users = this.userClient.listBaseInfoUsers(new ArrayList<>(userIds)).stream()
+                    .collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
             comments.forEach(comment -> comment.setUser(users.get(comment.getUserId())));
         }
         return comments;

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicCommentServiceImpl.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chelvc.cloud.user.client.UserClient;
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.vehicle.client.constant.DynamicStatusType;
 import com.chelvc.cloud.vehicle.client.constant.ExamineType;
 import com.chelvc.cloud.vehicle.client.constant.RecordType;
@@ -87,8 +87,8 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
                     DynamicCommentDTO.class);
             List<Long> userIds = records.stream().map(DynamicCommentDTO::getUserId).collect(
                     Collectors.toList());
-            List<UserDTO> users = this.userClient.listUsers(userIds);
-            Map<Long, UserDTO> map = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
+            List<BaseUserDTO> users = this.userClient.listBaseInfoUsers(userIds);
+            Map<Long, BaseUserDTO> map = users.stream().collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
             records.forEach(e -> {
                 e.setUserDTO(map.get(e.getUserId()));
                 DynamicEvaluateRecordDTO dto = service.queryOperaterType(e.getId(),
@@ -130,8 +130,8 @@ public class DynamicCommentServiceImpl implements DynamicCommentService {
         if (records != null && !records.isEmpty()) {
             List<Long> userIds = records.stream().map(DynamicCommentDTO::getUserId).collect(
                     Collectors.toList());
-            List<UserDTO> users = this.userClient.listUsers(userIds);
-            Map<Long, UserDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(UserDTO::getId,
+            List<BaseUserDTO> users = this.userClient.listBaseInfoUsers(userIds);
+            Map<Long, BaseUserDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(BaseUserDTO::getId,
                     user -> user));
             log.info("远程查询用户信息成功:{}", longUserBaseInfoMap);
             records.forEach(e -> {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/DynamicContentServiceImpl.java

@@ -8,8 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.chelvc.cloud.user.client.UserClient;
-import com.chelvc.cloud.user.client.dto.UserDTO;
-import com.chelvc.cloud.user.client.dto.UserRecordsDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.vehicle.client.constant.*;
 import com.chelvc.cloud.vehicle.client.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.client.dto.DynamicEvaluateRecordDTO;
@@ -68,8 +67,8 @@ public class DynamicContentServiceImpl implements DynamicContentService{
     if (dynamicContentDTO == null) {
       throw new ResourceUnavailableException("动态不存在");
     }
-    Long userId = dynamicContentDTO.getUserId();
-    UserRecordsDTO user = userClient.getUserRecordsDTO(userId);
+    //Long userId = dynamicContentDTO.getUserId();
+    BaseUserDTO user = userClient.getBaseInfoUser(selfUserId);
     dynamicContentDTO.setUserDTO(user);
     if(selfUserId == null){
       return dynamicContentDTO;
@@ -126,8 +125,8 @@ public class DynamicContentServiceImpl implements DynamicContentService{
     if (!records.isEmpty()) {
       List<Long> userIds = records.stream().map(DynamicContentDTO::getUserId).collect(
           Collectors.toList());
-      List<UserRecordsDTO> users = this.userClient.listUsersToRecords(userIds);
-      Map<Long, UserRecordsDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(UserRecordsDTO::getId, user -> user));
+      List<BaseUserDTO> users = this.userClient.listBaseInfoUsers(userIds);
+      Map<Long, BaseUserDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
       log.info("远程查询用户信息成功:{}", longUserBaseInfoMap);
       if(selfUserId != null){
         records.forEach(e -> {

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/PlatformProfitRatioServiceImpl.java

@@ -45,6 +45,7 @@ public class PlatformProfitRatioServiceImpl extends ServiceImpl<PlatformProfitRa
         if (total <= 0) {
             return;
         }
+        //查询平台分佣配置
         List<ProfitRatioConfig> profitRatioConfigs = profitRatioConfigService.queryListByType(1);
         if (CollectionUtils.isEmpty(profitRatioConfigs)) {
             return;
@@ -56,12 +57,14 @@ public class PlatformProfitRatioServiceImpl extends ServiceImpl<PlatformProfitRa
             pages = total % 100 != 0 ? (total / 100) + 1 : total / 100;
         }
         while (pageNum <= pages) {
+            //分页查询平台抽成比例
             Pagination<PlatformProfitRatioDTO> platformProfitRatioDTOPagination =
                     queryPageList(pageNum, pageSize);
             List<PlatformProfitRatioDTO> records = platformProfitRatioDTOPagination.getRecords();
             if (!CollectionUtils.isEmpty(records)) {
                 for (PlatformProfitRatioDTO dto : records) {
                     Long merchantId = dto.getMerchantId();
+                    //查询该商家上个月营业额
                     BigDecimal amount = omsOrderService.queryAmountByLastMonth(merchantId);
                     for (ProfitRatioConfig config : profitRatioConfigs) {
                         int num = config.getNum();

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/RankAwardRecordServiceImpl.java

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.user.client.UserClient;
-import com.chelvc.cloud.user.client.dto.UserDTO;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.vehicle.client.dto.MerchantRankCountDTO;
 import com.chelvc.cloud.vehicle.client.dto.RankAwardRecordDTO;
 import com.chelvc.cloud.vehicle.client.param.HandRankAwardParam;
@@ -65,13 +65,13 @@ public class RankAwardRecordServiceImpl extends ServiceImpl<RankAwardRecordMappe
             List<Long> userIds =
                     records.stream().filter(e -> e.getPlatformType() != 2).map(RankAwardRecordDTO::getUserId).collect(Collectors.toList());
             if (!CollectionUtils.isEmpty(userIds)) {
-                List<UserDTO> users = this.userService.listUsers(userIds);
-                Map<Long, UserDTO> userMap = ObjectUtils.isEmpty(users) ? Collections.emptyMap() :
-                        users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
+                List<BaseUserDTO> users = this.userService.listBaseInfoUsers(userIds);
+                Map<Long, BaseUserDTO> userMap = ObjectUtils.isEmpty(users) ? Collections.emptyMap() :
+                        users.stream().collect(Collectors.toMap(BaseUserDTO::getId, user -> user));
                 for (RankAwardRecordDTO dto : records) {
                     Integer platformType = dto.getPlatformType();
                     if (platformType != 2) {
-                        UserDTO userDTO = userMap.get(dto.getUserId());
+                        BaseUserDTO userDTO = userMap.get(dto.getUserId());
                         dto.setName(userDTO == null ? "" : userDTO.getNickname());
                     }
                 }

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/UserInviteServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.user.client.UserClient;
+import com.chelvc.cloud.user.client.dto.BaseUserDTO;
 import com.chelvc.cloud.user.client.dto.UserDTO;
 import com.chelvc.cloud.vehicle.client.constant.PlatformConstant;
 import com.chelvc.cloud.vehicle.client.dto.MerchantDTO;
@@ -223,15 +224,15 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
             return dto;
         }
         List<Long> userList = records.stream().map(TeamDetailsDTO::getUserId).collect(Collectors.toList());
-        List<UserDTO> usersLists = this.userService.listUsers(userList);
-        Map<Long, String> userMap = usersLists.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
-        Map<Long, String> mobileMap = usersLists.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
+        List<BaseUserDTO> usersLists = this.userService.listBaseInfoUsers(userList);
+        Map<Long, String> userMap = usersLists.stream().collect(Collectors.toMap(BaseUserDTO::getId, BaseUserDTO::getNickname));
+        //Map<Long, String> mobileMap = usersLists.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
         Map<Long, String> map = new HashMap<>();
         if(param.getType() == null){
             List<Long> userIds = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
-            List<UserDTO> users = this.userService.listUsers(userIds);
+            List<BaseUserDTO> users = this.userService.listBaseInfoUsers(userIds);
             if(!CollectionUtils.isEmpty(users)){
-                map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
+                map = users.stream().collect(Collectors.toMap(BaseUserDTO::getId, BaseUserDTO::getNickname));
             }
             List<Long> merchantIds = records.stream().filter(e -> e.getSourceType() == 2).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
             List<MerchantDTO> merchants = this.merchantService.getMerchantByIds(merchantIds);
@@ -240,9 +241,9 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
             }
         } else if(param.getType() == 1){
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
-            List<UserDTO> users = this.userService.listUsers(ids);
+            List<BaseUserDTO> users = this.userService.listBaseInfoUsers(ids);
             if(!CollectionUtils.isEmpty(users)){
-                map = users.stream().collect(Collectors.toMap(UserDTO::getId, UserDTO::getNickname));
+                map = users.stream().collect(Collectors.toMap(BaseUserDTO::getId, BaseUserDTO::getNickname));
             }
         } else if(param.getType() == 2){
             List<Long> ids = records.stream().map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());

vehicle-server/src/main/resources/mapper/OmsOrderMapper.xml

@@ -940,7 +940,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryAmountByLastMonth" resultType="java.math.BigDecimal">
         select
-            count(pay_amount)
+            sum(pay_amount)
         from
             oms_order
         where