From 4cbe9f4f13275d1945d4c05f16d4a091eea51af0 Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 30 Nov 2022 14:10:02 +0800 Subject: [PATCH] fix bug --- .../controller/base/BaseController.java | 2 -- .../interceptor/CurrentTenantInterceptor.java | 15 ------------- .../controller/WxCouponOrderController.java | 22 ++++++++++--------- .../iformall/domain/po/base/TenantEntity.java | 12 ---------- .../java/com/iformall/utils/Constant.java | 1 - 5 files changed, 12 insertions(+), 40 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index f47828646..9c7937a22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -75,11 +75,9 @@ public class BaseController { Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - boolean isChildMall = (boolean)session.getAttribute(Constant.IS_CHILD_MALL); TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); - tenantEntity.setChildMall(isChildMall); return tenantEntity; } diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java index 7c85bd068..466c7a151 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java @@ -24,23 +24,8 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter { @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { - //集团版中针对某一商场的业务需要传递mallTenantId - String mallTenantId = request.getHeader("mallTenantId"); - if(StringUtils.isBlank(mallTenantId)){ - mallTenantId = request.getParameter("mallTenantId"); - } String tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); String parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); - boolean isChildMall = false; -// if (StringUtils.isNotBlank(mallTenantId) && (!mallTenantId.equals(tenantId))) { -// parenTenantId = tenantId; -// tenantId = mallTenantId; -// isChildMall = true; -// } -// request.getSession().setAttribute(UserSession.tenantId,tenantId); -// request.getSession().setAttribute(UserSession.parentTenantId,parenTenantId); - request.getSession().setAttribute(Constant.IS_CHILD_MALL,isChildMall); - TenantThreadLocal.setCurrentThreadTenant(tenantId, parenTenantId); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index d3586c369..a53339b1f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -285,7 +285,7 @@ public class WxCouponOrderController extends BaseController { } @TenantIgnore - @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") + @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\",\"couponTenantId\":\"string\"}") @PostMapping("verify") public ResultData verify(@RequestBody Map paramMap) { logger.info("couponOrderController.verify:" + paramMap.toString()); @@ -319,14 +319,16 @@ public class WxCouponOrderController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); WxCouponOrderCVo wxCouponOrderCVo = null; - if (tenantEntity.isChildMall()) { - //查询父 - TenantEntity parentTenant = new TenantEntity(); - parentTenant.setTenantId(tenantEntity.getParentTenantId()); - parentTenant.setParentTenantId(null); - wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,parentTenant); - }else { + String couponTenantId = paramMap.get("couponTenantId"); + TenantEntity parentTenantEntity = null; + if (StringUtils.isBlank(couponTenantId) || "null".equals(couponTenantId) || "NULL".equals(couponTenantId)) { wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,tenantEntity); + }else { + //查询父 + parentTenantEntity = new TenantEntity(); + parentTenantEntity.setTenantId(couponTenantId); + parentTenantEntity.setParentTenantId(null); + wxCouponOrderCVo = wxCouponOrderService.detailCUserVo(couponOrderIdStr,parentTenantEntity); } if (wxCouponOrderCVo == null) @@ -368,8 +370,8 @@ public class WxCouponOrderController extends BaseController { } WxCouponOrder wxCouponOrder = null; - if (tenantEntity.isChildMall()) { - wxCouponOrder = wxCouponOrderService.getById(couponOrderId,tenantEntity.getParentTenantId()); + if (null != parentTenantEntity ) { + wxCouponOrder = wxCouponOrderService.getById(couponOrderId,parentTenantEntity.getTenantId()); }else { wxCouponOrder = wxCouponOrderService.getById(couponOrderId,tenantEntity.getTenantId()); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index c51c796aa..74ce9e6f9 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -27,10 +27,6 @@ public class TenantEntity extends BaseEntity { @TableField(exist = false) protected String finalTenantId; - @io.swagger.annotations.ApiModelProperty(value="是否是集团统一小程序版本下的子广场",name="isChildMall") - @TableField(exist = false) - protected boolean isChildMall; - @JsonIgnore @TableField(exist = false) protected String shardTableSuffix; @@ -102,12 +98,4 @@ public class TenantEntity extends BaseEntity { this.tenantIdList = tenantIdList; } - public boolean isChildMall() { - return isChildMall; - } - - public void setChildMall(boolean isChildMall) { - this.isChildMall = isChildMall; - } - } diff --git a/mallinkService/src/main/java/com/iformall/utils/Constant.java b/mallinkService/src/main/java/com/iformall/utils/Constant.java index 59a024188..d5b8c76ca 100644 --- a/mallinkService/src/main/java/com/iformall/utils/Constant.java +++ b/mallinkService/src/main/java/com/iformall/utils/Constant.java @@ -64,7 +64,6 @@ public class Constant { public static final String APP_Id = "APP_Id"; public static final String APP_NAME = "APP_NAME"; public static final String APP_INFO = "APPINFO"; - public static final String IS_CHILD_MALL = "IS_CHILD_MALL"; public static final String LOGIN_B_USER_KEY = "LOGIN_B_USER_KEY";