1、我的收藏列表/购物车列表 具体实现修改

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);

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<TravelCollection> page = new Page<TravelCollection>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<TravelCollection> pageList;
+        List<TravelCollection> list;
+        List<TravelCollection> 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<Object> 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<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
-        Page<TravelShopcar> pageList;
+        List<TravelShopcar> list;
 
-        pageList = travelShopcarService
+        list = travelShopcarService
                 .lambdaQuery()
                 .eq(TravelShopcar::getUserId, hanHaiMember.getId())
                 .orderByDesc(TravelShopcar::getCreateTime)
-                .page(page);
+                .list();
 
-        return Result.OK("文创好物列表", pageList);
+        String waresId;
+        List<TravelWares> 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);
     }
 
     //添加购物车