diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java index c787c91a..00618d98 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/controller/admin/ShopPageAppController.java @@ -83,6 +83,7 @@ public class ShopPageAppController extends BaseControllerImpl { if(user.isStore()) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("store_id", user.getStore_id()); + queryWrapper.orderByDesc("app_id"); List shopPageAppList= shopPageAppService.list(queryWrapper); if(shopPageAppList.isEmpty()) { String resultStr= accountBaseConfigService.getSystemConfig("service_app_tpl"); @@ -132,6 +133,7 @@ public class ShopPageAppController extends BaseControllerImpl { }else { if (is_use==1&&(shopStoreInfo.getStore_template().equals(tpl_label))) { current_tpl = item; + it.remove(); } } } else { @@ -553,5 +555,18 @@ public class ShopPageAppController extends BaseControllerImpl { return shopPageAppService.deletePageApp(appId); } + /** + * 创建空白模板 + * @param appName 模板名称 + * @param appIndustry 行业 + * @return + */ + @ApiOperation(value = "店铺风格表-创建空白模板", notes = "店铺风格表-创建空白模板") + @RequestMapping(value = "/createBlankPageApp", method = RequestMethod.POST) + public CommonResult createBlankPageApp(@RequestParam(name = "appName") String appName, + @RequestParam(name = "appIndustry",required = false,defaultValue = "0") String appIndustry) { + return shopPageAppService.createBlankPageApp(appName,appIndustry); + } + } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/ShopPageAppService.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/ShopPageAppService.java index fc004a73..e115031b 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/ShopPageAppService.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/ShopPageAppService.java @@ -60,4 +60,6 @@ public interface ShopPageAppService extends IBaseService { CommonResult copyDiyByAppId(Integer appId,String newAppName,String appIndustry); CommonResult deletePageApp(Integer appId); + + CommonResult createBlankPageApp(String appName,String appIndustry); } diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java index 791f40ac..4cee4e73 100644 --- a/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java +++ b/mall-shop/src/main/java/com/suisung/mall/shop/page/service/impl/ShopPageAppServiceImpl.java @@ -1107,6 +1107,32 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl