From a9e91ad9902a1920b8248787e7362dfe09da68eb Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Tue, 24 Sep 2024 15:19:52 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E9=A2=84=E7=BA=A6=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=202=E3=80=81=E8=BD=AE=E6=92=AD=E5=9B=BE=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/travelOrder/controller/TravelOrderController.java | 2 +- .../java/org/jeecg/modules/travelOrder/entity/TravelOrder.java | 6 +++++- .../jeecg/modules/travelOrder/mapper/TravelOrderMapper.java | 2 +- .../jeecg/modules/travelOrder/service/ITravelOrderService.java | 2 +- .../travelOrder/service/impl/TravelOrderServiceImpl.java | 2 +- .../java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue | 6 ++++++ .../jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue | 5 +++++ .../org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts | 10 ++++++++++ .../jeecg/modules/api/travelController/IndexApiController.java | 2 +- .../org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java | 10 +++++++++- 10 files changed, 40 insertions(+), 7 deletions(-) diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java index d924c71..32e3f2c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 预约订单表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Api(tags="预约订单表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java index 3449e6f..5248537 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 预约订单表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Data @@ -71,4 +71,8 @@ public class TravelOrder implements Serializable { @Excel(name = "预约项目编号", width = 15) @ApiModelProperty(value = "预约项目编号") private java.lang.String itemId; + /**订单状态(0-待支付 1-待使用 2-已完成)*/ + @Excel(name = "订单状态(0-待支付 1-待使用 2-已完成)", width = 15) + @ApiModelProperty(value = "订单状态(0-待支付 1-待使用 2-已完成)") + private java.lang.String orderStatus; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java index b550f46..046d7d8 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 预约订单表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ public interface TravelOrderMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java index b2b90e5..3e9da92 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 预约订单表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ public interface ITravelOrderService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java index b135b67..e96ba5d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 预约订单表 * @Author: jeecg-boot - * @Date: 2024-09-23 + * @Date: 2024-09-24 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue index e9cdeba..bd9b7dd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue @@ -151,6 +151,11 @@ align:"center", dataIndex: 'itemId' }, + { + title:'订单状态(0-待支付 1-待使用 2-已完成)', + align:"center", + dataIndex: 'orderStatus' + }, { title: '操作', dataIndex: 'action', @@ -191,6 +196,7 @@ fieldList.push({type:'datetime',value:'orderTime',text:'预约时间'}) fieldList.push({type:'BigDecimal',value:'orderPrice',text:'预约价格',dictCode:''}) fieldList.push({type:'string',value:'itemId',text:'预约项目编号',dictCode:''}) + fieldList.push({type:'string',value:'orderStatus',text:'订单状态(0-待支付 1-待使用 2-已完成)',dictCode:''}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue index 4c0edcb..424bc13 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue @@ -33,6 +33,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts index ee637f3..076b86c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts @@ -34,6 +34,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'itemId' }, + { + title: '订单状态(0-待支付 1-待使用 2-已完成)', + align:"center", + dataIndex: 'orderStatus' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -70,4 +75,9 @@ export const formSchema: FormSchema[] = [ field: 'itemId', component: 'Input', }, + { + label: '订单状态(0-待支付 1-待使用 2-已完成)', + field: 'orderStatus', + component: 'Input', + }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java index d534675..0b0ed79 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java @@ -28,7 +28,7 @@ public class IndexApiController { //获取小程序任一文章或服务 //获取banner图列表 - @ApiOperation(value="小程序-获取banner图列表", notes="0-轮播图_首页") + @ApiOperation(value="小程序-获取banner图列表", notes="0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务") @GetMapping() @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) public Result queryBannerList(String bannerCategoryType){ 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 0ebc6ab..ea556f3 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 @@ -114,11 +114,19 @@ public class IndexApiServiceImpl implements IndexApiService { @Override public Result queryBannerList(String bannerCategoryId) { - //1-轮播图_首页 + //0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务 if(null != bannerCategoryId){ switch (bannerCategoryId){ case "0": bannerCategoryId = "1836222983394902017"; break; + case "1": bannerCategoryId = "1838473006392385538"; + break; + case "2": bannerCategoryId = "1838473106556559361"; + break; + case "3": bannerCategoryId = "1838473306209624065"; + break; + case "4": bannerCategoryId = "1838473405736263682"; + break; } }