diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index 43c9e2138..ad3b2ca39 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -154,7 +154,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); 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 37d7924ed..96a3d22d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -66,9 +66,11 @@ public class BaseController { * @return */ public TenantEntity getTenantInfo(){ - Session session = SecurityUtils.getSubject().getSession(); - String tenantId = (String)session.getAttribute(UserSession.tenantId); - String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); + //Session session = SecurityUtils.getSubject().getSession(); + //String tenantId = (String)session.getAttribute(UserSession.tenantId); + //String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); + String tenantId = "789"; + String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); 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 adcb9b945..9c5469bbd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -340,7 +340,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrderBVo, Integer pageIndex, Integer pageSize) { + long times1 = System.currentTimeMillis(); handleWxCouponOrderBVoQueryParam(wxCouponOrderBVo); + logger.info(">>>>>>>>>>>>>>>>>>>init queryparam:"+(System.currentTimeMillis()-times1)); PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); if (null != pageInfo && null != pageInfo.getList()){ handleQueryResult(pageInfo.getList(), wxCouponOrderBVo); @@ -494,6 +496,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { private void handleQueryResult(List list,TenantEntity tenantEntity) { if (null != list ) { + long times1 = System.currentTimeMillis(); + WxMerchant merchantQ = new WxMerchant(); merchantQ.updateTenantInfo(tenantEntity); List merchantList = wxMerchantMapper.findIdNameList(merchantQ); @@ -504,6 +508,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { }); } + long times2 = System.currentTimeMillis(); + logger.info(">>>>>>>>>>>>>>>>>>>>>> query merchant :"+(times2-times1)); WxCoupon couponQ = new WxCoupon(); couponQ.updateTenantInfo(tenantEntity); List couponList = wxCouponMapper.findList(couponQ); @@ -513,7 +519,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { couponMap.put(c.getId(), c); }); } - + + long times3 = System.currentTimeMillis(); + logger.info(">>>>>>>>>>>>>>>>>>>>>> query coupon :"+(times3-times2)); + List merchantProductVos = wxCouponMerchantMapper.findMerchantProduct(tenantEntity.getTenantId(), null); Map merchantProductIdMap = new HashMap(); @@ -527,6 +536,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { }); } + long times4 = System.currentTimeMillis(); + logger.info(">>>>>>>>>>>>>>>>>>>>>> query merchantProductVos :"+(times4-times3)); + list.parallelStream().forEach(co -> { if (co.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode())) { co.setUpdateDate(null);