1、获取购物车列表，要把购物车表的数据也给我

2、缺少获取个人信息，修改个人信息的接口
3、加入购物车接口，目前是GET，要不要后面改成POST
4、取消收藏传参，改成收藏类型，关联id，用户token
5、添加购物车接口，在添加相同商品的时候，是修改购物车数量相加，不是新增购物车

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

@@ -6,6 +6,7 @@ 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.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
 import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
@@ -84,9 +85,24 @@ public class UserInfoApiController {
     //取消收藏
     @ApiOperation(value="小程序-取消收藏", notes="小程序-取消收藏")
     @RequestMapping(value = "/deleteCollection", method = {RequestMethod.POST})
-    public Result<?> deleteCollection(@RequestHeader("X-Access-Token") String token, String collectionId){
-        return indexApiService.deleteCollection(token, collectionId);
+    public Result<?> deleteCollection(@RequestHeader("X-Access-Token") String token, String collectionType, String collectionId){
+        return indexApiService.deleteCollection(token, collectionType, collectionId);
     }
 
+    //获取个人信息接口
+    @ApiOperation(value="小程序-查询用户个人信息", notes="小程序-查询用户个人信息")
+    @RequestMapping(value = "/queryHanHaiMemberById", method = {RequestMethod.GET})
+    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token){
+        return indexApiService.queryHanHaiMemberById(token);
+    }
+
+    //获取个人信息接口
+    @ApiOperation(value="小程序-查询用户个人信息", notes="小程序-查询用户个人信息")
+    @RequestMapping(value = "/updateHanHaiMemberById", method = {RequestMethod.GET})
+    public Result<?> queryHanHaiMemberById(@RequestHeader("X-Access-Token") String token, HanHaiMember hanHaiMember){
+        return indexApiService.updateHanHaiMemberById(token, hanHaiMember);
+    }
+
+
 
 }

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

@@ -46,21 +46,21 @@ public class WaresApiController {
 
     //添加购物车
     @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
-    @RequestMapping(value = "/addShopcar", method = {RequestMethod.GET})
+    @RequestMapping(value = "/addShopcar", method = {RequestMethod.POST})
     public Result<?> addShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar travelShopcar){
         return indexApiService.addShopcar(token,travelShopcar);
     }
 
     //取消购物车
     @ApiOperation(value="小程序-取消购物车", notes="小程序-取消购物车")
-    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.GET})
+    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.DELETE})
     public Result<?> deleteShopcar(@RequestHeader("X-Access-Token") String token, String shopcarId){
         return indexApiService.deleteShopcar(token,shopcarId);
     }
 
     //修改购物车商品数量
     @ApiOperation(value="小程序-修改购物车信息", notes="小程序-修改购物车信息")
-    @RequestMapping(value = "/updateShopcar", method = {RequestMethod.GET})
+    @RequestMapping(value = "/updateShopcar", method = {RequestMethod.POST})
     public Result<?> updateShopcar(@RequestHeader("X-Access-Token") String token, TravelShopcar shopcar){
         return indexApiService.updateShopcar(token, shopcar);
     }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiBean/ShopcarApiBean.java

@@ -0,0 +1,11 @@
+package org.jeecg.modules.apiBean;
+
+import lombok.Data;
+import org.jeecg.modules.travelShopcar.entity.TravelShopcar;
+import org.jeecg.modules.travelWares.entity.TravelWares;
+
+@Data
+public class ShopcarApiBean {
+    TravelShopcar shopcar;
+    TravelWares wares;
+}

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.apiService;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.travelAddress.entity.TravelAddress;
 import org.jeecg.modules.travelAdvance.entity.TravelAdvance;
 import org.jeecg.modules.travelCollection.entity.TravelCollection;
