From d07a18c74fad30f2b66f997d6e365719d86e13e9 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Tue, 24 Sep 2024 11:25:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9C=B0=E5=9D=80=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5(=E6=98=AF=E5=90=A6=E4=B8=BA?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80)=202=E3=80=81=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TravelAddressController.java | 2 +- .../travelAddress/entity/TravelAddress.java | 6 +- .../travelAddress/mapper/TravelAddressMapper.java | 2 +- .../service/ITravelAddressService.java | 2 +- .../service/impl/TravelAddressServiceImpl.java | 2 +- .../travelAddress/vue/TravelAddressList.vue | 6 ++ .../vue/modules/TravelAddressForm.vue | 5 + .../travelAddress/vue3/TravelAddress.data.ts | 10 ++ .../travelController/AmusementApiController.java | 51 +++++++++++ .../api/travelController/IndexApiController.java | 101 ++------------------- .../api/travelController/OrderApiController.java | 22 +++++ .../travelController/UserInfoApiController.java | 67 ++++++++++++++ .../jeecg/modules/apiService/IndexApiService.java | 14 ++- .../apiService/impl/IndexApiServiceImpl.java | 76 ++++++---------- 14 files changed, 218 insertions(+), 148 deletions(-) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/AmusementApiController.java create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/controller/TravelAddressController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/controller/TravelAddressController.java index 40f7399..0382ee4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/controller/TravelAddressController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/controller/TravelAddressController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Api(tags="地址表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java index 73dc708..223a0d2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/entity/TravelAddress.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Data @@ -56,4 +56,8 @@ public class TravelAddress implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "所属用户") private java.lang.String memberId; + /**是否为默认地址(0-否 1-是)*/ + @Excel(name = "是否为默认地址(0-否 1-是)", width = 15) + @ApiModelProperty(value = "是否为默认地址(0-否 1-是)") + private java.lang.String addressDefault; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/mapper/TravelAddressMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/mapper/TravelAddressMapper.java index 3bed245..883f336 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/mapper/TravelAddressMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/mapper/TravelAddressMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ public interface TravelAddressMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/ITravelAddressService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/ITravelAddressService.java index 93d0d60..48fa079 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/ITravelAddressService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/ITravelAddressService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ public interface ITravelAddressService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/impl/TravelAddressServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/impl/TravelAddressServiceImpl.java index 2c50987..9466759 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/impl/TravelAddressServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/service/impl/TravelAddressServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 地址表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue index 69dd4aa..97f30d6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/TravelAddressList.vue @@ -147,6 +147,11 @@ align:"center", dataIndex: 'memberId_dictText' }, + { + title:'是否为默认地址(0-否 1-是)', + align:"center", + dataIndex: 'addressDefault' + }, { title: '操作', dataIndex: 'action', @@ -186,6 +191,7 @@ fieldList.push({type:'string',value:'area',text:'所属区域',dictCode:''}) fieldList.push({type:'string',value:'address',text:'详细地址',dictCode:''}) fieldList.push({type:'string',value:'memberId',text:'所属用户',dictCode:"han_hai_member,nick_name,id"}) + fieldList.push({type:'string',value:'addressDefault',text:'是否为默认地址(0-否 1-是)',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue index c244ed9..5be5222 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue/modules/TravelAddressForm.vue @@ -28,6 +28,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts index ba835eb..56cc008 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelAddress/vue3/TravelAddress.data.ts @@ -29,6 +29,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'memberId_dictText' }, + { + title: '是否为默认地址(0-否 1-是)', + align:"center", + dataIndex: 'addressDefault' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -63,4 +68,9 @@ export const formSchema: FormSchema[] = [ dictCode:"han_hai_member,nick_name,id" }, }, + { + label: '是否为默认地址(0-否 1-是)', + field: 'addressDefault', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/AmusementApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/AmusementApiController.java new file mode 100644 index 0000000..0d937d0 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/AmusementApiController.java @@ -0,0 +1,51 @@ +package org.jeecg.modules.api.travelController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.IndexApiService; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="小程序-游玩项目相关接口") +@RestController +@RequestMapping("/api/amusement") +@Slf4j +public class AmusementApiController { + + @Resource + private IndexApiService indexApiService; + + //遗产路径/我要研学列表 + @ApiOperation(value="小程序-获取游玩项目列表", notes="amusementType:0-遗产路径 1-我要研学；isPay:0-免费 1-付费") + @RequestMapping(value = "/queryAmusementList", method = {RequestMethod.GET}) + public Result queryAmusementList(String amusementType, String isPay, PageBean pageBean){ + return indexApiService.queryAmusementList(amusementType, isPay, pageBean); + } + + //遗产路径/我要研学详情 + @ApiOperation(value="小程序-根据id获取游玩项目详情", notes="小程序-根据id获取游玩项目详情") + @RequestMapping(value = "/queryAmusementById", method = {RequestMethod.GET}) + public Result queryAmusementById(String amusementId){ + return indexApiService.queryAmusementById(amusementId); + } + + //非遗列表 + @ApiOperation(value="小程序-获取非遗体验列表", notes="小程序-获取非遗体验列表") + @RequestMapping(value = "/queryExperienceList", method = {RequestMethod.GET}) + public Result queryExperienceList(PageBean pageBean){ + return indexApiService.queryExperienceList(pageBean); + } + + //非遗体验详情 + @ApiOperation(value="小程序-根据id获取非遗体验详情", notes="小程序-根据id获取非遗体验详情") + @RequestMapping(value = "/queryExperienceById", method = {RequestMethod.GET}) + public Result queryExperienceById(String experienceId){ + return indexApiService.queryExperienceById(experienceId); + } +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java index 4f38684..e4fe9a3 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java @@ -36,19 +36,13 @@ public class IndexApiController { return indexApiService.queryBannerList(bannerCategoryType); }; -// //获取视频列表 -// @ApiOperation(value="小程序-获取视频列表", notes="小程序-获取视频列表") -// @RequestMapping(value = "/queryVideoList", method = {RequestMethod.GET}) -// public Result queryVideoList(PageBean pageBean){ -// return indexApiService.queryVideoList(pageBean); -// } - -// //获取文章列表-申遗历程/非遗体验 -// @ApiOperation(value="小程序-获取文章列表", notes="小程序-获取文章列表") -// @RequestMapping(value = "/queryArticleList", method = {RequestMethod.GET}) -// public Result queryArticleList(PageBean pageBean){ -// return indexApiService.queryArticleList(pageBean); -// } + + //根据角色id获取视频列表 + @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表") + @RequestMapping(value = "/queryVedioById", method = {RequestMethod.GET}) + public Result queryVedioById(String roleInfoId, PageBean pageBean){ + return indexApiService.queryVedioById(roleInfoId, pageBean); + } //根据分类获取文章列表 @ApiOperation(value="小程序-根据分类获取文章列表", notes="0-申遗历程 1-申遗缘由 2-遗产价值") @@ -71,7 +65,7 @@ public class IndexApiController { return indexApiService.queryAreaList(pageBean); } - //获取景区列表 + //获取景区详情 @ApiOperation(value="小程序-根据id获取景区详情", notes="小程序-根据id获取景区详情") @RequestMapping(value = "/queryAreaListById", method = {RequestMethod.GET}) public Result queryAreaListById(String areaId){ @@ -85,40 +79,6 @@ public class IndexApiController { return indexApiService.querySpotList(areaId, categoryId, pageBean); } - //根据角色类型获取角色信息列表-讲解员/达人/摄影师 - @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); - } - - //根据角色id获取角色信息详情 - @ApiOperation(value="小程序-根据角色Id获取角色信息详情", notes="小程序-根据角色Id获取角色信息详情") - @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET}) - public Result queryRoleInfoById(String roleInfoId){ - return indexApiService.queryRoleInfoById(roleInfoId); - } - - //根据角色id获取视频列表 - @ApiOperation(value="小程序-根据角色id获取视频列表", notes="小程序-根据角色id获取视频列表") - @RequestMapping(value = "/queryVedioById", method = {RequestMethod.GET}) - public Result queryVedioById(String roleInfoId, PageBean pageBean){ - return indexApiService.queryVedioById(roleInfoId, pageBean); - } - - //遗产路径/我要研学 - @ApiOperation(value="小程序-获取游玩项目列表/详情", notes="amusementType:0-遗产路径 1-我要研学；isPay:0-免费 1-付费") - @RequestMapping(value = "/queryAmusement", method = {RequestMethod.GET}) - public Result queryAmusement(String amusementId, String amusementType, String isPay, PageBean pageBean){ - return indexApiService.queryAmusement(amusementId, amusementType, isPay, pageBean); - } - - //非遗体验 - @ApiOperation(value="小程序-获取非遗体验列表/详情", notes="小程序-获取非遗体验列表/详情") - @RequestMapping(value = "/queryExperience", method = {RequestMethod.GET}) - public Result queryExperience(String experienceId, PageBean pageBean){ - return indexApiService.queryExperience(experienceId, pageBean); - } /*//我的收藏 @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表") @@ -134,51 +94,6 @@ public class IndexApiController { return indexApiService.queryPreOrder(preOrderType, pageBean); }*/ - //地址 - //查询地址 - @ApiOperation(value="小程序-查询地址", notes="小程序-查询地址") - @RequestMapping(value = "/queryAddress", method = {RequestMethod.GET}) - public Result queryAddress(TravelAddress travelAddress, PageBean pageBean){ - return indexApiService.queryAddress(travelAddress, pageBean); - } - - //新增地址 - @ApiOperation(value="小程序-新增地址", notes="小程序-新增地址") - @RequestMapping(value = "/addAddress", method = {RequestMethod.POST}) - public Result addAddress(TravelAddress travelAddress){ - return indexApiService.addAddress(travelAddress); - } - - //删除地址 - @ApiOperation(value="小程序-删除地址", notes="小程序-删除地址") - @RequestMapping(value = "/deleteAddress", method = {RequestMethod.DELETE}) - public Result deleteAddress(String AddressId){ - return indexApiService.deleteAddress(AddressId); - } - - //修改地址 - @ApiOperation(value="小程序-修改地址", notes="小程序-修改地址") - @RequestMapping(value = "/updateAddress", method = {RequestMethod.POST}) - public Result updateAddress(TravelAddress travelAddress){ - return indexApiService.updateAddress(travelAddress); - } - - - //时间段查询 - @ApiOperation(value="小程序-查询预约时间段", notes="小程序-查询预约时间段") - @RequestMapping(value = "/queryOrderTime", method = {RequestMethod.GET}) - public Result queryOrderTime(TravelTime travelTime){ - return indexApiService.queryOrderTime(travelTime); - } - - //查询订单信息 - @ApiOperation(value="小程序-查询订单列表", notes="小程序-查询订单列表") - @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET}) - public Result queryOrderList(TravelOrder travelOrder, PageBean pageBean){ - return indexApiService.queryOrderList(travelOrder, pageBean); - } - - //文创好物-待补充 //瓷都美食-链接美团 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/OrderApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/OrderApiController.java index 472c85d..319333c 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/OrderApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/OrderApiController.java @@ -4,10 +4,15 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.IndexApiService; import org.jeecg.modules.apiService.OrderApiService; +import org.jeecg.modules.travelOrder.entity.TravelOrder; +import org.jeecg.modules.travelTime.entity.TravelTime; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -21,6 +26,23 @@ public class OrderApiController { @Resource private OrderApiService orderApiService; + @Resource + private IndexApiService indexApiService; + + //时间段查询 + @ApiOperation(value="小程序-查询预约时间段", notes="小程序-查询预约时间段") + @RequestMapping(value = "/queryOrderTime", method = {RequestMethod.GET}) + public Result queryOrderTime(TravelTime travelTime){ + return indexApiService.queryOrderTime(travelTime); + } + + //查询订单信息 + @ApiOperation(value="小程序-查询预约订单列表", notes="小程序-查询预约订单列表") + @RequestMapping(value = "/queryOrderList", method = {RequestMethod.GET}) + public Result queryOrderList(TravelOrder travelOrder, PageBean pageBean){ + return indexApiService.queryOrderList(travelOrder, pageBean); + } + //创建订单 @ApiOperation(value = "创建订单",notes = "创建订单") @PostMapping("/createOrder") diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java new file mode 100644 index 0000000..552ef5b --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/UserInfoApiController.java @@ -0,0 +1,67 @@ +package org.jeecg.modules.api.travelController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.apiBean.PageBean; +import org.jeecg.modules.apiService.IndexApiService; +import org.jeecg.modules.travelAddress.entity.TravelAddress; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="小程序-用户信息相关接口") +@RestController +@RequestMapping("/api/user") +@Slf4j +public class UserInfoApiController { + + @Resource + private IndexApiService indexApiService; + + //根据角色类型获取角色信息列表-讲解员/达人/摄影师 + @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); + } + + //根据角色id获取角色信息详情 + @ApiOperation(value="小程序-根据角色Id获取角色信息详情", notes="小程序-根据角色Id获取角色信息详情") + @RequestMapping(value = "/queryRoleInfoById", method = {RequestMethod.GET}) + public Result queryRoleInfoById(String roleInfoId){ + return indexApiService.queryRoleInfoById(roleInfoId); + } + + //查询地址 + @ApiOperation(value="小程序-查询地址", notes="小程序-查询地址") + @RequestMapping(value = "/queryAddress", method = {RequestMethod.GET}) + public Result queryAddress(TravelAddress travelAddress, PageBean pageBean){ + return indexApiService.queryAddress(travelAddress, pageBean); + } + + //新增地址 + @ApiOperation(value="小程序-新增地址", notes="小程序-新增地址") + @RequestMapping(value = "/addAddress", method = {RequestMethod.POST}) + public Result addAddress(TravelAddress travelAddress){ + return indexApiService.addAddress(travelAddress); + } + + //删除地址 + @ApiOperation(value="小程序-删除地址", notes="小程序-删除地址") + @RequestMapping(value = "/deleteAddress", method = {RequestMethod.DELETE}) + public Result deleteAddress(String AddressId){ + return indexApiService.deleteAddress(AddressId); + } + + //修改地址 + @ApiOperation(value="小程序-修改地址", notes="小程序-修改地址") + @RequestMapping(value = "/updateAddress", method = {RequestMethod.POST}) + public Result updateAddress(TravelAddress travelAddress){ + return indexApiService.updateAddress(travelAddress); + } + +} diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java index 9dbd636..d1af436 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java @@ -42,11 +42,17 @@ public interface IndexApiService { //根据角色id获取视频列表 public Result queryVedioById(String roleInfoId, PageBean pageBean); - //根据角色id获取视遗产路径/我要研学列表 - public Result queryAmusement(String amusementId, String amusementType, String isPay, PageBean pageBean); + //获取视遗产路径/我要研学列表 + public Result queryAmusementList(String amusementType, String isPay, PageBean pageBean); - //非遗体验 - public Result queryExperience(String experienceId, PageBean pageBean); + //根据id获取视遗产路径/我要研学详情 + public Result queryAmusementById(String amusementId); + + //非遗体验列表 + public Result queryExperienceList(PageBean pageBean); + + //非遗体验详情 + public Result queryExperienceById(String experienceId); //我的收藏 public Result queryCollection(String collectionType, PageBean pageBean); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java index afca8af..653b101 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java @@ -397,46 +397,16 @@ public class IndexApiServiceImpl implements IndexApiService { //获取游玩项目列表 @Override - public Result queryAmusement(String amusementId, String amusementType, String isPay, PageBean pageBean) { + public Result queryAmusementList(String amusementType, String isPay, PageBean pageBean) { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); Page pageList; - if(null != amusementId && null != amusementType && null != isPay){ + if(null != amusementType && null != isPay){ pageList = travelAmusementService .lambdaQuery() - .eq(TravelAmusement::getId, amusementId) .eq(TravelAmusement::getAmusementType, amusementType) .eq(TravelAmusement::getIsPay, isPay) .page(page); - }else if(null != amusementId && null != amusementType){ - pageList = travelAmusementService - .lambdaQuery() - .eq(TravelAmusement::getId, amusementId) - .eq(TravelAmusement::getAmusementType, amusementType) - .page(page); - }else if(null != amusementId && null != isPay){ - pageList = travelAmusementService - .lambdaQuery() - .eq(TravelAmusement::getId, amusementId) - .eq(TravelAmusement::getIsPay, isPay) - .page(page); - }else if(null != amusementType && null != isPay){ - pageList = travelAmusementService - .lambdaQuery() - .eq(TravelAmusement::getAmusementType, amusementType) - .eq(TravelAmusement::getIsPay, isPay) - .page(page); - }else if(null != amusementId && null != amusementType){ - pageList = travelAmusementService - .lambdaQuery() - .eq(TravelAmusement::getId, amusementId) - .eq(TravelAmusement::getAmusementType, amusementType) - .page(page); - }else if(null != amusementId){ - pageList = travelAmusementService - .lambdaQuery() - .eq(TravelAmusement::getId, amusementId) - .page(page); }else if(null != amusementType){ pageList = travelAmusementService .lambdaQuery() @@ -457,25 +427,39 @@ public class IndexApiServiceImpl implements IndexApiService { return Result.OK("游玩项目列表/详情", pageList); } - //获取非遗体验 + //获取游玩项目详情 @Override - public Result queryExperience(String experienceId, PageBean pageBean) { + public Result queryAmusementById(String amusementId) { + TravelAmusement one = travelAmusementService + .lambdaQuery() + .eq(TravelAmusement::getId, amusementId) + .one(); + + return Result.OK("游玩项目详情", one); + } + + //获取非遗体验列表 + @Override + public Result queryExperienceList(PageBean pageBean) { Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList; + Page pageList = travelExperienceService + .lambdaQuery() + .page(page); - if(null != experienceId){ - pageList = travelExperienceService - .lambdaQuery() - .eq(TravelExperience::getId, experienceId) - .page(page); - }else { - pageList = travelExperienceService - .lambdaQuery() - .page(page); - } + return Result.OK("非遗体验列表", pageList); + } + + //获取非遗体验详情 + @Override + public Result queryExperienceById(String experienceId) { + + TravelExperience one = travelExperienceService + .lambdaQuery() + .eq(TravelExperience::getId, experienceId) + .one(); - return Result.OK("非遗体验列表/详情", pageList); + return Result.OK("非遗体验详情", one); } @Override