From 858af93c20db653b189119156291ddbaec22d5e6 Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Fri, 2 Feb 2024 09:50:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E5=8C=BA=E5=9F=9F=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shopInfo/table/domain/TbShopTable.java   |  2 +-
 .../shopInfo/table/service/TbShopTableService.java   | 11 ++++++-----
 .../shopInfo/table/service/dto/TbShopTableDto.java   |  2 +-
 .../table/service/dto/TbShopTableQueryCriteria.java  |  2 +-
 .../table/service/impl/TbShopTableServiceImpl.java   | 12 +++++++-----
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java
index 08ca9327..235d2d84 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/domain/TbShopTable.java
@@ -61,7 +61,7 @@ public class TbShopTable implements Serializable {
 
     @Column(name = "`area_id`")
     @ApiModelProperty(value = "区域Id")
-    private String areaId;
+    private Integer areaId;
 
     @Column(name = "`is_predate`")
     @ApiModelProperty(value = "是否接受网络预定")
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java
index 4bb2e8d8..35f8f007 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/TbShopTableService.java
@@ -55,11 +55,12 @@ public interface TbShopTableService {
     TbShopTableDto findById(Integer id);
 
     /**
-    * 创建
-    * @param resources /
-    * @return TbShopTableDto
-    */
-    TbShopTableDto create(TbShopTable resources);
+     * 创建
+     *
+     * @param resources /
+     * @return TbShopTableDto
+     */
+    TbShopTable create(TbShopTable resources);
 
     /**
     * 编辑
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java
index 94e33d38..d30be2d8 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableDto.java
@@ -42,7 +42,7 @@ public class TbShopTableDto implements Serializable {
     private Integer sort;
 
     /** 区域Id */
-    private String areaId;
+    private Integer areaId;
 
     /** 是否接受网络预定 */
     private Integer isPredate;
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java
index 4e679717..6caea1ba 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/dto/TbShopTableQueryCriteria.java
@@ -36,5 +36,5 @@ public class TbShopTableQueryCriteria{
     private Integer shopId;
 
     @Query
-    private String areaId;
+    private Integer areaId;
 }
\ No newline at end of file
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java
index b903775c..8a840a19 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/shopInfo/table/service/impl/TbShopTableServiceImpl.java
@@ -28,7 +28,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
 
 import java.time.Instant;
@@ -51,11 +50,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     public Map<String,Object> queryAll(TbShopTableQueryCriteria criteria, Pageable pageable){
-        if (Objects.equals(criteria.getAreaId(), "0")){
+        if (criteria.getAreaId() == 0){
             criteria.setAreaId(null);
         }
         Page<TbShopTable> page = tbShopTableRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
-        return PageUtil.toPage(page.map(tbShopTableMapper::toDto));
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("content",page.getContent());
+        map.put("totalElements",page.getTotalElements());
+        return map;
     }
 
     @Override
@@ -73,10 +75,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public TbShopTableDto create(TbShopTable resources) {
+    public TbShopTable create(TbShopTable resources) {
         resources.setCreatedAt(Instant.now().toEpochMilli());
         resources.setUpdatedAt(Instant.now().toEpochMilli());
-        return tbShopTableMapper.toDto(tbShopTableRepository.save(resources));
+        return tbShopTableRepository.save(resources);
     }
 
     @Override