编辑模板入库新增参数app_id
This commit is contained in:
parent
295275b3dc
commit
97ee21b5fb
@ -49,7 +49,7 @@ public interface ShopPageAppService extends IBaseService<ShopPageApp> {
|
||||
/**
|
||||
*
|
||||
*/
|
||||
Map getApp(Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type);
|
||||
Map getApp(Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type,Integer appId);
|
||||
|
||||
Map getModuleTpl();
|
||||
|
||||
|
||||
@ -136,7 +136,12 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
|
||||
@Override
|
||||
public void getModel(ModelAndView view, Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type) {
|
||||
|
||||
Map page_base = getApp(subsite_id, store_id, tpl_id, app_type);
|
||||
String appIdStr= getParameter("app_id");
|
||||
Integer appId = null;
|
||||
if(StringUtils.isNotEmpty(appIdStr)){
|
||||
appId=Convert.toInt(appIdStr);
|
||||
}
|
||||
Map page_base = getApp(subsite_id, store_id, tpl_id, app_type,appId);
|
||||
String app_page_list = JSONUtil.toJsonStr(page_base.get("items"));
|
||||
|
||||
List<Map> shopPageList = Convert.toList(Map.class, page_base.get("items"));
|
||||
@ -609,15 +614,19 @@ public class ShopPageAppServiceImpl extends BaseServiceImpl<ShopPageAppMapper, S
|
||||
}
|
||||
|
||||
|
||||
public Map getApp(Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type) {
|
||||
public Map getApp(Integer subsite_id, Integer store_id, Integer tpl_id, Integer app_type,Integer appId) {
|
||||
QueryWrapper<ShopPageApp> shopPageAppQueryWrapper = new QueryWrapper<>();
|
||||
|
||||
//权限判断
|
||||
shopPageAppQueryWrapper.eq("app_type", app_type);
|
||||
shopPageAppQueryWrapper.eq("store_id", store_id);
|
||||
shopPageAppQueryWrapper.eq("subsite_id", subsite_id);
|
||||
shopPageAppQueryWrapper.eq("tpl_id", tpl_id);
|
||||
shopPageAppQueryWrapper.eq("app_is_use",1);//使用中的模板
|
||||
if(ObjectUtil.isNotNull(appId)){
|
||||
shopPageAppQueryWrapper.eq("app_id", appId);
|
||||
}else {
|
||||
//权限判断
|
||||
shopPageAppQueryWrapper.eq("app_type", app_type);
|
||||
shopPageAppQueryWrapper.eq("store_id", store_id);
|
||||
shopPageAppQueryWrapper.eq("subsite_id", subsite_id);
|
||||
shopPageAppQueryWrapper.eq("tpl_id", tpl_id);
|
||||
shopPageAppQueryWrapper.eq("app_is_use",1);//使用中的模板
|
||||
}
|
||||
|
||||
ShopPageApp shopPA = shopPageAppService.findOne(shopPageAppQueryWrapper);
|
||||
Map data = new HashMap();
|
||||
|
||||
@ -158,9 +158,15 @@ public class ShopPageBaseServiceImpl extends BaseServiceImpl<ShopPageBaseMapper,
|
||||
|
||||
QueryWrapper<ShopPageApp> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("store_id", store_id).eq("tpl_id", Convert.toInt(tpl_id));
|
||||
|
||||
ShopPageApp shopPageAppServiceOne = shopPageAppService.findOne(queryWrapper);
|
||||
|
||||
queryWrapper.eq("app_is_use",1);
|
||||
List<ShopPageApp> shopPageAppList = shopPageAppService.list(queryWrapper);
|
||||
if(shopPageAppList.isEmpty()){
|
||||
queryWrapper.clear();
|
||||
queryWrapper.eq("store_id", store_id).eq("tpl_id", Convert.toInt(tpl_id));
|
||||
shopPageAppList=shopPageAppService.list(queryWrapper);
|
||||
}
|
||||
ShopPageApp shopPageAppServiceOne =shopPageAppList.get(0);
|
||||
//ShopPageApp shopPageAppServiceOne = shopPageAppService.findOne(queryWrapper);
|
||||
QueryWrapper<ShopPageBase> baseQueryWrapper = new QueryWrapper<>();
|
||||
baseQueryWrapper.eq("store_id", store_id).eq("app_id", shopPageAppServiceOne.getApp_id()).eq("page_index", 1);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user