系统重构

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/Adpage.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/5/7
  */
 @Getter
-public enum Adpage implements Enumeration {
+public enum Adpage implements Enumerable {
     /**
      * 职位首页
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/Adsource.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/5/7
  */
 @Getter
-public enum Adsource implements Enumeration {
+public enum Adsource implements Enumerable {
     /**
      * 腾讯
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/ArticleStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum ArticleStatus implements Enumeration {
+public enum ArticleStatus implements Enumerable {
     /**
      * 审核中
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/CategoryType.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum CategoryType implements Enumeration {
+public enum CategoryType implements Enumerable {
     /**
      * 汽车美容
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/CouponClaimType.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/9/10
  */
 @Getter
-public enum CouponClaimType implements Enumeration {
+public enum CouponClaimType implements Enumerable {
     /**
      * 免费领取
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/CouponStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum CouponStatus implements Enumeration {
+public enum CouponStatus implements Enumerable {
     /**
      * 已上线
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/CouponType.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum CouponType implements Enumeration {
+public enum CouponType implements Enumerable {
     /**
      * 赠送
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/FavoriteType.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum FavoriteType implements Enumeration {
+public enum FavoriteType implements Enumerable {
     /**
      * 商家
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/GoodsStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum GoodsStatus implements Enumeration {
+public enum GoodsStatus implements Enumerable {
     /**
      * 已上线
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/MerchantStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum MerchantStatus implements Enumeration {
+public enum MerchantStatus implements Enumerable {
     /**
      * 审核中
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/OrderStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 
 /**
  * 订单状态枚举
@@ -8,7 +8,7 @@ import com.chelvc.framework.common.model.Enumeration;
  * @author qizai
  * @date 2023/10/19
  */
-public enum OrderStatus implements Enumeration {
+public enum OrderStatus implements Enumerable {
     /**
      * 所有订单
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/PromotionStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/9/10
  */
 @Getter
-public enum PromotionStatus implements Enumeration {
+public enum PromotionStatus implements Enumerable {
     /**
      * 新建
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/ReserveStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/17
  */
 @Getter
-public enum ReserveStatus implements Enumeration {
+public enum ReserveStatus implements Enumerable {
     /**
      * 待处理
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/Sort.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/7/20
  */
 @Getter
-public enum Sort implements Enumeration {
+public enum Sort implements Enumerable {
     /**
      * 综合排序
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/constant/UserCouponStatus.java

@@ -1,6 +1,6 @@
 package com.chelvc.cloud.vehicle.api.constant;
 
-import com.chelvc.framework.common.model.Enumeration;
+import com.chelvc.framework.common.model.Enumerable;
 import lombok.Getter;
 
 /**
@@ -10,7 +10,7 @@ import lombok.Getter;
  * @date 2023/9/8
  */
 @Getter
-public enum UserCouponStatus implements Enumeration {
+public enum UserCouponStatus implements Enumerable {
     /**
      * 未使用
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/AttentionService.java

@@ -3,8 +3,8 @@ package com.chelvc.cloud.vehicle.api.service;
 import com.chelvc.cloud.vehicle.api.dto.AttentionTotalDTO;
 import com.chelvc.cloud.vehicle.api.dto.AttentionUserDTO;
 import com.chelvc.cloud.vehicle.api.param.QueryAttentionParam;
-import com.chelvc.framework.common.model.PagedDTO;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 
 import java.util.List;
 import java.util.Map;
@@ -30,7 +30,7 @@ public interface AttentionService {
    * @author igl
    * @date 2023/2/25 19:42
    */
-  Pagination<AttentionUserDTO> page(PagedDTO page, QueryAttentionParam param, Long userId);
+  Pagination<AttentionUserDTO> page(Paging page, QueryAttentionParam param, Long userId);
 
   /**
    * 查询用户是否关注

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/ProfitRatioConfigService.java

@@ -5,6 +5,7 @@ import com.chelvc.cloud.vehicle.api.param.AddProfitRatioConfigParams;
 import com.chelvc.cloud.vehicle.api.param.EditProfitRatioConfigParams;
 import com.chelvc.cloud.vehicle.api.param.QueryProfitRatioConfigParam;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 
 public interface ProfitRatioConfigService {
 
@@ -14,7 +15,6 @@ public interface ProfitRatioConfigService {
 
     void delete(Long id, Long userId);
 
-    Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Long pageNum,
-                                                   Long pageSize);
+    Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Paging paging);
 
 }

vehicle-server/pom.xml

@@ -19,8 +19,8 @@
         <uc-api.version>1.0.0-SNAPSHOT</uc-api.version>
         <vehicle-api.version>1.0.0-SNAPSHOT</vehicle-api.version>
         <framework-redis.version>1.0.0-RELEASE</framework-redis.version>
-        <framework-database.version>1.0.0-RELEASE</framework-database.version>
         <framework-location.version>1.0.0-RELEASE</framework-location.version>
+        <framework-database.version>1.0.0-RELEASE</framework-database.version>
     </properties>
 
     <dependencies>

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

@@ -1,6 +1,5 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
-import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.AssessRecoverDto;
@@ -20,13 +19,11 @@ import com.chelvc.cloud.vehicle.server.entity.AssessRecover;
 import com.chelvc.cloud.vehicle.server.entity.AssessScore;
 import com.chelvc.cloud.vehicle.server.entity.GoodsAssess;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.model.Session;
-import com.chelvc.framework.base.util.ResourceUtils;
-import com.fasterxml.jackson.databind.util.JSONPObject;
+import com.chelvc.framework.common.model.Session;
+import com.chelvc.framework.common.util.AssertUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.transaction.annotation.Transactional;
@@ -56,7 +53,7 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
     @Override
     public Long add(AssessModifyParam param) {
         Session user = SessionContextHolder.getSession();
-        ResourceUtils.required(this.getOne(new QueryWrapper<GoodsAssess>().eq("order_id", param.getOrderId()).eq("creator", user.getId())) == null, "该订单已评价");
+        AssertUtils.available(this.getOne(new QueryWrapper<GoodsAssess>().eq("order_id", param.getOrderId()).eq("creator", user.getId())) == null, "该订单已评价");
 
         GoodsAssess goodsAssess = GoodsAssessCopier.INSTANCE.copying(param);
         goodsAssess.setHits(0L);
@@ -149,7 +146,7 @@ public class AssessServiceImpl extends ServiceImpl<GoodsAssessMapper, GoodsAsses
     @Override
     public Long addAssessRecover(AssessRecoverModifyParam param) {
 
-        ResourceUtils.required(assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq("assess_id", param.getAssessId())) == null, "该订单已回复");
+        AssertUtils.available(assessRecoverMapper.selectOne(new QueryWrapper<AssessRecover>().eq("assess_id", param.getAssessId())) == null, "该订单已回复");
         AssessRecover assessRecover = AssessRecoverCopier.INSTANCE.copying(param);
         assessRecover.setRecoverTime(new Date());
         assessRecoverMapper.insert(assessRecover);

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

@@ -11,9 +11,9 @@ import com.chelvc.cloud.vehicle.api.param.QueryAttentionParam;
 import com.chelvc.cloud.vehicle.api.service.AttentionService;
 import com.chelvc.cloud.vehicle.server.dao.AttentionMapper;
 import com.chelvc.cloud.vehicle.server.entity.Attention;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.common.model.PagedDTO;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -90,12 +90,9 @@ public class AttentionServiceImpl implements AttentionService {
   }
 
   @Override
-  public Pagination<AttentionUserDTO> page(PagedDTO page, QueryAttentionParam param, Long userId) {
-    if (userId == null) {
-      throw new ResourceUnavailableException("用户不存在");
-    }
-    Long pageCode = page.getPageCode();
-    Long pageSize = page.getPageSize();
+  public Pagination<AttentionUserDTO> page(Paging page, QueryAttentionParam param, Long userId) {
+    long pageCode = page.getNumber();
+    long pageSize = page.getSize();
     long start = (pageCode - 1) * pageSize;
     long end = pageCode * pageSize - 1;
     AttentionType type = param.getType();
@@ -179,9 +176,6 @@ public class AttentionServiceImpl implements AttentionService {
 
   @Override
   public AttentionTotalDTO queryTotalByUserId(Long userId) {
-    if(userId == null){
-      throw new ResourceUnavailableException("用户不存在");
-    }
     AttentionTotalDTO totalDTO = new AttentionTotalDTO();
     String attentionCacheKey = getAttentionCacheKey(userId);
     if(Boolean.FALSE.equals(redisTemplate.hasKey(attentionCacheKey))){
@@ -208,7 +202,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());
-      Map<Long, UserDTO> map = userService.queryUserByIds(userIds);
+      List<UserDTO> users = this.userService.listUsers(userIds);
+      Map<Long, UserDTO> map = users.stream().collect(Collectors.toMap(UserDTO::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/CarouselImagesServiceImpl.java

@@ -8,10 +8,10 @@ import com.chelvc.cloud.vehicle.server.copier.CarouselImagesCopier;
 import com.chelvc.cloud.vehicle.server.dao.CarouselImagesMapper;
 import com.chelvc.cloud.vehicle.server.entity.CarouselImages;
 import com.chelvc.cloud.vehicle.server.service.CarouselImagesService;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -30,7 +30,7 @@ public class CarouselImagesServiceImpl extends ServiceImpl<CarouselImagesMapper,
     @Override
     public Long addCarouselImages(@NonNull CarouselImagesModifyParam param) {
         Integer count = this.lambdaQuery().eq(CarouselImages::getTitle, param.getTitle()).count();
-        ResourceUtils.available(count <= 0, "该轮播图已存在");
+        AssertUtils.available(count <= 0, "该轮播图已存在");
         CarouselImages carouselImages = CarouselImagesCopier.INSTANCE.copying(param);
         this.save(carouselImages);
         return carouselImages.getId();
@@ -38,7 +38,7 @@ public class CarouselImagesServiceImpl extends ServiceImpl<CarouselImagesMapper,
 
     @Override
     public void updateCarouselImages(@NonNull Long id, @NonNull CarouselImagesModifyParam param) {
-        CarouselImages carouselImages = ResourceUtils.required(this.getById(id), "该轮播图不存在");
+        CarouselImages carouselImages = AssertUtils.available(this.getById(id), "该轮播图不存在");
         CarouselImagesCopier.INSTANCE.copying(param, carouselImages);
         this.updateById(carouselImages);
     }
@@ -46,15 +46,15 @@ public class CarouselImagesServiceImpl extends ServiceImpl<CarouselImagesMapper,
     @Override
     public Pagination<CarouselImagesDTO> getCarouselImagesPaging(@NonNull CarouselImagesPagingParam param) {
         Page<CarouselImages> page = this.lambdaQuery()
-                .like(StringUtils.nonEmpty(param.getTitle()), CarouselImages::getTitle, param.getTitle())
+                .like(StringUtils.notEmpty(param.getTitle()), CarouselImages::getTitle, param.getTitle())
                 .eq(Objects.nonNull(param.getStatus()), CarouselImages::getStatus, param.getStatus())
-                .orderByAsc(CarouselImages::getSeq).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, CarouselImagesCopier.INSTANCE::copying);
+                .orderByAsc(CarouselImages::getSeq).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, CarouselImagesCopier.INSTANCE::copying);
     }
 
     @Override
     public void deleteCarouselImages(Long id){
-        ResourceUtils.required(this.getById(id), "该轮播图存在");
+        AssertUtils.available(this.getById(id), "该轮播图存在");
         this.baseMapper.deleteById(id);
     }
 

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

@@ -3,9 +3,7 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -16,10 +14,10 @@ import com.chelvc.cloud.vehicle.server.copier.CategoryCopier;
 import com.chelvc.cloud.vehicle.server.dao.CategoryMapper;
 import com.chelvc.cloud.vehicle.server.entity.Category;
 import com.chelvc.cloud.vehicle.server.service.CategoryService;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -35,7 +33,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     @Override
     public Long addCategory(@NonNull CategoryModifyParam param) {
         Integer count = this.lambdaQuery().eq(Category::getName, param.getName()).count();
-        ResourceUtils.available(count <= 0, "分类名称已存在");
+        AssertUtils.available(count <= 0, "分类名称已存在");
         Category category = CategoryCopier.INSTANCE.copying(param);
         this.save(category);
         return category.getId();
@@ -43,7 +41,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
 
     @Override
     public void updateCategory(@NonNull Long id, @NonNull CategoryModifyParam param) {
-        Category category = ResourceUtils.required(this.getById(id), "分类不存在");
+        Category category = AssertUtils.available(this.getById(id), "分类不存在");
         CategoryCopier.INSTANCE.copying(param, category);
         this.updateById(category);
     }
@@ -51,10 +49,10 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     @Override
     public Pagination<CategoryDTO> getCategoryPaging(@NonNull CategoryPagingParam param) {
         Page<Category> page = this.lambdaQuery()
-                .like(StringUtils.nonEmpty(param.getName()), Category::getName, param.getName())
+                .like(StringUtils.notEmpty(param.getName()), Category::getName, param.getName())
                 .eq(Objects.nonNull(param.getEnabled()), Category::getEnabled, param.getEnabled())
-                .orderByAsc(Category::getSort).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, CategoryCopier.INSTANCE::copying);
+                .orderByAsc(Category::getSort).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, CategoryCopier.INSTANCE::copying);
     }
 
     @Override
@@ -88,7 +86,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     }
     @Override
     public void deleteCategory(Long id){
-        ResourceUtils.required(this.getById(id), "该分类不存在");
+        AssertUtils.available(this.getById(id), "该分类不存在");
         this.baseMapper.deleteById(id);
     }
     @Override

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

@@ -15,8 +15,8 @@ import com.chelvc.cloud.vehicle.server.entity.Comment;
 import com.chelvc.cloud.vehicle.server.service.CommentService;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.util.BeanCopyUtil;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -77,7 +77,7 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
 
     @Override
     public void addGoodsComments(AddGoodsCommentParam param, Long userId) {
-        Comment comment = BeanCopyUtil.copy(param, Comment.class);
+        Comment comment = ObjectUtils.copying(param, Comment.class);
         comment.setUserId(userId);
         baseMapper.insert(comment);
     }
@@ -103,9 +103,9 @@ public class CommentServiceImpl extends ServiceImpl<CommentMapper, Comment> impl
     public Pagination<CommentDTO> selectCommentListByUserId(Long userId, Paging paging) {
         Page<Comment> page = this.lambdaQuery()
                 .eq(Comment::getUserId, userId)
-                .orderByAsc(Comment::getCreateTime).page(PagingUtils.convert(paging));
+                .orderByAsc(Comment::getCreateTime).page(DatabaseContextHolder.page(paging));
         List<Comment> comments = page.getRecords();
-        List<CommentDTO> copy = BeanCopyUtil.copy(comments, CommentDTO.class);
-        return PagingUtils.convert(page, copy);
+        List<CommentDTO> copy = ObjectUtils.copying(comments, CommentDTO.class);
+        return DatabaseContextHolder.pagination(page, copy);
     }
 }

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

@@ -9,9 +9,9 @@ import com.chelvc.cloud.vehicle.server.dao.CommissionConfigMapper;
 import com.chelvc.cloud.vehicle.server.entity.CommissionConfig;
 import com.chelvc.cloud.vehicle.server.service.CommissionConfigService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.AssertUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -41,7 +41,7 @@ public class CommissionConfigServiceImpl extends ServiceImpl<CommissionConfigMap
 
     @Override
     public void updateCommissionConfig(@NonNull Long id, @NonNull CommissionConfigModifyParam param) {
-        CommissionConfig commissionConfig = ResourceUtils.required(this.getById(id), "该抽成配置不存在");
+        CommissionConfig commissionConfig = AssertUtils.available(this.getById(id), "该抽成配置不存在");
         CommissionConfigCopier.INSTANCE.copying(param, commissionConfig);
         Long userId = SessionContextHolder.getId();
         commissionConfig.setUpdateTime(new Date());
@@ -52,13 +52,13 @@ public class CommissionConfigServiceImpl extends ServiceImpl<CommissionConfigMap
     @Override
     public Pagination<CommissionConfigDTO> getCommissionConfigPaging(@NonNull CommissionConfigPagingParam param) {
         Page<CommissionConfig> page = this.lambdaQuery()
-                .orderByAsc(CommissionConfig::getCommissionRate).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, CommissionConfigCopier.INSTANCE::copying);
+                .orderByAsc(CommissionConfig::getCommissionRate).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, CommissionConfigCopier.INSTANCE::copying);
     }
 
     @Override
     public void deleteCommissionConfig(Long id){
-        ResourceUtils.required(this.getById(id), "该轮播图存在");
+        AssertUtils.available(this.getById(id), "该轮播图存在");
         this.baseMapper.deleteById(id);
     }
     @Override

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

@@ -5,10 +5,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chelvc.cloud.vehicle.api.constant.PromotionStatus;
 import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
 import com.chelvc.cloud.vehicle.api.param.CouponModifyParam;
 import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
@@ -16,14 +14,12 @@ import com.chelvc.cloud.vehicle.server.copier.CouponCopier;
 import com.chelvc.cloud.vehicle.server.dao.CouponMapper;
 import com.chelvc.cloud.vehicle.server.entity.Coupon;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
-import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
-import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -50,20 +46,20 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
     @Override
     public void updateCoupon(@NonNull Long id, @NonNull CouponModifyParam param) {
-        Coupon coupon = ResourceUtils.required(this.getById(id), "优惠券不存在");
+        Coupon coupon = AssertUtils.available(this.getById(id), "优惠券不存在");
         CouponCopier.INSTANCE.copying(param, coupon);
         this.updateById(coupon);
     }
 
     @Override
     public void deleteCoupon(@NonNull Long id) {
-        ResourceUtils.required(this.getById(id), "商品优惠卷不存在");
+        AssertUtils.available(this.getById(id), "商品优惠卷不存在");
         this.baseMapper.deleteById(id);
     }
 
     @Override
     public CouponDTO getCoupon(@NonNull Long id) {
-        Coupon coupon = ResourceUtils.required(this.getById(id), "优惠券不存在");
+        Coupon coupon = AssertUtils.available(this.getById(id), "优惠券不存在");
         return this.convert(coupon);
     }
 
@@ -76,7 +72,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
                 .eq(Objects.nonNull(param.getCouponStatus()), Coupon::getStatus, param.getCouponStatus())
                 .eq(Objects.nonNull(param.getCouponClaimType()), Coupon::getClaimType, param.getCouponClaimType())
                 .or().like(!StringUtils.isEmpty(param.getKeyword()), Coupon::getName, param.getKeyword())
-                .orderByDesc(Coupon::getCreateTime).page(PagingUtils.convert(param.getPaging()));
+                .orderByDesc(Coupon::getCreateTime).page(DatabaseContextHolder.page(param.getPaging()));
         List<Coupon> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();
@@ -84,7 +80,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
         // 构建优惠券信息
         List<CouponDTO> clients = records.stream().map(this::convert).collect(Collectors.toList());
-        return PagingUtils.convert(page, clients);
+        return DatabaseContextHolder.pagination(page, clients);
     }
 
     @Override
@@ -92,7 +88,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         // 查询优惠券列表
         Page<Coupon> page = this.lambdaQuery()
                 .eq(Coupon::getMerchantId, merchantId)
-                .orderByDesc(Coupon::getCreateTime).page(PagingUtils.convert(param.getPaging()));
+                .orderByDesc(Coupon::getCreateTime).page(DatabaseContextHolder.page(param.getPaging()));
         List<Coupon> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();
@@ -100,7 +96,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
         // 构建优惠券信息
         List<CouponDTO> clients = records.stream().map(this::convert).collect(Collectors.toList());
-        return PagingUtils.convert(page, clients);
+        return DatabaseContextHolder.pagination(page, clients);
     }
 
     @Override

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

@@ -19,9 +19,9 @@ import com.chelvc.cloud.vehicle.server.dao.DynamicCommentMapper;
 import com.chelvc.cloud.vehicle.server.entity.DynamicComment;
 import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
-import com.chelvc.framework.common.util.BeanCopyUtil;
+import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -75,11 +75,12 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
         new Page<>(pageNum, pageSize), lqw);
     List<DynamicComment> result = page.getRecords();
     if (result != null && result.size() > 0) {
-      List<DynamicCommentDTO> records = BeanCopyUtil.copy(result,
+      List<DynamicCommentDTO> records = ObjectUtils.copying(result,
           DynamicCommentDTO.class);
       List<Long> userIds = records.stream().map(DynamicCommentDTO::getUserId).collect(
           Collectors.toList());
-      Map<Long, UserDTO> map = userService.queryUserByIds(userIds);
+      List<UserDTO> users = this.userService.listUsers(userIds);
+      Map<Long, UserDTO> map = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
       records.forEach(e -> {
         e.setUserDTO(map == null ? new UserDTO() : map.get(e.getUserId()));
       });
@@ -112,8 +113,8 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     if (records != null && !records.isEmpty()) {
       List<Long> userIds = records.stream().map(DynamicCommentDTO::getUserId).collect(
           Collectors.toList());
-      Map<Long, UserDTO> longUserBaseInfoMap = userService.queryUserByIds(
-          userIds);
+      List<UserDTO> users = this.userService.listUsers(userIds);
+      Map<Long, UserDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
       log.info("远程查询用户信息成功:{}", longUserBaseInfoMap);
       List<String> resourceKey = new ArrayList<>();
       records.forEach(e -> {
@@ -143,7 +144,7 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
    */
   @Override
   public void insertByBo(AddDynamicCommentParam param, Long userId) {
-    DynamicComment add = BeanCopyUtil.copy(param, DynamicComment.class);
+    DynamicComment add = ObjectUtils.copying(param, DynamicComment.class);
     add.setUserId(userId);
     boolean b = baseMapper.insert(add) > 0;
     if (!b) {
@@ -248,6 +249,6 @@ public class DynamicCommentServiceImpl implements DynamicCommentService, com.che
     if(dynamicComment == null){
       return null;
     }
-    return BeanCopyUtil.copy(dynamicComment, DynamicCommentDTO.class);
+    return ObjectUtils.copying(dynamicComment, DynamicCommentDTO.class);
   }
 }

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

@@ -25,7 +25,7 @@ import com.chelvc.cloud.vehicle.server.entity.DynamicResource;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
 import com.chelvc.cloud.vehicle.server.service.DynamicResourceService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -126,8 +126,8 @@ public class DynamicContentServiceImpl implements DynamicContentService, com.che
     if (!records.isEmpty()) {
       List<Long> userIds = records.stream().map(DynamicContentDTO::getUserId).collect(
           Collectors.toList());
-      Map<Long, UserDTO> longUserBaseInfoMap = userService.queryUserByIds(
-          userIds);
+      List<UserDTO> users = this.userService.listUsers(userIds);
+      Map<Long, UserDTO> longUserBaseInfoMap = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
       log.info("远程查询用户信息成功:{}", longUserBaseInfoMap);
       if(selfUserId != null){
         records.forEach(e -> {

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

@@ -16,11 +16,11 @@ import com.chelvc.cloud.vehicle.server.entity.DynamicEvaluateRecord;
 import com.chelvc.cloud.vehicle.server.service.DynamicCommentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicContentService;
 import com.chelvc.cloud.vehicle.server.service.DynamicEvaluateRecordService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.util.BeanCopyUtil;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,7 +98,7 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
     List<DynamicEvaluateRecord> dynamicEvaluateRecordEntities = baseMapper.selectList(lwq);
     if (dynamicEvaluateRecordEntities != null && dynamicEvaluateRecordEntities.size() > 0){
       DynamicEvaluateRecord entity = dynamicEvaluateRecordEntities.get(0);
-      return BeanCopyUtil.copy(entity, DynamicEvaluateRecordDTO.class);
+      return ObjectUtils.copying(entity, DynamicEvaluateRecordDTO.class);
     }
     return null;
   }
@@ -124,9 +124,9 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
   public Pagination<EvaluateDTO> selectEvaluateListByUserId(Long userId, Paging paging) {
     Page<DynamicEvaluateRecord> page = this.lambdaQuery()
             .eq(DynamicEvaluateRecord::getTargetUserId, userId)
-            .orderByAsc(DynamicEvaluateRecord::getCreateTime).page(PagingUtils.convert(paging));
+            .orderByAsc(DynamicEvaluateRecord::getCreateTime).page(DatabaseContextHolder.page(paging));
     List<DynamicEvaluateRecord> dynamicEvaluateRecords = page.getRecords();
-    List<EvaluateDTO> copy = BeanCopyUtil.copy(dynamicEvaluateRecords, EvaluateDTO.class);
+    List<EvaluateDTO> copy = ObjectUtils.copying(dynamicEvaluateRecords, EvaluateDTO.class);
     if(copy != null && copy.size() > 0){
       for (EvaluateDTO evaluateDTO : copy) {
         Integer contentType = evaluateDTO.getContentType();
@@ -141,7 +141,7 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
         }
       }
     }
-    return PagingUtils.convert(page, copy);
+    return DatabaseContextHolder.pagination(page, copy);
   }
 
   /**
@@ -157,7 +157,7 @@ public class DynamicEvaluateRecordServiceImpl extends ServiceImpl<DynamicEvaluat
       if(DynamicEvaluateRecord != null){
         throw new ResourceUnavailableException("处理失败");
       }
-      DynamicEvaluateRecord contentEvaluateRecord = BeanCopyUtil.copy(param,
+      DynamicEvaluateRecord contentEvaluateRecord = ObjectUtils.copying(param,
           DynamicEvaluateRecord.class);
       contentEvaluateRecord.setContentType(param.getRecordType().getValue());
       contentEvaluateRecord.setOperaterType(param.getDynamicStatusType().getValue());

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

@@ -6,8 +6,8 @@ import com.chelvc.cloud.vehicle.api.dto.DynamicResourceDTO;
 import com.chelvc.cloud.vehicle.server.dao.DynamicResourceMapper;
 import com.chelvc.cloud.vehicle.server.entity.DynamicResource;
 import com.chelvc.cloud.vehicle.server.service.DynamicResourceService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.common.util.BeanCopyUtil;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.util.ObjectUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -44,6 +44,6 @@ public class DynamicResourceServiceImpl implements DynamicResourceService {
         if(list == null || list.size() == 0){
             return Collections.emptyList();
         }
-        return BeanCopyUtil.copy(list, DynamicResourceDTO.class);
+        return ObjectUtils.copying(list, DynamicResourceDTO.class);
     }
 }

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

@@ -11,13 +11,12 @@ import com.chelvc.cloud.vehicle.server.dao.FavoriteMapper;
 import com.chelvc.cloud.vehicle.server.entity.Favorite;
 import com.chelvc.cloud.vehicle.server.service.FavoriteService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.util.CollectionUtils;
 
-import java.sql.Wrapper;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -41,7 +40,7 @@ public class FavoriteServiceImpl extends ServiceImpl<FavoriteMapper, Favorite> i
                     .eq(Favorite::getUserId, userId)
                     .eq(Favorite::getType, FavoriteType.GOODS)
                     .eq(Favorite::getContentId, merchantId).count();
-            ResourceUtils.available(count <= 0, "收藏信息已存在");
+            AssertUtils.available(count <= 0, "收藏信息已存在");
             Favorite favorite = Favorite.builder().userId(userId).type(FavoriteType.GOODS)
                     .contentId(merchantId).createTime(new Date()).build();
             this.baseMapper.saveFavorite(favorite);
@@ -51,7 +50,7 @@ public class FavoriteServiceImpl extends ServiceImpl<FavoriteMapper, Favorite> i
                     .eq(Favorite::getUserId, userId)
                     .eq(Favorite::getType, FavoriteType.MERCHANT)
                     .eq(Favorite::getContentId, merchantId).count();
-            ResourceUtils.available(count <= 0, "收藏信息已存在");
+            AssertUtils.available(count <= 0, "收藏信息已存在");
             Favorite favorite = Favorite.builder().userId(userId).type(FavoriteType.MERCHANT)
                     .contentId(merchantId).createTime(new Date()).build();
             this.baseMapper.saveFavorite(favorite);
@@ -65,8 +64,8 @@ public class FavoriteServiceImpl extends ServiceImpl<FavoriteMapper, Favorite> i
         Favorite favorite = this.lambdaQuery()
                 .eq(Favorite::getUserId, userId)
                 .eq(Favorite::getContentId, id).one();
-        ResourceUtils.available(favorite != null, "收藏信息不存在");
-        ResourceUtils.available(Objects.equals(favorite.getUserId(), SessionContextHolder.getId()), "非法操作");
+        AssertUtils.available(favorite != null, "收藏信息不存在");
+        AssertUtils.available(Objects.equals(favorite.getUserId(), SessionContextHolder.getId()), "非法操作");
         this.baseMapper.deleteFavorite(id,userId);
     }
 

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

@@ -7,7 +7,7 @@ import com.chelvc.cloud.vehicle.server.dao.FeedbackMapper;
 import com.chelvc.cloud.vehicle.server.entity.FeedBack;
 import com.chelvc.cloud.vehicle.server.service.FeedbackService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.util.AssertUtils;
 import lombok.NonNull;
 import org.apache.dubbo.config.annotation.DubboService;
 
@@ -29,7 +29,7 @@ public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper, FeedBack> i
 
     @Override
     public void updateFeedback(@NonNull Long id, @NonNull FeedBackModifyParam param) {
-        FeedBack feedBack = ResourceUtils.required(this.getById(id), "该意见反馈不存在");
+        FeedBack feedBack = AssertUtils.available(this.getById(id), "该意见反馈不存在");
         FeedbackCopier.INSTANCE.copying(param, feedBack);
         this.updateById(feedBack);
     }

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

@@ -19,10 +19,10 @@ import com.chelvc.cloud.vehicle.server.service.CommentService;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -61,7 +61,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         Long userId = SessionContextHolder.getId();
         GoodsDetailDTO detail = GoodsDetailDTO.builder().build();
         // 获取商品信息
-        Goods goods = ResourceUtils.required(this.getById(id), "商品不存在");
+        Goods goods = AssertUtils.available(this.getById(id), "商品不存在");
         //查询商品是否被收藏
         Integer count = this.baseMapper.goodsFavorite(id,userId);
         detail.setGoods(GoodsCopier.INSTANCE.copying(goods));
@@ -98,14 +98,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public void updateGoods(@NonNull Long id, @NonNull GoodsModifyParam param) {
-        Goods goods = ResourceUtils.required(this.getById(id), "商品不存在");
+        Goods goods = AssertUtils.available(this.getById(id), "商品不存在");
         GoodsCopier.INSTANCE.copying(param, goods);
         this.updateById(goods);
     }
 
     @Override
     public void deleteGoods(@NonNull Long id) {
-        ResourceUtils.required(this.getById(id), "商品不存在");
+        AssertUtils.available(this.getById(id), "商品不存在");
         this.baseMapper.deleteById(id);
     }
 
@@ -115,9 +115,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 .eq(Objects.nonNull(param.getMerchantId()), Goods::getMerchantId, param.getMerchantId())
                 .eq(Objects.nonNull(param.getCategoryId()), Goods::getCategoryId, param.getCategoryId())
                 .eq(Objects.nonNull(param.getStatus()), Goods::getStatus, param.getStatus())
-                .like(StringUtils.nonEmpty(param.getName()), Goods::getName, param.getName())
-                .orderByDesc(Goods::getCreateTime).page(PagingUtils.convert(param.getPaging()));
-        Pagination<GoodsDTO> pagination = PagingUtils.convert(page, GoodsCopier.INSTANCE::copying);
+                .like(StringUtils.notEmpty(param.getName()), Goods::getName, param.getName())
+                .orderByDesc(Goods::getCreateTime).page(DatabaseContextHolder.page(param.getPaging()));
+        Pagination<GoodsDTO> pagination = DatabaseContextHolder.pagination(page, GoodsCopier.INSTANCE::copying);
         pagination.getRecords().forEach(item ->{
             Category category = this.categoryService.getById(item.getCategoryId());
             if (category != null){

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

@@ -1,33 +1,26 @@
 package com.chelvc.cloud.vehicle.server.service.impl;
 
+import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.chelvc.cloud.vehicle.api.dto.MerchantAuthDTO;
-import com.chelvc.cloud.vehicle.api.dto.NoticeDTO;
 import com.chelvc.cloud.vehicle.api.param.MerchantAuthModifyParam;
 import com.chelvc.cloud.vehicle.api.param.MerchantAuthPagingParam;
-import com.chelvc.cloud.vehicle.api.param.NoticeModifyParam;
-import com.chelvc.cloud.vehicle.api.param.NoticePagingParam;
 import com.chelvc.cloud.vehicle.server.copier.MerchantAuthCopier;
-import com.chelvc.cloud.vehicle.server.copier.NoticeCopier;
 import com.chelvc.cloud.vehicle.server.dao.MerchantAuthMapper;
-import com.chelvc.cloud.vehicle.server.dao.NoticeMapper;
 import com.chelvc.cloud.vehicle.server.entity.MerchantAuth;
-import com.chelvc.cloud.vehicle.server.entity.Notice;
 import com.chelvc.cloud.vehicle.server.service.MerchantAuthService;
-import com.chelvc.cloud.vehicle.server.service.NoticeService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Date;
-
 /**
  * 商家认证业务操作实现
  *
@@ -39,7 +32,7 @@ import java.util.Date;
 public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, MerchantAuth> implements MerchantAuthService,
         com.chelvc.cloud.vehicle.api.service.MerchantAuthService {
     @Override
-    public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param){
+    public Long addMerchantAuth(@NonNull MerchantAuthModifyParam param) {
         MerchantAuth merchantAuth = MerchantAuthCopier.INSTANCE.copying(param);
         Long userId = SessionContextHolder.getId();
         merchantAuth.setApplicationTime(new Date());
@@ -50,7 +43,7 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
 
     @Override
     public void updateMerchantAuth(@NonNull Long id, @NonNull MerchantAuthModifyParam param) {
-        MerchantAuth merchantAuth = ResourceUtils.required(this.getById(id), "商家认证不存在");
+        MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         MerchantAuthCopier.INSTANCE.copying(param, merchantAuth);
         this.updateById(merchantAuth);
     }
@@ -58,12 +51,13 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     @Override
     public Pagination<MerchantAuthDTO> getMerchantAuthPaging(@NonNull MerchantAuthPagingParam param) {
         Page<MerchantAuth> page = this.lambdaQuery()
-                .like(StringUtils.nonEmpty(param.getStoreName()), MerchantAuth::getStoreName, param.getStoreName())
-                .orderByAsc(MerchantAuth::getReviewTime).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, MerchantAuthCopier.INSTANCE::copying);
+                .like(StringUtils.notEmpty(param.getStoreName()), MerchantAuth::getStoreName, param.getStoreName())
+                .orderByAsc(MerchantAuth::getReviewTime).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, MerchantAuthCopier.INSTANCE::copying);
     }
+
     @Override
-   public MerchantAuthDTO queryById(){
+    public MerchantAuthDTO queryById() {
         Long userId = SessionContextHolder.getId();
         MerchantAuth merchantAuth = this.lambdaQuery()
                 .eq(MerchantAuth::getApplicant, userId).one();
@@ -71,9 +65,9 @@ public class MerchantAuthServiceImpl extends ServiceImpl<MerchantAuthMapper, Mer
     }
 
     @Override
-    public void certificationAudit(Long id,String state){
+    public void certificationAudit(Long id, String state) {
         Long userId = SessionContextHolder.getId();
-        MerchantAuth merchantAuth = ResourceUtils.required(this.getById(id), "商家认证不存在");
+        MerchantAuth merchantAuth = AssertUtils.available(this.getById(id), "商家认证不存在");
         merchantAuth.setReviewStatus(state);
         merchantAuth.setReviewTime(new Date());
         merchantAuth.setReviewer(userId.toString());

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

@@ -5,7 +5,6 @@ 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.uc.api.dto.UserDTO;
-import com.chelvc.cloud.uc.api.service.EmployeeService;
 import com.chelvc.cloud.uc.api.service.UserService;
 import com.chelvc.cloud.vehicle.api.constant.MerchantStatus;
 import com.chelvc.cloud.vehicle.api.dto.CategoryDTO;
@@ -23,19 +22,17 @@ import com.chelvc.cloud.vehicle.server.service.CategoryService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.location.Address;
 import com.chelvc.framework.location.LocationHandler;
-import com.chelvc.framework.redis.RedisConstant;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -56,15 +53,10 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
 
     private final CategoryService categoryService;
 
-    private final RedisTemplate<String, Object> redisTemplate;
-
     private final LocationHandler locationHandler;
 
     private final RegionMapper regionMapper;
 
-    @DubboReference
-    EmployeeService employeeService;
-
     @DubboReference
     UserService userService;
 
@@ -87,7 +79,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     public MerchantDetailDTO getMerchantDetail(@NonNull Long id) {
         // 获取商家信息
         MerchantDTO merchant = MerchantCopier.INSTANCE.copying(
-                ResourceUtils.required(this.getById(id), "商家不存在")
+                AssertUtils.available(this.getById(id), "商家不存在")
         );
 
         // 获取商家全部商品列表
@@ -108,7 +100,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
     public MerchantDetailDTO getMerchantDetail(Long id, LocationQueryParam param) {
         // 获取商家信息
         MerchantDTO merchant = MerchantCopier.INSTANCE.copying(
-                ResourceUtils.required(this.baseMapper.getMerchantById(id, param), "商家不存在")
+                AssertUtils.available(this.baseMapper.getMerchantById(id, param), "商家不存在")
         );
         Long userId = SessionContextHolder.getSession().getId();
         //查询商家是否被收藏
@@ -140,7 +132,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         Integer count = this.lambdaQuery()
                 .eq(Merchant::getName, param.getName())
                 .eq(Merchant::getStatus, MerchantStatus.ONLINE).count();
-        ResourceUtils.available(count < 1 , "商家名称已存在");
+        AssertUtils.available(count < 1 , "商家名称已存在");
         Merchant merchant = MerchantCopier.INSTANCE.copying(param);
         merchant.setUserId(0L);
         merchant.setScore(0D);
@@ -152,42 +144,30 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
 
     @Override
     public void updateMerchant(@NonNull Long id, @NonNull MerchantModifyParam param) {
-        Merchant merchant = ResourceUtils.required(this.getById(id), "商家不存在");
+        Merchant merchant = AssertUtils.available(this.getById(id), "商家不存在");
         MerchantCopier.INSTANCE.copying(param, merchant);
         this.updateById(merchant);
     }
 
     @Override
     public void deleteMerchant(@NonNull Long id) {
-         ResourceUtils.required(this.getById(id), "商家不存在");
+        AssertUtils.available(this.getById(id), "商家不存在");
         this.baseMapper.deleteById(id);
     }
 
     @Override
     public Pagination<MerchantDTO> getMerchantPaging(@NonNull MerchantPagingParam param) {
-        Long userId = SessionContextHolder.getSession().getId();
-        if (employeeService.isAdmin(userId)){
-            Page<Merchant> page = this.lambdaQuery()
-                    .like(StringUtils.nonEmpty(param.getName()), Merchant::getName, param.getName())
-                    .eq(Objects.nonNull(param.getRecommend()), Merchant::getRecommend, param.getRecommend())
-                    .eq(Objects.nonNull(param.getStatus()), Merchant::getStatus, param.getStatus())
-                    .orderByDesc(Merchant::getCreateTime).page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, MerchantCopier.INSTANCE::copying);
-        }else{
-            Page<Merchant> page = this.lambdaQuery()
-                    .like(StringUtils.nonEmpty(param.getName()), Merchant::getName, param.getName())
-                    .eq(Objects.nonNull(param.getRecommend()), Merchant::getRecommend, param.getRecommend())
-                    .eq(Objects.nonNull(param.getStatus()), Merchant::getStatus, param.getStatus())
-                    .eq(Merchant::getUserId,userId)
-                    .orderByDesc(Merchant::getCreateTime).page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, MerchantCopier.INSTANCE::copying);
-        }
-
+        Page<Merchant> page = this.lambdaQuery()
+                .like(StringUtils.notEmpty(param.getName()), Merchant::getName, param.getName())
+                .eq(Objects.nonNull(param.getRecommend()), Merchant::getRecommend, param.getRecommend())
+                .eq(Objects.nonNull(param.getStatus()), Merchant::getStatus, param.getStatus())
+                .orderByDesc(Merchant::getCreateTime).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, MerchantCopier.INSTANCE::copying);
     }
 
     @Override
     public MerchantDTO getMerchant(@NonNull Long id) {
-        Merchant merchant = ResourceUtils.required(this.getById(id), "商家不存在");
+        Merchant merchant = AssertUtils.available(this.getById(id), "商家不存在");
         return this.convert(merchant);
     }
 
@@ -226,23 +206,13 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         Integer regionId = param.getRegionId();
         Double longitude = (double) 0;
         Double latitude = (double) 0;
-        if(regionId == null){
-            if(Boolean.TRUE.equals(redisTemplate.hasKey(RedisConstant.USER_ADDRESS + userId))){
-                Address address = (Address)redisTemplate.opsForValue().get(RedisConstant.USER_ADDRESS + userId);
-                if(address != null){
-                    regionId = address.getDistrict().getId();
-                    longitude = address.getLongitude();
-                    latitude = address.getLatitude();
-                }
-            }
-        }
         if(regionId == null){
             UserDTO user = userService.getUser(userId);
             if(user == null){
                 return result;
             }
             //LocationHandler locationHandler = locationHandlerConfig.getBean();
-            Address address = locationHandler.ip2address(user.getHost());
+            Address address = locationHandler.ip2address(SessionContextHolder.getHost());
             if(address == null){
                return result;
             }

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

@@ -10,10 +10,10 @@ import com.chelvc.cloud.vehicle.server.dao.NoticeMapper;
 import com.chelvc.cloud.vehicle.server.entity.Notice;
 import com.chelvc.cloud.vehicle.server.service.NoticeService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.util.ResourceUtils;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.AssertUtils;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -42,7 +42,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
 
     @Override
     public void updateNotice(@NonNull Long id, @NonNull NoticeModifyParam param) {
-        Notice notice = ResourceUtils.required(this.getById(id), "通知配置不存在");
+        Notice notice = AssertUtils.available(this.getById(id), "通知配置不存在");
         NoticeCopier.INSTANCE.copying(param, notice);
         this.updateById(notice);
     }
@@ -50,8 +50,8 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     @Override
     public Pagination<NoticeDTO> getNoticePaging(@NonNull NoticePagingParam param) {
         Page<Notice> page = this.lambdaQuery()
-                .like(StringUtils.nonEmpty(param.getTitle()), Notice::getTitle, param.getTitle())
-                .orderByAsc(Notice::getStatus).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, NoticeCopier.INSTANCE::copying);
+                .like(StringUtils.notEmpty(param.getTitle()), Notice::getTitle, param.getTitle())
+                .orderByAsc(Notice::getStatus).page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, NoticeCopier.INSTANCE::copying);
     }
 }

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

@@ -10,8 +10,8 @@ import com.chelvc.cloud.vehicle.server.entity.OmsOrderOperateHistory;
 import com.chelvc.cloud.vehicle.server.service.IOmsOrderOperateHistoryService;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.util.BeanCopyUtil;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -110,10 +110,10 @@ public class OmsOrderOperateHistoryServiceImpl extends ServiceImpl<OmsOrderOpera
     public Pagination<OmsOrderOperateHistoryDTO> selectOmsOrderOperateHistoryListByUserId(Long userId, Paging paging) {
         Page<OmsOrderOperateHistory> page = this.lambdaQuery()
                 .eq(OmsOrderOperateHistory::getUserId, userId)
-                .orderByAsc(OmsOrderOperateHistory::getCreateTime).page(PagingUtils.convert(paging));
+                .orderByAsc(OmsOrderOperateHistory::getCreateTime).page(DatabaseContextHolder.page(paging));
         List<OmsOrderOperateHistory> OmsOrderOperateHistories = page.getRecords();
-        List<OmsOrderOperateHistoryDTO> copy = BeanCopyUtil.copy(OmsOrderOperateHistories, OmsOrderOperateHistoryDTO.class);
-        return PagingUtils.convert(page, copy);
+        List<OmsOrderOperateHistoryDTO> copy = ObjectUtils.copying(OmsOrderOperateHistories, OmsOrderOperateHistoryDTO.class);
+        return DatabaseContextHolder.pagination(page, copy);
     }
 
     /**

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

@@ -7,26 +7,17 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.vehicle.api.dto.DynamicContentDTO;
 import com.chelvc.cloud.vehicle.api.dto.OmsOrderDTO;
-import com.chelvc.cloud.vehicle.api.dto.OmsOrderPayHistoryDTO;
 import com.chelvc.cloud.vehicle.server.dao.OmsOrderPayHistoryMapper;
-import com.chelvc.cloud.vehicle.server.entity.DynamicContent;
-import com.chelvc.cloud.vehicle.server.entity.OmsOrder;
-import com.chelvc.cloud.vehicle.server.entity.OmsOrderOperateHistory;
 import com.chelvc.cloud.vehicle.server.entity.OmsOrderPayHistory;
 import com.chelvc.cloud.vehicle.server.service.IOmsOrderService;
 import com.chelvc.cloud.vehicle.server.service.OmsOrderPayHistoryService;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.database.util.PagingUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class OmsOrderPayHistoryServiceImpl extends ServiceImpl<OmsOrderPayHistoryMapper, OmsOrderPayHistory> implements OmsOrderPayHistoryService {

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

@@ -11,8 +11,8 @@ import com.chelvc.cloud.vehicle.server.entity.OmsOrderReturnApply;
 import com.chelvc.cloud.vehicle.server.service.IOmsOrderReturnApplyService;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.util.BeanCopyUtil;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -109,10 +109,10 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
     public Pagination<OmsOrderReturnApplyIdsDTO> listOrderReturnApply(Long merchantId, Paging paging) {
         Page<OmsOrderReturnApply> page = this.lambdaQuery()
                 .eq(OmsOrderReturnApply::getMerchantId, merchantId)
-                .orderByAsc(OmsOrderReturnApply::getCreateTime).page(PagingUtils.convert(paging));
+                .orderByAsc(OmsOrderReturnApply::getCreateTime).page(DatabaseContextHolder.page(paging));
         List<OmsOrderReturnApply> omsOrderReturnApplies = page.getRecords();
-        List<OmsOrderReturnApplyIdsDTO> copy = BeanCopyUtil.copy(omsOrderReturnApplies, OmsOrderReturnApplyIdsDTO.class);
-        return PagingUtils.convert(page, copy);
+        List<OmsOrderReturnApplyIdsDTO> copy = ObjectUtils.copying(omsOrderReturnApplies, OmsOrderReturnApplyIdsDTO.class);
+        return DatabaseContextHolder.pagination(page, copy);
     }
 
     @Override
@@ -129,6 +129,6 @@ public class OmsOrderReturnApplyServiceImpl extends ServiceImpl<OmsOrderReturnAp
         if (omsOrderReturnApply == null){
             return null;
         }
-        return BeanCopyUtil.copy(omsOrderReturnApply, OmsOrderReturnApplyDTO.class);
+        return ObjectUtils.copying(omsOrderReturnApply, OmsOrderReturnApplyDTO.class);
     }
 }

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

@@ -16,7 +16,7 @@ import com.chelvc.cloud.vehicle.server.service.*;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.apache.http.util.Asserts;
@@ -46,18 +46,12 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
 
     private final OmsOrderSettingService orderSettingService;
 
-    private OmsOrderSettingMapper omsOrderSettingMapper;
-
     private final IOmsOrderItemService omsOrderItemService;
 
     private final UserCouponService userCouponService;
 
-    private final GoodsService goodsService;
-
     private final MerchantService merchantService;
 
-    private final EmployeeService employeeService;
-
     @Override
     public ConfirmOrderResultDTO generateConfirmOrder(OmsOrderModifyParam orderParam) {
         ConfirmOrderResultDTO result = new ConfirmOrderResultDTO();
@@ -349,31 +343,17 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
         Page<OmsOrder> page = this.lambdaQuery()
                 .eq(OmsOrder :: getStatus,param.getStatus())
                 .orderByDesc(OmsOrder :: getCreateTime)
-                .page(PagingUtils.convert(param.getPaging()));
-       return PagingUtils.convert(page, OrderCopier.INSTANCE::copying);
+                .page(DatabaseContextHolder.page(param.getPaging()));
+       return DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
     }
 
     @Override
     public Pagination<OmsOrderDTO> getOmsOrderPaging(OrderPagingParam param){
-        Long userId = SessionContextHolder.getId();
-        if (this.employeeService.isAdmin(userId)){
-            Page<OmsOrder> page = this.lambdaQuery()
-                    .eq(StringUtils.nonEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
-                    .orderByDesc(OmsOrder :: getCreateTime)
-                    .page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, OrderCopier.INSTANCE::copying);
-        }else{
-            List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
-            if (!StringUtils.nonEmpty(merchants)){
-                return null;
-            }
-            Page<OmsOrder> page = this.lambdaQuery()
-                    .eq(StringUtils.nonEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
-                    .in(OmsOrder :: getMerchantId,merchants)
-                    .orderByDesc(OmsOrder :: getCreateTime)
-                    .page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, OrderCopier.INSTANCE::copying);
-        }
+        Page<OmsOrder> page = this.lambdaQuery()
+                .eq(StringUtils.notEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
+                .orderByDesc(OmsOrder :: getCreateTime)
+                .page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
     }
 
     @Override
@@ -735,10 +715,10 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     @Override
     public Pagination<OmsOrderDTO> getMerchantOrderPaging(OrderPagingParam param){
         Page<OmsOrder> page = this.lambdaQuery()
-                .eq(StringUtils.nonEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
+                .eq(StringUtils.notEmpty(param.getStatus()),OmsOrder :: getStatus,param.getStatus())
                 .orderByDesc(OmsOrder :: getCreateTime)
-                .page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, OrderCopier.INSTANCE::copying);
+                .page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
     }
 
 

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

@@ -15,7 +15,7 @@ import com.chelvc.cloud.vehicle.server.entity.ProfitRatioConfig;
 import com.chelvc.cloud.vehicle.server.service.IOmsOrderService;
 import com.chelvc.cloud.vehicle.server.service.PlatformProfitRatioService;
 import com.chelvc.cloud.vehicle.server.service.ProfitRatioConfigService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;

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

@@ -13,8 +13,10 @@ import com.chelvc.cloud.vehicle.api.param.QueryProfitRatioConfigParam;
 import com.chelvc.cloud.vehicle.server.dao.ProfitRatioConfigMapper;
 import com.chelvc.cloud.vehicle.server.entity.ProfitRatioConfig;
 import com.chelvc.cloud.vehicle.server.service.ProfitRatioConfigService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.model.Paging;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,13 +78,12 @@ public class ProfitRatioConfigServiceImpl extends ServiceImpl<ProfitRatioConfigM
     }
 
     @Override
-    public Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Long pageNum, Long pageSize) {
-        Page<ProfitRatioConfigDTO> page = new Page<>(pageNum, pageSize);
+    public Pagination<ProfitRatioConfigDTO> queryPageList(QueryProfitRatioConfigParam param, Paging paging) {
         QueryWrapper<ProfitRatioConfig> wrapper = Wrappers.query();
         wrapper.eq(param.getType() != null, "type", param.getType());
         wrapper.eq(param.getStatus() != null, "status", param.getStatus());
         wrapper.orderByAsc("ratio");
-        IPage<ProfitRatioConfigDTO> result = baseMapper.queryPageList(page, wrapper);
+        IPage<ProfitRatioConfigDTO> result = baseMapper.queryPageList(DatabaseContextHolder.page(paging), wrapper);
         return Pagination.<ProfitRatioConfigDTO>builder().total(result.getTotal()).pages(result.getPages())
                 .records(result.getRecords()).build();
     }

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

@@ -2,7 +2,6 @@ package com.chelvc.cloud.vehicle.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.chelvc.cloud.uc.api.service.EmployeeService;
 import com.chelvc.cloud.vehicle.api.constant.ReserveStatus;
 import com.chelvc.cloud.vehicle.api.dto.ReservationDTO;
 import com.chelvc.cloud.vehicle.api.param.ReservationModifyParam;
@@ -11,12 +10,11 @@ import com.chelvc.cloud.vehicle.api.param.ReservationQueryParam;
 import com.chelvc.cloud.vehicle.server.copier.ReservationCopier;
 import com.chelvc.cloud.vehicle.server.dao.ReservationMapper;
 import com.chelvc.cloud.vehicle.server.entity.Reservation;
-import com.chelvc.cloud.vehicle.server.service.MerchantService;
 import com.chelvc.cloud.vehicle.server.service.ReservationService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.util.StringUtils;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -38,9 +36,6 @@ import java.util.stream.Collectors;
 public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reservation> implements ReservationService,
         com.chelvc.cloud.vehicle.api.service.ReservationService {
 
-    private final MerchantService merchantService;
-
-    private final EmployeeService employeeService;
     @Override
     public void addReservation(@NonNull Long merchantId, @NonNull ReservationModifyParam param) {
         Reservation reservation = ReservationCopier.INSTANCE.copying(param);
@@ -73,24 +68,10 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
     }
     @Override
     public Pagination<ReservationDTO> getReservationPaging(ReservationPagingParam param){
-        Long userId = SessionContextHolder.getId();
-        if (this.employeeService.isAdmin(userId)){
-            Page<Reservation> page = this.lambdaQuery()
-                    .eq(StringUtils.nonEmpty(param.getStatus()),Reservation :: getStatus,param.getStatus())
-                    .orderByDesc(Reservation :: getAppointTime)
-                    .page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, ReservationCopier.INSTANCE::copying);
-        }else{
-            List<Long> merchants = this.merchantService.getMerchantIdsByUserId(userId);
-            if (!StringUtils.nonEmpty(merchants)){
-                return null;
-            }
-            Page<Reservation> page = this.lambdaQuery()
-                    .eq(StringUtils.nonEmpty(param.getStatus()),Reservation :: getStatus,param.getStatus())
-                    .in(Reservation :: getMerchantId,merchants)
-                    .orderByDesc(Reservation :: getAppointTime)
-                    .page(PagingUtils.convert(param.getPaging()));
-            return PagingUtils.convert(page, ReservationCopier.INSTANCE::copying);
-        }
+        Page<Reservation> page = this.lambdaQuery()
+                .eq(StringUtils.notEmpty(param.getStatus()),Reservation :: getStatus,param.getStatus())
+                .orderByDesc(Reservation :: getAppointTime)
+                .page(DatabaseContextHolder.page(param.getPaging()));
+        return DatabaseContextHolder.pagination(page, ReservationCopier.INSTANCE::copying);
     }
 }

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

@@ -20,12 +20,12 @@ import com.chelvc.cloud.vehicle.server.entity.UserCoupon;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
 import com.chelvc.cloud.vehicle.server.service.UserCouponService;
 import com.chelvc.framework.base.context.SessionContextHolder;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
-import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Pagination;
 import com.chelvc.framework.common.model.Paging;
-import com.chelvc.framework.common.util.BeanCopyUtil;
-import com.chelvc.framework.database.util.PagingUtils;
+import com.chelvc.framework.common.util.AssertUtils;
+import com.chelvc.framework.common.util.ObjectUtils;
+import com.chelvc.framework.database.context.DatabaseContextHolder;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
@@ -99,7 +99,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
 
     @Override
     public void updateUserCoupon(@NonNull Long id, @NonNull UserCouponModifyParam param) {
-        UserCoupon userCoupon = ResourceUtils.required(this.getById(id), "优惠券领取记录不存在");
+        UserCoupon userCoupon = AssertUtils.available(this.getById(id), "优惠券领取记录不存在");
         UserCouponCopier.INSTANCE.copying(param, userCoupon);
         this.updateById(userCoupon);
     }
@@ -116,7 +116,7 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
                 .eq(Objects.nonNull(param.getType()), UserCoupon::getType, param.getType().name())
                 .eq(UserCouponStatus.USED.equals(param.getStatus()), UserCoupon::getUsed, 1)
                 .eq(UserCouponStatus.UNUSED.equals(param.getStatus()), UserCoupon::getUsed, 0)
-                .orderByDesc(UserCoupon::getId).page(PagingUtils.convert(param.getPaging()));
+                .orderByDesc(UserCoupon::getId).page(DatabaseContextHolder.page(param.getPaging()));
         List<UserCoupon> records = page.getRecords();
         if (CollectionUtils.isEmpty(records)) {
             return Pagination.empty();
@@ -124,12 +124,12 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
 
         // 构建优惠券领取记录信息
         List<UserCouponDTO> userCoupons = records.stream().map(this::convert).collect(Collectors.toList());
-        return PagingUtils.convert(page, userCoupons);
+        return DatabaseContextHolder.pagination(page, userCoupons);
     }
 
     @Override
     public Long claimCoupon(@NonNull Long couponId) {
-        Coupon coupon = ResourceUtils.required(couponService.getById(couponId), "优惠券不存在");
+        Coupon coupon = AssertUtils.available(couponService.getById(couponId), "优惠券不存在");
         if (CouponClaimType.FREE.equals(coupon.getClaimType())) {
             throw new ResourceUnavailableException("当前优惠券不允许免费领取");
         }
@@ -166,10 +166,10 @@ public class UserCouponServiceImpl extends ServiceImpl<UserCouponMapper, UserCou
     public Pagination<UserCouponDTO> selectUserCouponListByUserId(Long userId, Paging paging) {
         Page<UserCoupon> page = this.lambdaQuery()
                 .eq(UserCoupon::getUserId, userId)
-                .orderByAsc(UserCoupon::getCreateTime).page(PagingUtils.convert(paging));
+                .orderByAsc(UserCoupon::getCreateTime).page(DatabaseContextHolder.page(paging));
         List<UserCoupon> userCoupons = page.getRecords();
-        List<UserCouponDTO> copy = BeanCopyUtil.copy(userCoupons, UserCouponDTO.class);
-        return PagingUtils.convert(page, copy);
+        List<UserCouponDTO> copy = ObjectUtils.copying(userCoupons, UserCouponDTO.class);
+        return DatabaseContextHolder.pagination(page, copy);
     }
 
     /**

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

@@ -17,7 +17,7 @@ import com.chelvc.cloud.vehicle.server.entity.ProfitRatioConfig;
 import com.chelvc.cloud.vehicle.server.entity.UserInvite;
 import com.chelvc.cloud.vehicle.server.entity.UserProfitRatio;
 import com.chelvc.cloud.vehicle.server.service.MerchantService;
-import com.chelvc.framework.base.exception.ResourceUnavailableException;
+import com.chelvc.framework.common.exception.ResourceUnavailableException;
 import com.chelvc.framework.common.model.Paging;
 import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -127,7 +127,8 @@ public class UserInviteServiceImpl extends ServiceImpl<UserInviteMapper, UserInv
         Map<Long, UserDTO> map = new HashMap<>();
         if(param.getType() == null || param.getType() == 1){
             List<Long> ids = records.stream().filter(e -> e.getSourceType() == 1).map(TeamDetailsDTO::getInviteUserId).collect(Collectors.toList());
-            map = userService.queryUserByIds(ids);
+            List<UserDTO> users = this.userService.listUsers(ids);
+            map = users.stream().collect(Collectors.toMap(UserDTO::getId, user -> user));
         }
         for(TeamDetailsDTO detailsDTO : records){
             Integer sourceType = detailsDTO.getSourceType();

vehicle-server/src/main/resources/application-dev.yml

@@ -21,5 +21,8 @@ nacos:
     server-addr: 47.108.128.78:6848
 
 location:
-  tencent:
-    key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT

vehicle-server/src/main/resources/application-pre.yml

@@ -18,4 +18,11 @@ dubbo:
 
 nacos:
   config:
-    server-addr: 127.0.0.1:6848
+    server-addr: 127.0.0.1:6848
+
+location:
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT

vehicle-server/src/main/resources/application-prod.yml

@@ -18,4 +18,11 @@ dubbo:
 
 nacos:
   config:
-    server-addr: 127.0.0.1:6848
+    server-addr: 127.0.0.1:6848
+
+location:
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT

vehicle-server/src/main/resources/application-test.yml

@@ -18,4 +18,11 @@ dubbo:
 
 nacos:
   config:
-    server-addr: 127.0.0.1:6848
+    server-addr: 127.0.0.1:6848
+
+location:
+  caching:
+    enabled: true
+  clients:
+    - key: VPKBZ-CR3CG-R23QE-QK2IY-LNXKZ-GCB34
+      channel: TENCENT