From f4744cf0f465478f06a9ebbc2e4966bf096a06e2 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 03 四月 2025 18:18:13 +0800 Subject: [PATCH] 惠民卡代码 --- cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java | 1 + cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java | 2 ++ cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java | 5 +++++ cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java | 5 +++++ 4 files changed, 13 insertions(+), 0 deletions(-) diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java index 2b5e035..1a0168f 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreConfigController.java @@ -74,6 +74,7 @@ vo.setIsTop(homeModule.getIsTop()); vo.setSort(homeModule.getSort()); vo.setBackgroundImage(homeModule.getBackgroundImage()); + vo.setDisplayType(homeModule.getDisplayType()); listVo.add(vo); } for (StoreConfig storeConfig : list) { @@ -130,6 +131,7 @@ storeConfigVo.setBackgroundImage(ToolUtil.isNotEmpty(worldCupStore.getBackgroundImage()) ? worldCupStore.getBackgroundImage() : worldCup.getHomeBackdropImg()); storeConfigVo.setType(9); storeConfigVo.setIsOpen(worldCupStore.getIsOpen()); + storeConfigVo.setDisplayType(worldCupStore.getDisplayType()); storeConfigVo.setSort(worldCupStore.getSort()); listVo.add(storeConfigVo); } diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java index b9c1613..24c18f3 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java +++ b/cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java @@ -439,6 +439,7 @@ tStoreOtherConfigTrue.setSort(tStoreOther.getSort()); } } + tStoreOtherConfigTrue.setDisplayType(2); } return ResultUtil.success(tStoreOtherConfigTrues); } catch (Exception e) { diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java b/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java index 7aeaab4..db8c552 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/HomeModule.java @@ -85,4 +85,9 @@ */ @TableField("typeId") private Integer typeId; + /** + * 展示类型 1:横屏 2:竖屏 + */ + @TableField("displayType") + private Integer displayType; } diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java b/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java index b3ee637..0454553 100644 --- a/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java +++ b/cloud-server-other/src/main/java/com/dsh/other/entity/TStoreOtherConfigTrue.java @@ -75,6 +75,11 @@ @TableField("typeId") private Integer typeId; + /** + * displayType展示类型 1:横屏 2:竖屏 + */ + @TableField(exist = false) + private Integer displayType; @Override -- Gitblit v1.7.1