From cef91afde7a92abdb066f2d1fffee54c104be7a2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sun, 27 Nov 2022 18:32:44 +0800 Subject: [PATCH] //test --- .../main/java/com/iformall/controller/WxInfoController.java | 4 ---- .../com/iformall/service/impl/WxMerchantBUserServiceImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index d47f4ae9b..8f6464ee8 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -88,7 +88,6 @@ public class WxInfoController extends BaseController { if (buUser == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "登录用户未找到"); } - logger.info(JSON.toJSONString(buUser)); //其他参数 String systemInfo = param.get("systemInfo"); WxAppinfo wxAppinfo = getAppInfo(appId); @@ -102,14 +101,11 @@ public class WxInfoController extends BaseController { if(appPlat == null){ return new ResultData(ErrorCode.APP_PLAT_ERROR); } - logger.info(JSON.toJSONString(wxAppinfo)); WxMall wxMall = mallService.getByTenantId(wxAppinfo.getTenantId()); if(wxMall == null){ return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); } - logger.info(JSON.toJSONString(wxMall)); - String session_key = null; String openId = null; String unionId = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java index f26a12f13..2f4358ff7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantBUserServiceImpl.java @@ -218,11 +218,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { List listvo = new ArrayList<>(); for (WxMerchantBUser bUser:orgList) { WxMerchantBuInfoVo mbvo = new WxMerchantBuInfoVo(); - WxMall wxMall = mallMap.get(mbvo.getTenantId()); + WxMall wxMall = mallMap.get(bUser.getTenantId()); mbvo.updateTenantInfo(wxMall); mbvo.setTenantName(wxMall.getName()); mbvo.setMerchantId(mbvo.getMerchantId()); - WxMerchant merchant = merchantMap.get(mbvo.getMerchantId()); + WxMerchant merchant = merchantMap.get(bUser.getMerchantId()); mbvo.setMerchantName(merchant.getName()); mbvo.setImgUrl(merchant.getImgUrl()); mbvo.setBuUserId(bUser.getId());