1、地址、购物车接口实现修改

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

@@ -96,9 +96,9 @@ public class UserInfoApiController {
         return indexApiService.queryHanHaiMemberById(token);
     }
 
-    //获取个人信息接口
-    @ApiOperation(value="小程序-查询用户个人信息", notes="小程序-查询用户个人信息")
-    @RequestMapping(value = "/updateHanHaiMemberById", method = {RequestMethod.GET})
+    //修改个人信息接口
+    @ApiOperation(value="小程序-修改用户个人信息", notes="小程序-修改用户个人信息")
+    @RequestMapping(value = "/updateHanHaiMemberById", method = {RequestMethod.POST})
     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/apiService/impl/IndexApiServiceImpl.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.apiService.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
@@ -555,25 +556,32 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     //取消收藏
-    public Result<?> deleteCollection(String token, String collectionType, String collectionId) {
+    public Result<?> deleteCollection(String token, String collectionType, String itemId) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
 
         TravelCollection collection = travelCollectionService
                 .lambdaQuery()
                 .eq(TravelCollection::getUserId, hanHaiMember.getId())
-                .eq(TravelCollection::getId, collectionId)
+                .eq(TravelCollection::getItemId, itemId)
                 .eq(TravelCollection::getCollectionType, collectionType)
                 .one();
 
+        Wrapper<TravelCollection> wrapper = travelCollectionService
+                .lambdaQuery()
+                .eq(TravelCollection::getUserId, hanHaiMember.getId())
+                .eq(TravelCollection::getItemId, itemId)
+                .eq(TravelCollection::getCollectionType, collectionType)
+                .getWrapper();
+
         if(null != collection){
-            boolean flag = travelCollectionService.removeById(collectionId);
+            boolean flag = travelCollectionService.remove(wrapper);
             if(flag){
                 return Result.OK("取消收藏成功！");
             }else {
                 return Result.OK("取消收藏失败！");
             }
         }else {
-            return Result.OK("取消收藏失败，该收藏不存在，请检查token："+token+"，收藏类型："+collectionType+"收藏编号："+collectionId+"是否正确！");
+            return Result.OK("取消收藏失败，该收藏不存在，请检查token："+token+"，收藏类型："+collectionType+"关联项目编号："+itemId+"是否正确！");
         }
 
     }
@@ -608,7 +616,22 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> addAddress(String token, TravelAddress travelAddress) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        travelAddress.setUserId(hanHaiMember.getId());
+
+        if("1".equals(travelAddress.getAddressDefault())){
+            //将原默认地址改为不默认
+            List<TravelAddress> list = travelAddressService
+                    .lambdaQuery()
+                    .eq(TravelAddress::getAddressDefault,"1")
+                    .eq(TravelAddress::getUserId,travelAddress.getUserId())
+                    .list();
+
+            if(null != list){
+                for (TravelAddress address : list) {
+                    address.setAddressDefault("0");
+                    boolean flag = travelAddressService.updateById(address);
+                }
+            }
+        }
 
         boolean flag = travelAddressService.save(travelAddress);
         if(flag){
@@ -769,7 +792,6 @@ 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()
@@ -777,9 +799,10 @@ public class IndexApiServiceImpl implements IndexApiService {
                 .orderByDesc(TravelShopcar::getCreateTime)
                 .list();
 
-        String waresId;
+
         for (TravelShopcar travelShopcar : list) {
-            waresId = travelShopcar.getWaresId();
+            ShopcarApiBean shopcarApiBean = new ShopcarApiBean();
+            String waresId = travelShopcar.getWaresId();
             TravelWares wares = travelWaresService
                     .lambdaQuery()
                     .eq(TravelWares::getId, waresId)
@@ -798,26 +821,24 @@ public class IndexApiServiceImpl implements IndexApiService {
     @Override
     public Result<?> addShopcar(String token, TravelShopcar travelShopcar) {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
-        travelShopcar.setUserId(hanHaiMember.getId());
 
         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());
+            shopcar.setUserId(one.getUserId());
+            shopcar.setId(one.getId());
+            shopcar.setWaresId(one.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::getUserId, shopcar.getId())
+                    .eq(TravelShopcar::getWaresId, shopcar.getWaresId())
                     .eq(TravelShopcar::getId, shopcar.getId())
                     .set(TravelShopcar::getShopcarNumber, number)
                     .update();