From 1f5bfc1ee7a28f6489c789f2f30e7ea3f772462c Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Thu, 26 Sep 2024 19:21:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=87=E5=88=9B=E5=A5=BD=E7=89=A9?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0=202=E3=80=81=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E3=80=81=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=A5=E5=8F=A3=203=E3=80=81=E8=B4=AD?= =?UTF-8?q?=E7=89=A9=E8=BD=A6=E6=B7=BB=E5=8A=A0=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=204=E3=80=81=E6=B7=BB=E5=8A=A0=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=205=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9(=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=9C=B0=E5=9D=80=E4=B8=80=E4=B8=AA=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E5=AD=98=E5=9C=A8=E4=B8=80=E4=B8=AA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TravelCollectionController.java | 2 +- .../travelCollection/entity/TravelCollection.java | 26 +++-------- .../mapper/TravelCollectionMapper.java | 2 +- .../service/ITravelCollectionService.java | 2 +- .../service/impl/TravelCollectionServiceImpl.java | 2 +- .../travelCollection/vue/TravelCollectionList.vue | 30 ++----------- .../vue/modules/TravelCollectionForm.vue | 24 +--------- .../travelCollection/vue3/TravelCollection.data.ts | 48 ++------------------ .../controller/TravelImageController.java | 2 +- .../modules/travelImage/entity/TravelImage.java | 4 +- .../travelImage/mapper/TravelImageMapper.java | 2 +- .../travelImage/service/ITravelImageService.java | 2 +- .../service/impl/TravelImageServiceImpl.java | 2 +- .../modules/travelImage/vue/TravelImageList.vue | 2 +- .../controller/TravelWaresController.java | 2 +- .../modules/travelWares/entity/TravelWares.java | 10 ++++- .../travelWares/mapper/TravelWaresMapper.java | 2 +- .../travelWares/service/ITravelWaresService.java | 2 +- .../service/impl/TravelWaresServiceImpl.java | 2 +- .../modules/travelWares/vue/TravelWaresList.vue | 12 +++++ .../travelWares/vue/modules/TravelWaresForm.vue | 10 +++++ .../modules/travelWares/vue3/TravelWares.data.ts | 20 +++++++++ .../travelController/UserInfoApiController.java | 18 +++----- .../api/travelController/WaresApiController.java | 30 ++++++++++++- .../jeecg/modules/apiService/IndexApiService.java | 8 ++++ .../apiService/impl/IndexApiServiceImpl.java | 52 ++++++++++++++++++++++ 26 files changed, 175 insertions(+), 143 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java index e2730b1..deb3e4a 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/controller/TravelCollectionController.java +++ b/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="收藏表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java index 091133b..3c592fe 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/entity/TravelCollection.java +++ b/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; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java index 7a369c4..deb9b59 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/mapper/TravelCollectionMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java index 8d4e519..bdc68e7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/ITravelCollectionService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java index aae6951..f6c2bde 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/service/impl/TravelCollectionServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue index c8c9c46..d0fc740 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/TravelCollectionList.vue +++ b/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 } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue index 4452e7f..a6c9e24 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue/modules/TravelCollectionForm.vue @@ -9,28 +9,8 @@ - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts index 35df0af..3dd6f7b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelCollection/vue3/TravelCollection.data.ts +++ b/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', }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java index 70014e6..8fdb1b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/controller/TravelImageController.java +++ b/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="图片信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java index ba4676a..1bf1712 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/entity/TravelImage.java +++ b/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 = "排序编号") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java index e15f716..1e924f6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/mapper/TravelImageMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java index 04f9428..c09f3ec 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/ITravelImageService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java index 7c7ef3e..33f2ce6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/service/impl/TravelImageServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue index 3858357..1117655 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelImage/vue/TravelImageList.vue +++ b/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 } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/controller/TravelWaresController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/controller/TravelWaresController.java index 2e8ead5..7f1999b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/controller/TravelWaresController.java +++ b/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="商品信息表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/entity/TravelWares.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/entity/TravelWares.java index d2d3e55..bb259cd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/entity/TravelWares.java +++ b/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; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/TravelWaresMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/TravelWaresMapper.java index 5eb4d6f..0973136 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/mapper/TravelWaresMapper.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/ITravelWaresService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/ITravelWaresService.java index 99023d8..e0ee3f7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/ITravelWaresService.java +++ b/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 { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/impl/TravelWaresServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/impl/TravelWaresServiceImpl.java index 9bc2163..19171dd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/service/impl/TravelWaresServiceImpl.java +++ b/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 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/TravelWaresList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/TravelWaresList.vue index 041ba0a..05c0901 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/TravelWaresList.vue +++ b/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 } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue index 6a6276b..2337544 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue/modules/TravelWaresForm.vue @@ -28,6 +28,16 @@ + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.data.ts index 0776d3d..ea8f558 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelWares/vue3/TravelWares.data.ts +++ b/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', + }, ]; 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 b98353a..7a14778 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 @@ -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); - } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java index 8e9f449..0d7130b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java +++ b/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); + } } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java index 25fcd5a..83f59bc 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/IndexApiService.java +++ b/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); //文创好物-待补充 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 09815d9..1f819f1 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,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 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