From a0c0d1d1bd7823939545df09aa8b92cf47cebe78 Mon Sep 17 00:00:00 2001 From: Augcl <17674666882@163.com> Date: Tue, 24 Sep 2024 16:46:27 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5=202=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/travelOrder/entity/TravelOrder.java | 14 +++++--- .../modules/travelOrder/vue/TravelOrderList.vue | 15 +++++++-- .../travelOrder/vue/modules/TravelOrderForm.vue | 11 +++++-- .../modules/travelOrder/vue3/TravelOrder.data.ts | 17 ++++++++-- .../api/travelController/WaresApiController.java | 38 ++++++++++++++++++++++ .../jeecg/modules/apiService/IndexApiService.java | 7 ++++ .../apiService/impl/IndexApiServiceImpl.java | 36 ++++++++++++++++++-- 7 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java 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 5248537..8b4570c 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 @@ -47,9 +47,9 @@ public class TravelOrder implements Serializable { /**更新日期*/ @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; - /**订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)*/ - @Excel(name = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)", width = 15) - @ApiModelProperty(value = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)") + /**订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)*/ + @Excel(name = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)", width = 15) + @ApiModelProperty(value = "订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)") private java.lang.String orderType; /**主题*/ @Excel(name = "主题", width = 15) @@ -59,10 +59,16 @@ public class TravelOrder implements Serializable { @Excel(name = "电话", width = 15) @ApiModelProperty(value = "电话") private java.lang.String orderPhone; + /**预约日期*/ + @Excel(name = "预约日期", width = 15, format = "yyyy-MM-dd") + @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "预约日期") + private java.util.Date orderDate; /**预约时间*/ @Excel(name = "预约时间", width = 15) @ApiModelProperty(value = "预约时间") - private java.util.Date orderTime; + private java.lang.String orderTime; /**预约价格*/ @Excel(name = "预约价格", width = 15) @ApiModelProperty(value = "预约价格") 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 bd9b7dd..103b97e 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 @@ -122,7 +122,7 @@ } }, { - title:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)', + title:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)', align:"center", dataIndex: 'orderType' }, @@ -136,6 +136,14 @@ align:"center", dataIndex: 'orderPhone' }, + { + title:'预约日期', + align:"center", + dataIndex: 'orderDate', + customRender:function (text) { + return !text?"":(text.length>10?text.substr(0,10):text) + } + }, { title:'预约时间', align:"center", @@ -190,10 +198,11 @@ }, getSuperFieldList(){ let fieldList=[]; - fieldList.push({type:'string',value:'orderType',text:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)',dictCode:''}) + fieldList.push({type:'string',value:'orderType',text:'订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)',dictCode:''}) fieldList.push({type:'string',value:'orderTitle',text:'主题',dictCode:''}) fieldList.push({type:'string',value:'orderPhone',text:'电话',dictCode:''}) - fieldList.push({type:'datetime',value:'orderTime',text:'预约时间'}) + fieldList.push({type:'date',value:'orderDate',text:'预约日期'}) + fieldList.push({type:'string',value:'orderTime',text:'预约时间',dictCode:''}) 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:''}) 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 424bc13..6b641d6 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 @@ -4,8 +4,8 @@ - - + + @@ -18,9 +18,14 @@ + + + + + - + 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 076b86c..beaf3b4 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 @@ -5,7 +5,7 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)', + title: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)', align:"center", dataIndex: 'orderType' }, @@ -19,6 +19,14 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'orderPhone' }, + { + title: '预约日期', + align:"center", + dataIndex: 'orderDate', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, { title: '预约时间', align:"center", @@ -46,7 +54,7 @@ export const searchFormSchema: FormSchema[] = [ //表单数据 export const formSchema: FormSchema[] = [ { - label: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验)', + label: '订单类型(0-路径定制 1-遗产讲述 2-达人同游 3-我要跟拍 4-非遗体验 5-遗产路径 6-我要研学)', field: 'orderType', component: 'Input', }, @@ -60,6 +68,11 @@ export const formSchema: FormSchema[] = [ field: 'orderPhone', component: 'Input', }, + { + label: '预约日期', + field: 'orderDate', + component: 'DatePicker', + }, { label: '预约时间', field: 'orderTime', 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 new file mode 100644 index 0000000..8e9f449 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/WaresApiController.java @@ -0,0 +1,38 @@ +package org.jeecg.modules.api.travelController; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +@Api(tags="小程序-文创好物相关接口") +@RestController +@RequestMapping("/api/wares") +@Slf4j +public class WaresApiController { + @Resource + private IndexApiService indexApiService; + + //获取文创好物列表 + @ApiOperation(value="小程序-获取商品列表", notes="小程序-获取商品列表") + @RequestMapping(value = "/queryWaresList", method = {RequestMethod.GET}) + public Result queryWaresList(PageBean pageBean){ + return indexApiService.queryWaresList(pageBean); + } + + //获取文创好物详情 + @ApiOperation(value="小程序-获取商品详情", notes="小程序-获取商品详情") + @RequestMapping(value = "/queryWaresById", method = {RequestMethod.GET}) + public Result queryWaresById(String waresId){ + return indexApiService.queryWaresById(waresId); + } + + //商品下单 +} 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 661e4b1..39c5458 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 @@ -80,6 +80,13 @@ public interface IndexApiService { //查询预约订单列表 public Result queryOrderList(TravelOrder travelOrder, PageBean pageBean); + //获取文创好物列表 + public Result queryWaresList(PageBean pageBean); + + //根据Id获取文创好物详情 + public Result queryWaresById(String waresId); + + //文创好物-待补充 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 ea556f3..1d90fab 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 @@ -35,6 +35,8 @@ import org.jeecg.modules.travelVideo.entity.TravelVideo; import org.jeecg.modules.travelVideo.service.ITravelVideoService; import org.jeecg.modules.travelVolunteer.entity.TravelVolunteer; import org.jeecg.modules.travelVolunteer.service.ITravelVolunteerService; +import org.jeecg.modules.travelWares.entity.TravelWares; +import org.jeecg.modules.travelWares.service.ITravelWaresService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -93,6 +95,10 @@ public class IndexApiServiceImpl implements IndexApiService { @Resource private ITravelOrderService travelOrderService; + //商品表 + @Resource + private ITravelWaresService travelWaresService; + //建议表 @Resource private ITravelAdvanceService travelAdvanceService; @@ -553,12 +559,12 @@ public class IndexApiServiceImpl implements IndexApiService { list = travelTimeService .lambdaQuery() .eq(TravelTime::getTimeType, travelTime.getTimeType()) - .orderByAsc(TravelTime::getTimeDot) + .orderByAsc(TravelTime::getTimeOrder) .list(); }else { list = travelTimeService .lambdaQuery() - .orderByAsc(TravelTime::getTimeDot) + .orderByAsc(TravelTime::getTimeOrder) .list(); } return Result.OK("时段列表", list); @@ -585,6 +591,32 @@ public class IndexApiServiceImpl implements IndexApiService { return Result.OK("订单列表", pageList); } + //获取文创好物列表 + public Result queryWaresList(PageBean pageBean) { + Page page = new Page(pageBean.getPageNo(), pageBean.getPageSize()); + Page pageList; + + pageList = travelWaresService + .lambdaQuery() + .orderByDesc(TravelWares::getCreateTime) + .page(page); + + return Result.OK("文创好物列表", pageList); + } + + //根据Id获取文创好物详情 + @Override + public Result queryWaresById(String waresId) { + + TravelWares one = travelWaresService + .lambdaQuery() + .eq(TravelWares::getId, waresId) + .one(); + + return Result.OK("文创好物详情", one); + } + + //我要帮助-添加建议 @Override public Result addAdvice(TravelAdvance travelAdvance) {