1、文创好物字段添加

2、收藏、购物车添加删除接口
3、购物车添加修改接口
4、添加收藏接口调整
5、修改地址修改(默认地址一个用户只能存在一个)

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Api(tags="收藏表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Data
@@ -52,24 +52,8 @@ public class TravelCollection implements Serializable {
 	@Excel(name = "收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)", width = 15)
     @ApiModelProperty(value = "收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)")
     private java.lang.String collectionType;
-	/**收藏项目编号*/
-	@Excel(name = "收藏项目编号", width = 15)
-    @ApiModelProperty(value = "收藏项目编号")
-    private java.lang.String collectionItmeId;
-	/**收藏项目主题*/
-	@Excel(name = "收藏项目主题", width = 15)
-    @ApiModelProperty(value = "收藏项目主题")
-    private java.lang.String collectionTitle;
-	/**收藏项目预约时间*/
-	@Excel(name = "收藏项目预约时间", width = 15)
-    @ApiModelProperty(value = "收藏项目预约时间")
-    private java.lang.String collectionPretime;
-	/**收藏项目价格*/
-	@Excel(name = "收藏项目价格", width = 15)
-    @ApiModelProperty(value = "收藏项目价格")
-    private java.math.BigDecimal collectionPrice;
-	/**收藏项目封面*/
-	@Excel(name = "收藏项目封面", width = 15)
-    @ApiModelProperty(value = "收藏项目封面")
-    private java.lang.String collectionImage;
+	/**项目所属id*/
+	@Excel(name = "项目所属id", width = 15)
+    @ApiModelProperty(value = "项目所属id")
+    private java.lang.String itemId;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface TravelCollectionMapper extends BaseMapper<TravelCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface ITravelCollectionService extends IService<TravelCollection> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 收藏表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue

@@ -127,29 +127,9 @@
             dataIndex: 'collectionType'
           },
           {
-            title:'收藏项目编号',
+            title:'项目所属id',
             align:"center",
-            dataIndex: 'collectionItmeId'
-          },
-          {
-            title:'收藏项目主题',
-            align:"center",
-            dataIndex: 'collectionTitle'
-          },
-          {
-            title:'收藏项目预约时间',
-            align:"center",
-            dataIndex: 'collectionPretime'
-          },
-          {
-            title:'收藏项目价格',
-            align:"center",
-            dataIndex: 'collectionPrice'
-          },
-          {
-            title:'收藏项目封面',
-            align:"center",
-            dataIndex: 'collectionImage'
+            dataIndex: 'itemId'
           },
           {
             title: '操作',
@@ -186,11 +166,7 @@
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'collectionType',text:'收藏项目类型(0-遗产讲述 1-达人同游 2-遗产路径 3-我要跟拍 4-非遗体验 5-我要研学 6-文创好物)',dictCode:''})
-        fieldList.push({type:'string',value:'collectionItmeId',text:'收藏项目编号',dictCode:''})
-        fieldList.push({type:'string',value:'collectionTitle',text:'收藏项目主题',dictCode:''})
-        fieldList.push({type:'string',value:'collectionPretime',text:'收藏项目预约时间',dictCode:''})
-        fieldList.push({type:'BigDecimal',value:'collectionPrice',text:'收藏项目价格',dictCode:''})
-        fieldList.push({type:'string',value:'collectionImage',text:'收藏项目封面',dictCode:''})
+        fieldList.push({type:'string',value:'itemId',text:'项目所属id',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue

@@ -9,28 +9,8 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="收藏项目编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionItmeId">
-              <a-input v-model="model.collectionItmeId" placeholder="请输入收藏项目编号"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="收藏项目主题" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionTitle">
-              <a-input v-model="model.collectionTitle" placeholder="请输入收藏项目主题"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="收藏项目预约时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionPretime">
-              <a-input v-model="model.collectionPretime" placeholder="请输入收藏项目预约时间"  ></a-input>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="收藏项目价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionPrice">
-              <a-input-number v-model="model.collectionPrice" placeholder="请输入收藏项目价格" style="width: 100%" />
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="收藏项目封面" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="collectionImage">
-              <a-input v-model="model.collectionImage" placeholder="请输入收藏项目封面"  ></a-input>
+            <a-form-model-item label="项目所属id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="itemId">
+              <a-input v-model="model.itemId" placeholder="请输入项目所属id"  ></a-input>
             </a-form-model-item>
           </a-col>
         </a-row>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts

@@ -10,29 +10,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'collectionType'
    },
    {
-    title: '收藏项目编号',
+    title: '项目所属id',
     align:"center",
-    dataIndex: 'collectionItmeId'
-   },
-   {
-    title: '收藏项目主题',
-    align:"center",
-    dataIndex: 'collectionTitle'
-   },
-   {
-    title: '收藏项目预约时间',
-    align:"center",
-    dataIndex: 'collectionPretime'
-   },
-   {
-    title: '收藏项目价格',
-    align:"center",
-    dataIndex: 'collectionPrice'
-   },
-   {
-    title: '收藏项目封面',
-    align:"center",
-    dataIndex: 'collectionImage'
+    dataIndex: 'itemId'
    },
 ];
 //查询数据