@@ -65,7 +66,7 @@ public interface IndexApiService {
     public Result<?> addCollection(String token, TravelCollection travelCollection);
 
     //取消收藏
-    public Result<?> deleteCollection(String token, String collectonId);
+    public Result<?> deleteCollection(String token, String collectionType, String collectonId);
 
     //查询地址
     public Result<?> queryAddress(String token, TravelAddress travelAddress, PageBean pageBean);
@@ -103,6 +104,12 @@ public interface IndexApiService {
     //修改购物车信息
     public Result<?> updateShopcar(String token, TravelShopcar shopcar);
 
+    //获取用户个人信息
+    public Result<?> queryHanHaiMemberById(String token);
+
+    //获取用户个人信息
+    public Result<?> updateHanHaiMemberById(String token, HanHaiMember hanHaiMember);
+
 
     //文创好物-待补充
 

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.apiBean.PageBean;
+import org.jeecg.modules.apiBean.ShopcarApiBean;
 import org.jeecg.modules.apiService.IndexApiService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
@@ -554,15 +555,27 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     //取消收藏
-    public Result<?> deleteCollection(String token, String collectionId) {
+    public Result<?> deleteCollection(String token, String collectionType, String collectionId) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
-        boolean flag = travelCollectionService.removeById(collectionId);
-        if(flag){
-            return Result.OK("取消收藏成功！");
+        TravelCollection collection = travelCollectionService
+                .lambdaQuery()
+                .eq(TravelCollection::getUserId, hanHaiMember.getId())
+                .eq(TravelCollection::getId, collectionId)
+                .eq(TravelCollection::getCollectionType, collectionType)
+                .one();
+
+        if(null != collection){
+            boolean flag = travelCollectionService.removeById(collectionId);
+            if(flag){
+                return Result.OK("取消收藏成功！");
+            }else {
+                return Result.OK("取消收藏失败！");
+            }
         }else {
-            return Result.OK("取消收藏失败！");
+            return Result.OK("取消收藏失败，该收藏不存在，请检查token："+token+"，收藏类型："+collectionType+"收藏编号："+collectionId+"是否正确！");
         }
+
     }
 
 
@@ -717,6 +730,37 @@ public class IndexApiServiceImpl implements IndexApiService {
         return Result.OK("文创好物详情", one);
     }
 
+//    //获取购物车列表
+//    @Override
+//    public Result<?> queryShopcarList(String token, PageBean pageBean) {
+//        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+//
+//        Page<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
+//        List<TravelShopcar> list;
+//
+//        list = travelShopcarService
+//                .lambdaQuery()
+//                .eq(TravelShopcar::getUserId, hanHaiMember.getId())
+//                .orderByDesc(TravelShopcar::getCreateTime)
+//                .list();
+//
+//        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);
+//    }
+
+
     //获取购物车列表
     @Override
     public Result<?> queryShopcarList(String token, PageBean pageBean) {
@@ -724,6 +768,8 @@ public class IndexApiServiceImpl implements IndexApiService {
 
         Page<TravelShopcar> page = new Page<TravelShopcar>(pageBean.getPageNo(), pageBean.getPageSize());
         List<TravelShopcar> list;
+        List<ShopcarApiBean> shopcarApiBeanList = new ArrayList<>();
+        ShopcarApiBean shopcarApiBean = new ShopcarApiBean();
 
         list = travelShopcarService
                 .lambdaQuery()
@@ -732,7 +778,6 @@ public class IndexApiServiceImpl implements IndexApiService {
                 .list();
 
         String waresId;
-        List<TravelWares> waresList = new ArrayList<>();
         for (TravelShopcar travelShopcar : list) {
             waresId = travelShopcar.getWaresId();
             TravelWares wares = travelWaresService
@@ -740,13 +785,13 @@ public class IndexApiServiceImpl implements IndexApiService {
                     .eq(TravelWares::getId, waresId)
                     .one();
             if(null != wares){
-                waresList.add(wares);
+                shopcarApiBean.setWares(wares);
+                shopcarApiBean.setShopcar(travelShopcar);
+                shopcarApiBeanList.add(shopcarApiBean);
             }
         }
 
-
-
-        return Result.OK("购物车列表", waresList);
+        return Result.OK("购物车列表", shopcarApiBeanList);
     }
 
     //添加购物车
@@ -755,12 +800,42 @@ public class IndexApiServiceImpl implements IndexApiService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         travelShopcar.setUserId(hanHaiMember.getId());
 
-        boolean flag = travelShopcarService.save(travelShopcar);
-        if(flag){
-            return Result.OK("添加购物车成功！");
+        TravelShopcar one = travelShopcarService
+                .lambdaQuery()
+                .eq(TravelShopcar::getWaresId, travelShopcar.getWaresId())
+                .eq(TravelShopcar::getId, travelShopcar.getId())
+                .eq(TravelShopcar::getUserId, hanHaiMember.getId())
+                .one();
+
+        //如果商品已存在于购物车，则只增加商品数量
+        if(null != one){
+            TravelShopcar shopcar = new TravelShopcar();
+            shopcar.setUserId(hanHaiMember.getId());
+            shopcar.setId(travelShopcar.getId());
+            shopcar.setWaresId(travelShopcar.getWaresId());
+            int number = one.getShopcarNumber() + travelShopcar.getShopcarNumber();
+            shopcar.setShopcarNumber(number);
+            boolean flag = travelShopcarService.lambdaUpdate()
+                    .eq(TravelShopcar::getUserId, hanHaiMember.getId())
+                    .eq(TravelShopcar::getWaresId, travelShopcar.getWaresId())
+                    .eq(TravelShopcar::getId, shopcar.getId())
+                    .set(TravelShopcar::getShopcarNumber, number)
+                    .update();
+            if(flag){
+                return Result.OK("添加购物车成功！");
+            }else {
+                return Result.OK("添加购物车失败！");
+            }
         }else {
-            return Result.OK("添加购物车失败！");
+            boolean flag = travelShopcarService.save(travelShopcar);
+            if(flag){
+                return Result.OK("添加购物车成功！");
+            }else {
+                return Result.OK("添加购物车失败！");
+            }
         }
+
+
     }
 
     //取消购物车
@@ -789,6 +864,39 @@ public class IndexApiServiceImpl implements IndexApiService {
         }
     }
 
+    //获取用户个人信息
+    @Override
+    public Result<?> queryHanHaiMemberById(String token) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        HanHaiMember one = hanHaiMemberService
+                .lambdaQuery()
+                .eq(HanHaiMember::getId, hanHaiMember.getId())
+                .one();
+        return Result.OK("用户个人信息！", one);
+    }
+
+    //修改用户个人信息
+    @Override
+    public Result<?> updateHanHaiMemberById(String token, HanHaiMember hanHaiMember) {
+        HanHaiMember hanHaiMemberV = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        HanHaiMember one = hanHaiMemberService
+                .lambdaQuery()
+                .eq(HanHaiMember::getId, hanHaiMemberV.getId())
+                .one();
+
+        if(null != one){
+            boolean flag = hanHaiMemberService
+                    .lambdaUpdate()
+                    .eq(HanHaiMember::getId, one.getId())
+                    .update(hanHaiMember);
+        }
+
+        return Result.OK("用户个人信息！", one);
+    }
+
+
 
     //我要帮助-添加建议
     @Override