1、接口实现内容修改

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/entity/TravelRoleInfo.java

@@ -52,9 +52,9 @@ public class TravelRoleInfo implements Serializable {
 	@Excel(name = "角色等级", width = 15)
     @ApiModelProperty(value = "角色等级")
     private java.lang.String roleLevel;
-	/**预约时间*/
-	@Excel(name = "预约时间", width = 15)
-    @ApiModelProperty(value = "预约时间")
+	/**预约时间(1-金牌，2-专业)*/
+	@Excel(name = "预约时间(1-金牌，2-专业)", width = 15)
+    @ApiModelProperty(value = "预约时间(1-金牌，2-专业)")
     private java.lang.String preTime;
 	/**预约价格*/
 	@Excel(name = "预约价格", width = 15)
@@ -81,4 +81,8 @@ public class TravelRoleInfo implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
     @ApiModelProperty(value = "所属用户")
     private java.lang.String userId;
+	/**提前预约*/
+	@Excel(name = "提前预约", width = 15)
+    @ApiModelProperty(value = "提前预约")
+    private java.lang.String adPre;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/TravelRoleInfoList.vue

@@ -144,7 +144,7 @@
             dataIndex: 'roleLevel'
           },
           {
-            title:'预约时间',
+            title:'预约时间(1-金牌，2-专业)',
             align:"center",
             dataIndex: 'preTime'
           },
@@ -178,6 +178,11 @@
             align:"center",
             dataIndex: 'userId_dictText'
           },