@@ -46,28 +26,8 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
   },
   {
-    label: '收藏项目编号',
-    field: 'collectionItmeId',
-    component: 'Input',
-  },
-  {
-    label: '收藏项目主题',
-    field: 'collectionTitle',
-    component: 'Input',
-  },
-  {
-    label: '收藏项目预约时间',
-    field: 'collectionPretime',
-    component: 'Input',
-  },
-  {
-    label: '收藏项目价格',
-    field: 'collectionPrice',
-    component: 'InputNumber',
-  },
-  {
-    label: '收藏项目封面',
-    field: 'collectionImage',
+    label: '项目所属id',
+    field: 'itemId',
     component: 'Input',
   },
 ];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Api(tags="图片信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Data
@@ -47,7 +47,7 @@ public class TravelImage implements Serializable {
 	@Excel(name = "图片分类", width = 15, dictTable = "travel_category", dicText = "category_name", dicCode = "id")
 	@Dict(dictTable = "travel_category", dicText = "category_name", dicCode = "id")
     @ApiModelProperty(value = "图片分类")
-    private java.lang.Integer categoryId;
+    private java.lang.String categoryId;
 	/**排序编号*/
 	@Excel(name = "排序编号", width = 15)
     @ApiModelProperty(value = "排序编号")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface TravelImageMapper extends BaseMapper<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface ITravelImageService extends IService<TravelImage> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 图片信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue

@@ -179,7 +179,7 @@
         let fieldList=[];
         fieldList.push({type:'string',value:'imageName',text:'图片名称',dictCode:''})
         fieldList.push({type:'string',value:'imageContent',text:'图片内容',dictCode:''})
-        fieldList.push({type:'int',value:'categoryId',text:'图片分类',dictCode:"travel_category,category_name,id"})
+        fieldList.push({type:'string',value:'categoryId',text:'图片分类',dictCode:"travel_category,category_name,id"})
         fieldList.push({type:'int',value:'orderId',text:'排序编号',dictCode:''})
         this.superFieldList = fieldList
       }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/controller/TravelWaresController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Api(tags="商品信息表")

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/entity/TravelWares.java

@@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Data
@@ -67,4 +67,12 @@ public class TravelWares implements Serializable {
 	@Excel(name = "商品销量", width = 15)
     @ApiModelProperty(value = "商品销量")
     private java.lang.Integer waresSales;
+	/**商品详情*/
+	@Excel(name = "商品详情", width = 15)
+    @ApiModelProperty(value = "商品详情")
+    private java.lang.String waresDetail;
+	/**商品库存*/
+	@Excel(name = "商品库存", width = 15)
+    @ApiModelProperty(value = "商品库存")
+    private java.lang.String waresNumber;
 }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/TravelWaresMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface TravelWaresMapper extends BaseMapper<TravelWares> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/ITravelWaresService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 public interface ITravelWaresService extends IService<TravelWares> {

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/impl/TravelWaresServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 商品信息表
  * @Author: jeecg-boot
- * @Date:   2024-09-24
+ * @Date:   2024-09-26
  * @Version: V1.0
  */
 @Service

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/TravelWaresList.vue

@@ -147,6 +147,16 @@
             align:"center",
             dataIndex: 'waresSales'
           },
+          {
+            title:'商品详情',
+            align:"center",
+            dataIndex: 'waresDetail'
+          },
+          {
+            title:'商品库存',
+            align:"center",
+            dataIndex: 'waresNumber'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -186,6 +196,8 @@
         fieldList.push({type:'BigDecimal',value:'waresPrice',text:'商品价格',dictCode:''})
         fieldList.push({type:'BigDecimal',value:'waresDiscount',text:'商品折扣',dictCode:''})
         fieldList.push({type:'int',value:'waresSales',text:'商品销量',dictCode:''})
+        fieldList.push({type:'string',value:'waresDetail',text:'商品详情',dictCode:''})
+        fieldList.push({type:'string',value:'waresNumber',text:'商品库存',dictCode:''})
         this.superFieldList = fieldList
       }
     }

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue

