From 93d7d8a8ee37e53f681b3617e52f9970d9fe53c2 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Fri, 27 Sep 2024 19:47:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8/=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=20=E5=85=B7=E4=BD=93=E5=AE=9E=E7=8E=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../travelController/UserInfoApiController.java | 2 +- .../apiService/impl/IndexApiServiceImpl.java | 89 +++++++++++++++++++--- 2 files changed, 79 insertions(+), 12 deletions(-) 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 index a50da03..bb5b28b 100644 --- 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 @@ -67,7 +67,7 @@ public class UserInfoApiController { } //我的收藏 - @ApiOperation(value="小程序-获取我的收藏列表", notes="小程序-获取我的收藏列表") + @ApiOperation(value="小程序-获取我的收藏列表", notes="collectionType：0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物") @RequestMapping(value = "/queryCollectionList", method = {RequestMethod.GET}) public Result queryCollectionList(String token, String collectionType, PageBean pageBean){ return indexApiService.queryCollectionList(token, collectionType, 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 3e94281..3a5fc09 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 @@ -1,6 +1,5 @@ package org.jeecg.modules.apiService.impl; -import com.baomidou.mybatisplus.extension.conditions.update.UpdateChainWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.jeecg.common.api.vo.Result; import org.jeecg.config.shiro.ShiroRealm; @@ -453,27 +452,80 @@ public class IndexApiServiceImpl implements IndexApiService { } //获取我的收藏列表 + // collectionType：0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物 @Override public Result queryCollectionList(String token, String collectionType, PageBean pageBean) { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList; + List list; + List pageList = null; if(null != collectionType){ - pageList = travelCollectionService + list = travelCollectionService .lambdaQuery() .eq(TravelCollection::getUserId, hanHaiMember.getId()) .eq(TravelCollection::getCollectionType, collectionType) - .page(page); + .list(); }else { - pageList = travelCollectionService + list = travelCollectionService .lambdaQuery() .eq(TravelCollection::getUserId, hanHaiMember.getId()) - .page(page); + .list(); + } + + + String type;//项目类型 + String itemId;//项目编号 + List cellectionList = new ArrayList<>(); + + for (TravelCollection travelCollection : list) { + type = travelCollection.getCollectionType(); + itemId = travelCollection.getItemId(); + switch (type){ + case "0": + case "1": + case "3": + TravelRoleInfo roleInfo = travelRoleInfoService + .lambdaQuery() + .eq(TravelRoleInfo::getId, itemId) + .one(); + if(null != roleInfo){ + cellectionList.add(roleInfo); + } + break; + case "2": + case "5": + TravelAmusement amusement = travelAmusementService + .lambdaQuery() + .eq(TravelAmusement::getId, itemId) + .one(); + if(null != amusement){ + cellectionList.add(amusement); + } + break; + case "4": + TravelExperience experience = travelExperienceService + .lambdaQuery() + .eq(TravelExperience::getId, itemId) + .one(); + if(null != experience){ + cellectionList.add(experience); + } + break; + case "6": + TravelWares wares = travelWaresService + .lambdaQuery() + .eq(TravelWares::getId, itemId) + .one(); + if(null != wares){ + cellectionList.add(wares); + } + break; + } } - return Result.OK("我的收藏列表", pageList); + return Result.OK("我的收藏列表", cellectionList); } //新增收藏 @@ -659,15 +711,30 @@ public class IndexApiServiceImpl implements IndexApiService { HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token); Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); - Page pageList; + List list; - pageList = travelShopcarService + list = travelShopcarService .lambdaQuery() .eq(TravelShopcar::getUserId, hanHaiMember.getId()) .orderByDesc(TravelShopcar::getCreateTime) - .page(page); + .list(); - return Result.OK("文创好物列表", pageList); + String waresId; + List waresList = new ArrayList<>(); + for (TravelShopcar travelShopcar : list) { + waresId = travelShopcar.getWaresId(); + TravelWares wares = travelWaresService + .lambdaQuery() + .eq(TravelWares::getId, waresId) + .one(); + if(null != wares){ + waresList.add(wares); + } + } + + + + return Result.OK("购物车列表", waresList); } //添加购物车