Browse Source

1、预约订单表添加状态字段

2、轮播图添加分类
master
Augcl 10 months ago
parent
commit
a9e91ad990
10 changed files with 40 additions and 7 deletions
  1. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java
  2. +5
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java
  3. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java
  4. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java
  5. +1
    -1
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java
  6. +6
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue
  7. +5
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue
  8. +10
    -0
      jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts
  9. +1
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java
  10. +9
    -1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/controller/TravelOrderController.java View File

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


+ 5
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/entity/TravelOrder.java View File

@ -20,7 +20,7 @@ import lombok.experimental.Accessors;
/** /**
* @Description: 预约订单表 * @Description: 预约订单表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-09-23
* @Date: 2024-09-24
* @Version: V1.0 * @Version: V1.0
*/ */
@Data @Data
@ -71,4 +71,8 @@ public class TravelOrder implements Serializable {
@Excel(name = "预约项目编号", width = 15) @Excel(name = "预约项目编号", width = 15)
@ApiModelProperty(value = "预约项目编号") @ApiModelProperty(value = "预约项目编号")
private java.lang.String itemId; 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;
} }

+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/mapper/TravelOrderMapper.java View File

@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @Description: 预约订单表 * @Description: 预约订单表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-09-23
* @Date: 2024-09-24
* @Version: V1.0 * @Version: V1.0
*/ */
public interface TravelOrderMapper extends BaseMapper<TravelOrder> { public interface TravelOrderMapper extends BaseMapper<TravelOrder> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/ITravelOrderService.java View File

@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
/** /**
* @Description: 预约订单表 * @Description: 预约订单表
* @Author: jeecg-boot * @Author: jeecg-boot
* @Date: 2024-09-23
* @Date: 2024-09-24
* @Version: V1.0 * @Version: V1.0
*/ */
public interface ITravelOrderService extends IService<TravelOrder> { public interface ITravelOrderService extends IService<TravelOrder> {


+ 1
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/service/impl/TravelOrderServiceImpl.java View File

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


+ 6
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/TravelOrderList.vue View File

@ -151,6 +151,11 @@
align:"center", align:"center",
dataIndex: 'itemId' dataIndex: 'itemId'
}, },
{
title:'订单状态(0-待支付 1-待使用 2-已完成)',
align:"center",
dataIndex: 'orderStatus'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
@ -191,6 +196,7 @@
fieldList.push({type:'datetime',value:'orderTime',text:'预约时间'}) fieldList.push({type:'datetime',value:'orderTime',text:'预约时间'})
fieldList.push({type:'BigDecimal',value:'orderPrice',text:'预约价格',dictCode:''}) fieldList.push({type:'BigDecimal',value:'orderPrice',text:'预约价格',dictCode:''})
fieldList.push({type:'string',value:'itemId',text:'预约项目编号',dictCode:''}) fieldList.push({type:'string',value:'itemId',text:'预约项目编号',dictCode:''})
fieldList.push({type:'string',value:'orderStatus',text:'订单状态(0-待支付 1-待使用 2-已完成)',dictCode:''})
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }


+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue/modules/TravelOrderForm.vue View File

@ -33,6 +33,11 @@
<a-input v-model="model.itemId" placeholder="请输入预约项目编号" ></a-input> <a-input v-model="model.itemId" placeholder="请输入预约项目编号" ></a-input>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :span="24">
<a-form-model-item label="订单状态(0-待支付 1-待使用 2-已完成)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderStatus">
<a-input v-model="model.orderStatus" placeholder="请输入订单状态(0-待支付 1-待使用 2-已完成)" ></a-input>
</a-form-model-item>
</a-col>
</a-row> </a-row>
</a-form-model> </a-form-model>
</j-form-container> </j-form-container>


+ 10
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/travelOrder/vue3/TravelOrder.data.ts View File

@ -34,6 +34,11 @@ export const columns: BasicColumn[] = [
align:"center", align:"center",
dataIndex: 'itemId' dataIndex: 'itemId'
}, },
{
title: '订单状态(0-待支付 1-待使用 2-已完成)',
align:"center",
dataIndex: 'orderStatus'
},
]; ];
//查询数据 //查询数据
export const searchFormSchema: FormSchema[] = [ export const searchFormSchema: FormSchema[] = [
@ -70,4 +75,9 @@ export const formSchema: FormSchema[] = [
field: 'itemId', field: 'itemId',
component: 'Input', component: 'Input',
}, },
{
label: '订单状态(0-待支付 1-待使用 2-已完成)',
field: 'orderStatus',
component: 'Input',
},
]; ];

+ 1
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/travelController/IndexApiController.java View File

@ -28,7 +28,7 @@ public class IndexApiController {
//获取小程序任一文章或服务 //获取小程序任一文章或服务
//获取banner图列表 //获取banner图列表
@ApiOperation(value="小程序-获取banner图列表", notes="0-轮播图_首页")
@ApiOperation(value="小程序-获取banner图列表", notes="0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务")
@GetMapping() @GetMapping()
@RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET}) @RequestMapping(value = "/queryBannerList", method = {RequestMethod.GET})
public Result<?> queryBannerList(String bannerCategoryType){ public Result<?> queryBannerList(String bannerCategoryType){


+ 9
- 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/IndexApiServiceImpl.java View File

@ -114,11 +114,19 @@ public class IndexApiServiceImpl implements IndexApiService {
@Override @Override
public Result<?> queryBannerList(String bannerCategoryId) { public Result<?> queryBannerList(String bannerCategoryId) {
//1-轮播图_首页
//0-首页 1-遗产路径 2-我要跟拍 3-非遗体验 4-无忧服务
if(null != bannerCategoryId){ if(null != bannerCategoryId){
switch (bannerCategoryId){ switch (bannerCategoryId){
case "0": bannerCategoryId = "1836222983394902017"; case "0": bannerCategoryId = "1836222983394902017";
break; break;
case "1": bannerCategoryId = "1838473006392385538";
break;
case "2": bannerCategoryId = "1838473106556559361";
break;
case "3": bannerCategoryId = "1838473306209624065";
break;
case "4": bannerCategoryId = "1838473405736263682";
break;
} }
} }


Loading…
Cancel
Save