@@ -28,6 +28,16 @@
               <a-input-number v-model="model.waresSales" placeholder="请输入商品销量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品详情" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresDetail">
+              <a-input v-model="model.waresDetail" placeholder="请输入商品详情"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品库存" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="waresNumber">
+              <a-input v-model="model.waresNumber" placeholder="请输入商品库存"  ></a-input>
+            </a-form-model-item>
+          </a-col>
         </a-row>
       </a-form-model>
     </j-form-container>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.data.ts

@@ -30,6 +30,16 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'waresSales'
    },
+   {
+    title: '商品详情',
+    align:"center",
+    dataIndex: 'waresDetail'
+   },
+   {
+    title: '商品库存',
+    align:"center",
+    dataIndex: 'waresNumber'
+   },
 ];
 //查询数据
 export const searchFormSchema: FormSchema[] = [
@@ -63,4 +73,14 @@ export const formSchema: FormSchema[] = [
     field: 'waresSales',
     component: 'InputNumber',
   },
+  {
+    label: '商品详情',
+    field: 'waresDetail',
+    component: 'Input',
+  },
+  {
+    label: '商品库存',
+    field: 'waresNumber',
+    component: 'Input',
+  },
 ];

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

@@ -73,25 +73,19 @@ public class UserInfoApiController {
         return indexApiService.queryCollectionList(collectionType, pageBean);
     }
 
-    //添加我的收藏
+    //添加收藏
     @ApiOperation(value="小程序-添加收藏", notes="小程序-添加收藏")
     @RequestMapping(value = "/addCollection", method = {RequestMethod.POST})
     public Result<?> addCollection(TravelCollection travelCollection){
         return indexApiService.addCollection(travelCollection);
     }
 
-    //获取购物车列表
-    @ApiOperation(value="小程序-获取购物车列表", notes="小程序-获取购物车列表")
-    @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
-    public Result<?> queryShopcarList(PageBean pageBean){
-        return indexApiService.queryShopcarList(pageBean);
+    //取消收藏
+    @ApiOperation(value="小程序-取消收藏", notes="小程序-取消收藏")
+    @RequestMapping(value = "/deleteCollection", method = {RequestMethod.POST})
+    public Result<?> deleteCollection(String collectionId){
+        return indexApiService.deleteCollection(collectionId);
     }
 
-    //获取购物车列表
-    @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
-    @RequestMapping(value = "/addShopcar", method = {RequestMethod.GET})
-    public Result<?> addShopcar(TravelShopcar travelShopcar){
-        return indexApiService.addShopcar(travelShopcar);
-    }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.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.travelShopcar.entity.TravelShopcar;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -34,5 +35,32 @@ public class WaresApiController {
         return indexApiService.queryWaresById(waresId);
     }
 
-    //商品下单
+
+    //获取购物车列表
+    @ApiOperation(value="小程序-获取购物车列表", notes="小程序-获取购物车列表")
+    @RequestMapping(value = "/queryShopcarList", method = {RequestMethod.GET})
+    public Result<?> queryShopcarList(PageBean pageBean){
+        return indexApiService.queryShopcarList(pageBean);
+    }
+
+    //添加购物车
+    @ApiOperation(value="小程序-添加购物车", notes="小程序-添加购物车")
+    @RequestMapping(value = "/addShopcar", method = {RequestMethod.GET})
+    public Result<?> addShopcar(TravelShopcar travelShopcar){
+        return indexApiService.addShopcar(travelShopcar);
+    }
+
+    //取消购物车
+    @ApiOperation(value="小程序-取消购物车", notes="小程序-取消购物车")
+    @RequestMapping(value = "/deleteShopcar", method = {RequestMethod.GET})
+    public Result<?> deleteShopcar(String shopcarId){
+        return indexApiService.deleteShopcar(shopcarId);
+    }
+
+    //修改购物车商品数量
+    @ApiOperation(value="小程序-修改购物车信息", notes="小程序-修改购物车信息")
+    @RequestMapping(value = "/updateShopcar", method = {RequestMethod.GET})
+    public Result<?> updateShopcar(TravelShopcar shopcar){
+        return indexApiService.updateShopcar(shopcar);
+    }
 }

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