+          {
+            title:'提前预约',
+            align:"center",
+            dataIndex: 'adPre'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -216,13 +221,14 @@
         fieldList.push({type:'string',value:'roleHead',text:'角色头像',dictCode:''})
         fieldList.push({type:'string',value:'roleName',text:'角色名称',dictCode:''})
         fieldList.push({type:'string',value:'roleLevel',text:'角色等级',dictCode:''})
-        fieldList.push({type:'string',value:'preTime',text:'预约时间',dictCode:''})
+        fieldList.push({type:'string',value:'preTime',text:'预约时间(1-金牌，2-专业)',dictCode:''})
         fieldList.push({type:'double',value:'price',text:'预约价格',dictCode:''})
         fieldList.push({type:'string',value:'preInfo',text:'预约信息',dictCode:''})
         fieldList.push({type:'string',value:'recommend',text:'推荐度',dictCode:''})
         fieldList.push({type:'string',value:'skill',text:'专业擅长',dictCode:''})
         fieldList.push({type:'string',value:'brief',text:'个人简介',dictCode:''})
         fieldList.push({type:'string',value:'userId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"})
+        fieldList.push({type:'string',value:'adPre',text:'提前预约',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue/modules/TravelRoleInfoForm.vue

@@ -24,8 +24,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="预约时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="preTime">
-              <a-input v-model="model.preTime" placeholder="请输入预约时间"  ></a-input>
+            <a-form-model-item label="预约时间(1-金牌，2-专业)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="preTime">
+              <a-input v-model="model.preTime" placeholder="请输入预约时间(1-金牌，2-专业)"  ></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -58,6 +58,11 @@
               <j-dict-select-tag type="list" v-model="model.userId" dictCode="han_hai_member,nick_name,id" placeholder="请选择所属用户" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="提前预约" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adPre">
+              <a-input v-model="model.adPre" placeholder="请输入提前预约"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelRoleInfo/vue3/TravelRoleInfo.data.ts

@@ -26,7 +26,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'roleLevel'
    },
    {
-    title: '预约时间',
+    title: '预约时间(1-金牌，2-专业)',
     align:"center",
     dataIndex: 'preTime'
    },
@@ -60,6 +60,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'userId_dictText'
    },
+   {
+    title: '提前预约',
+    align:"center",
+    dataIndex: 'adPre'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -92,7 +97,7 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '预约时间',
+    label: '预约时间(1-金牌，2-专业)',
     field: 'preTime',
     component: 'Input',
   },
@@ -129,4 +134,9 @@ export const formSchema: FormSchema[] = [
         dictCode:"han_hai_member,nick_name,id"
      },
   },
+  {
+    label: '提前预约',
+    field: 'adPre',
+    component: 'Input',
+  },
 ];

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java

@@ -26,7 +26,7 @@ public class IndexApiController {
     //获取小程序任一文章或服务
 
     //获取banner图列表
-    @ApiOperation(value="小程序-获取banner图列表", notes="1-轮播图_首页")
+    @ApiOperation(value="小程序-获取banner图列表", notes="0-轮播图_首页")
     @GetMapping()
     @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET})
     public Result<?> queryBannerList(String bannerCategoryType){
@@ -48,7 +48,7 @@ public class IndexApiController {
 //    }
 
     //根据分类获取文章列表
-    @ApiOperation(value="小程序-根据分类获取文章列表", notes="1-申遗历程 2-申遗缘由 3-遗产价值")
+    @ApiOperation(value="小程序-根据分类获取文章列表", notes="0-申遗历程 1-申遗缘由 2-遗产价值")
     @RequestMapping(value = "/queryArticleListByType", method = {RequestMethod.GET})
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean){
         return indexApiService.queryArticleListByType(articleType, pageBean);
@@ -76,14 +76,14 @@ public class IndexApiController {
     }
 
     //根据景区id获取该景区下的地点列表-景点/厕所/美食店铺/民宿
-    @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表", notes="areaId: 1-瓷都镇区 2-湖田片区 3-高岭片区 4-瑶里片区 5-蛟潭片区; categoryTyep: 1-景点 2-美食店铺 3-民宿 4-厕所")
+    @ApiOperation(value="小程序-根据景区id获取该景区下的地点列表", notes="areaId: 0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区; categoryTyep: 0-景点 1-美食店铺 2-民宿 3-厕所")
     @RequestMapping(value = "/querySpotList", method = {RequestMethod.GET})
     public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean){
         return indexApiService.querySpotList(areaId, categoryId, pageBean);
     }
 
     //根据角色类型获取角色信息列表-讲解员/达人/摄影师
-    @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="roleId: 1-讲解员，2-达人，3-摄影师")
+    @ApiOperation(value="小程序-根据角色类型获取角色信息列表", notes="level: 1-金牌讲解员， 2-专业讲解员; roleId: 0-讲解员，1-达人，2-摄影师")
     @RequestMapping(value = "/queryRoleInfoList", method = {RequestMethod.GET})
     public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean){
         return indexApiService.queryRoleInfoList(roleId, level, spot, pageBean);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

@@ -74,16 +74,26 @@ public class IndexApiServiceImpl implements IndexApiService {
     public Result<?> queryBannerList(String bannerCategoryId) {
 
         //1-轮播图_首页
-        switch (bannerCategoryId){
-            case "1": bannerCategoryId = "1836222983394902017";
-                break;
+        if(null != bannerCategoryId){
+            switch (bannerCategoryId){
+                case "0": bannerCategoryId = "1836222983394902017";
+                    break;
+            }
         }
 
-        List<TravelImage> list = travelImageService
-                .lambdaQuery()
-                .eq(TravelImage::getCategoryId, bannerCategoryId)
-                .orderByAsc(TravelImage::getOrderId)
-                .list();
+        List<TravelImage> list = null;
+        if(null != bannerCategoryId){
+            list = travelImageService
+                    .lambdaQuery()
+                    .eq(TravelImage::getCategoryId, bannerCategoryId)
+                    .orderByAsc(TravelImage::getOrderId)
+                    .list();
+        }else {
+            list = travelImageService
+                    .lambdaQuery()
+                    .orderByAsc(TravelImage::getOrderId)
+                    .list();
+        }
 
         return Result.OK("轮播图列表", list);
     }
@@ -116,14 +126,14 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> queryArticleListByType(String articleType, PageBean pageBean) {
 
-        //1-申遗历程 2-申遗缘由 3-遗产价值
+        //0-申遗历程 1-申遗缘由 2-遗产价值
         if(null != articleType){
             switch (articleType){
-                case "1": articleType = "1836253741344075777";
+                case "0": articleType = "1836253741344075777";
                     break;
-                case "2": articleType = "1836253813855203330";
+                case "1": articleType = "1836253813855203330";
                     break;
-                case "3": articleType = "1836253884822827009";
+                case "2": articleType = "1836253884822827009";
                     break;
                 default: articleType = null;
             }
@@ -187,33 +197,33 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> querySpotList(String areaId, String categoryId, PageBean pageBean) {
 
-        //1-瓷都镇区 2-湖田片区 3-高岭片区 4-瑶里片区 5-蛟潭片区
+        //0-瓷都镇区 1-湖田片区 2-高岭片区 3-瑶里片区 4-蛟潭片区
         if(null != areaId){
             switch (areaId){
-                case "1": areaId = "1835255148875296770";
+                case "0": areaId = "1835255148875296770";
                     break;
-                case "2": areaId = "1835296270515376130";
+                case "1": areaId = "1835296270515376130";
                     break;
-                case "3": areaId = "1835296379189792769";
+                case "2": areaId = "1835296379189792769";
                     break;
-                case "4": areaId = "1835296552271941634";
+                case "3": areaId = "1835296552271941634";
                     break;
-                case "5": areaId = "1835296680814776322";
+                case "4": areaId = "1835296680814776322";
                     break;
                 default: areaId = null;
             }
         }
 
-        //1-景点 2-美食店铺 3-民宿 4-厕所
+        //0-景点 1-美食店铺 2-民宿 3-厕所
         if(null != categoryId){
             switch (categoryId){
-                case "1": categoryId = "1835297869300174849";
+                case "0": categoryId = "1835297869300174849";
                     break;
-                case "2": categoryId = "1835298116864774146";
+                case "1": categoryId = "1835298116864774146";
                     break;
-                case "3": categoryId = "1835298190902628353";
+                case "2": categoryId = "1835298190902628353";
                     break;
-                case "4": categoryId = "1835297932831297538";
+                case "3": categoryId = "1835297932831297538";
                     break;
                 default: categoryId = null;
             }
@@ -250,16 +260,16 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> queryRoleInfoList(String roleId, String level, String spot, PageBean pageBean) {
 
-        //roleId: 1-讲解员，2-达人，3-摄影师
+        //roleId: 0-讲解员，1-达人，2-摄影师
         if(null != roleId){
             switch (roleId){
-                case "1":
+                case "0":
                     roleId = "1835298310465458178";
                     break;
-                case "2":
+                case "1":
                     roleId = "1835298364374847490";
                     break;
-                case "3":
+                case "2":
                     roleId = "1835298430967812098";
                     break;
                 default: roleId = null;