Просмотр исходного кода

/。 mall

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
ceb66e91ee
6 измененных файлов: 27 добавлений и 27 удалений
  1. +6
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  2. +8
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java
  3. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java
  4. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  5. +6
    -6
      mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  6. +2
    -2
      mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java

+ 6
- 6
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"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if(!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) &&
@@ -300,8 +300,8 @@ public class HomeController extends BaseController {
return new ResultData(Result.ERROR, "未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if (!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {
@@ -414,8 +414,8 @@ public class HomeController extends BaseController {
return new ResultData(Result.ERROR, "未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if (!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {


+ 8
- 8
mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -178,7 +178,7 @@ public class WechatLoginController extends BaseController {
} }
if (!mall.isValid()) { if (!mall.isValid()) {
ret.put("code", Result.ERROR); ret.put("code", Result.ERROR);
ret.put("message", "mall未启用");
ret.put("message", "mall已过期");
log.info("用户登录失败-5,返回登录"); log.info("用户登录失败-5,返回登录");
try { try {
String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8");
@@ -187,12 +187,12 @@ public class WechatLoginController extends BaseController {
log.error(e.getMessage()); log.error(e.getMessage());
} }
} }
Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {
List<WxMall> 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<WxMall> mallList = mallService.getSubByParentTenantId(mall.getTenantId());
// map.put("subMalls", JSON.toJSONString(mallList));
// map.put("group", EnumGroupSupport.SUPPORT.getCode());
// }
try { try {
String cookieName = URLEncoder.encode(info.getUsername(), "utf-8"); String cookieName = URLEncoder.encode(info.getUsername(), "utf-8");
Cookie unameCookie = new Cookie("uname", cookieName); Cookie unameCookie = new Cookie("uname", cookieName);
@@ -349,7 +349,7 @@ public class WechatLoginController extends BaseController {
} }
if (!mall.isValid()) { if (!mall.isValid()) {
ret.put("code", Result.ERROR); ret.put("code", Result.ERROR);
ret.put("message", "mall未启用");
ret.put("message", "mall已过期");
log.info("用户登录失败-5,返回登录"); log.info("用户登录失败-5,返回登录");
try { try {
String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8");


+ 2
- 2
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); return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);
} }
if(!mall.isValid()) { 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())) { if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {
List<WxMall> mallList = wxMallService.getSubByParentTenantId(mall.getTenantId()); List<WxMall> mallList = wxMallService.getSubByParentTenantId(mall.getTenantId());


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -2811,8 +2811,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Override @Override
public List<MarkingCouponDataReportVo> couponDataMap(TenantEntity tenantEntity,Date startTime,Date endTime) { public List<MarkingCouponDataReportVo> couponDataMap(TenantEntity tenantEntity,Date startTime,Date endTime) {
List<MarkingCouponDataReportVo> volist = new ArrayList<MarkingCouponDataReportVo>();
if(StringUtils.isBlank(tenantEntity.getTenantId())){ if(StringUtils.isBlank(tenantEntity.getTenantId())){
return null;
return volist;
} }
List<String> dateList = new ArrayList<String>(); List<String> dateList = new ArrayList<String>();
@@ -2897,7 +2898,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }
if (dateList.size() > 0) { if (dateList.size() > 0) {
List<MarkingCouponDataReportVo> volist = new ArrayList<MarkingCouponDataReportVo>();
for (int i = 0 ; i < dateList.size(); i ++) { for (int i = 0 ; i < dateList.size(); i ++) {
String date = dateList.get(i); String date = dateList.get(i);
MarkingCouponDataReportVo vo = new MarkingCouponDataReportVo(); MarkingCouponDataReportVo vo = new MarkingCouponDataReportVo();
@@ -2930,7 +2930,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
return volist; return volist;
} }
return null;
return volist;
} }


@Override @Override


+ 6
- 6
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"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if(!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) &&
@@ -300,8 +300,8 @@ public class HomeController extends BaseController {
return new ResultData(Result.ERROR, "未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if (!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {
@@ -414,8 +414,8 @@ public class HomeController extends BaseController {
return new ResultData(Result.ERROR, "未配置相应的mall"); return new ResultData(Result.ERROR, "未配置相应的mall");
} }
if (!mall.isValid()) { 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(); Map map = new HashMap();
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) {


+ 2
- 2
mallinkTTAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java Просмотреть файл

@@ -178,7 +178,7 @@ public class WechatLoginController extends BaseController {
} }
if (!mall.isValid()) { if (!mall.isValid()) {
ret.put("code", Result.ERROR); ret.put("code", Result.ERROR);
ret.put("message", "mall未启用");
ret.put("message", "mall已过期");
log.info("用户登录失败-5,返回登录"); log.info("用户登录失败-5,返回登录");
try { try {
String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8");
@@ -349,7 +349,7 @@ public class WechatLoginController extends BaseController {
} }
if (!mall.isValid()) { if (!mall.isValid()) {
ret.put("code", Result.ERROR); ret.put("code", Result.ERROR);
ret.put("message", "mall未启用");
ret.put("message", "mall已过期");
log.info("用户登录失败-5,返回登录"); log.info("用户登录失败-5,返回登录");
try { try {
String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8"); String errCode = URLEncoder.encode(JSON.toJSONString(ret), "utf-8");


Загрузка…
Отмена
Сохранить