@@ -64,6 +64,9 @@ public interface IndexApiService {
     //添加收藏
     public Result<?> addCollection(TravelCollection travelCollection);
 
+    //取消收藏
+    public Result<?> deleteCollection(String collectonId);
+
     //查询地址
     public Result<?> queryAddress(TravelAddress travelAddress, PageBean pageBean);
 
@@ -94,6 +97,11 @@ public interface IndexApiService {
     //添加购物车
     public Result<?> addShopcar(TravelShopcar travelShopcar);
 
+    //取消购物车
+    public Result<?> deleteShopcar(String shopcarId);
+
+    //修改购物车信息
+    public Result<?> updateShopcar(TravelShopcar shopcar);
 
 
     //文创好物-待补充

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.extension.conditions.update.UpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.modules.apiBean.PageBean;
@@ -475,6 +476,16 @@ public class IndexApiServiceImpl implements IndexApiService {
         }
     }
 
+    //取消收藏
+    public Result<?> deleteCollection(String collectionId) {
+        boolean flag = travelCollectionService.removeById(collectionId);
+        if(flag){
+            return Result.OK("取消收藏成功！");
+        }else {
+            return Result.OK("取消收藏失败！");
+        }
+    }
+
 
     //获取地址列表
     @Override
@@ -523,6 +534,25 @@ public class IndexApiServiceImpl implements IndexApiService {
     //修改地址
     @Override
     public Result<?> updateAddress(TravelAddress travelAddress) {
+        String Addressdefault = travelAddress.getAddressDefault();
+        //修改默认地址
+
+        if("1".equals(travelAddress.getAddressDefault())){
+            //将原默认地址改为不默认
+            List<TravelAddress> list = travelAddressService
+                    .lambdaQuery()
+                    .eq(TravelAddress::getAddressDefault,"1")
+                    .eq(TravelAddress::getMemberId,travelAddress.getMemberId())
+                    .list();
+
+            if(null != list){
+                for (TravelAddress address : list) {
+                    address.setAddressDefault("0");
+                    boolean flag = travelAddressService.updateById(address);
+                }
+            }
+        }
+
         boolean flag = travelAddressService.updateById(travelAddress);
         if(flag){
             return Result.OK("修改地址成功！");
@@ -622,6 +652,28 @@ public class IndexApiServiceImpl implements IndexApiService {
         }
     }
 
+    //取消购物车
+    @Override
+    public Result<?> deleteShopcar(String shopcarId) {
+        boolean flag = travelShopcarService.removeById(shopcarId);
+        if(flag){
+            return Result.OK("取消购物车成功！");
+        }else {
+            return Result.OK("取消购物车失败！");
+        }
+    }
+
+    //修改购物车商品数量
+    @Override
+    public Result<?> updateShopcar(TravelShopcar shopcar) {
+        boolean flag = travelShopcarService.updateById(shopcar);
+        if(flag){
+            return Result.OK("修改购物车信息成功！");
+        }else {
+            return Result.OK("修改购物车信息失败！");
+        }
+    }
+
 
     //我要帮助-添加建议
     @Override