czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'test' into dev

Browse Source
This commit is contained in:
yijiegong
2024-08-31 09:13:18 +08:00
parent 7b62f75cca c2843ecc3d
commit e131095e45
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopExtend.java
View File

@@ -118,18 +118,22 @@ public class TbShopExtend extends Model<TbShopExtend> {
case "index_bg": case "index_bg":
this.name = "店铺首页背景图"; this.name = "店铺首页背景图";
this.detail="建议尺寸: 375*600 "; this.detail="建议尺寸: 375*600 ";
this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/indexs/shuangbackground.png";
break; break;
case "my_bg": case "my_bg":
this.name = "我的页面背景图"; this.name = "我的页面背景图";
this.detail="建议尺寸: 375*200"; this.detail="建议尺寸: 375*200";
this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/my/myTopBack.png";
break; break;
case "member_bg": case "member_bg":
this.name = "会员卡页面背景图"; this.name = "会员卡页面背景图";
this.detail="建议尺寸: 315*152"; this.detail="建议尺寸: 315*152";
this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/menber/member_bg.png";
break; break;
case "shopinfo_bg": case "shopinfo_bg":
this.name = "商品列表顶部背景图"; this.name = "商品列表顶部背景图";
this.detail="建议尺寸: 375*120"; this.detail="建议尺寸: 375*120";
this.value = "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png";
break; break;
} }
} }

2
eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopExtendServiceImpl.java
View File

@@ -41,7 +41,7 @@ public class TbShopExtendServiceImpl extends ServiceImpl<TbShopExtendMapper, TbS
} }
wrapper.orderByDesc("create_time"); wrapper.orderByDesc("create_time");
Page<TbShopExtend> ipage = tbShopExtendmapper.selectPage(page, wrapper); Page<TbShopExtend> ipage = tbShopExtendmapper.selectPage(page, wrapper);
checkAndInitialize(ipage,criteria.getShopId()); ipage = checkAndInitialize(ipage,criteria.getShopId());
return PageUtil.toPage(ipage.getRecords(), ipage.getTotal()); return PageUtil.toPage(ipage.getRecords(), ipage.getTotal());
} }