diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index ea06d8393..94a742dc7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -155,8 +155,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if(!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && @@ -300,8 +300,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if (!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { @@ -414,8 +414,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if (!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 7a97516dd..635ad6b4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -178,7 +178,7 @@ public class WechatLoginController extends BaseController { } if (!mall.isValid()) { ret.put("code", Result.ERROR); - ret.put("message", "mall未启用"); + ret.put("message", "mall已过期"); log.info("用户登录失败-5,返回登录"); try { String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); @@ -187,12 +187,12 @@ public class WechatLoginController extends BaseController { log.error(e.getMessage()); } } - Map map = new HashMap(); - if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { - List mallList = mallService.getSubByParentTenantId(mall.getTenantId()); - map.put("subMalls", JSON.toJSONString(mallList)); - map.put("group", EnumGroupSupport.SUPPORT.getCode()); - } +// Map map = new HashMap(); +// if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { +// List mallList = mallService.getSubByParentTenantId(mall.getTenantId()); +// map.put("subMalls", JSON.toJSONString(mallList)); +// map.put("group", EnumGroupSupport.SUPPORT.getCode()); +// } try { String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); Cookie unameCookie = new Cookie("uname", cookieName); @@ -349,7 +349,7 @@ public class WechatLoginController extends BaseController { } if (!mall.isValid()) { ret.put("code", Result.ERROR); - ret.put("message", "mall未启用"); + ret.put("message", "mall已过期"); log.info("用户登录失败-5,返回登录"); try { String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java index 6ea8c3116..a6bf38d09 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java @@ -76,8 +76,8 @@ public class WxMallController extends BaseController { return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } if(!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { List mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index baf6337fc..a7ba74580 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2811,8 +2811,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public List couponDataMap(TenantEntity tenantEntity,Date startTime,Date endTime) { + List volist = new ArrayList(); if(StringUtils.isBlank(tenantEntity.getTenantId())){ - return null; + return volist; } List dateList = new ArrayList(); @@ -2897,7 +2898,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } if (dateList.size() > 0) { - List volist = new ArrayList(); for (int i = 0 ; i < dateList.size(); i ++) { String date = dateList.get(i); MarkingCouponDataReportVo vo = new MarkingCouponDataReportVo(); @@ -2930,7 +2930,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return volist; } - return null; + return volist; } @Override diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index d16230aa4..ce0fece70 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -155,8 +155,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if(!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && @@ -300,8 +300,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if (!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { @@ -414,8 +414,8 @@ public class HomeController extends BaseController { return new ResultData(Result.ERROR, "未配置相应的mall"); } if (!mall.isValid()) { - logger.error("mall未启用"); - return new ResultData(Result.ERROR, "mall未启用"); + logger.error("mall已过期"); + return new ResultData(Result.ERROR, "mall已过期"); } Map map = new HashMap(); if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { diff --git a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 7a97516dd..595c428d5 100644 --- a/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java +++ b/mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -178,7 +178,7 @@ public class WechatLoginController extends BaseController { } if (!mall.isValid()) { ret.put("code", Result.ERROR); - ret.put("message", "mall未启用"); + ret.put("message", "mall已过期"); log.info("用户登录失败-5,返回登录"); try { String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); @@ -349,7 +349,7 @@ public class WechatLoginController extends BaseController { } if (!mall.isValid()) { ret.put("code", Result.ERROR); - ret.put("message", "mall未启用"); + ret.put("message", "mall已过期"); log.info("用户登录失败-5,返回登录"); try { String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8");