| @@ -88,7 +88,6 @@ public class WxInfoController extends BaseController { | |||||
| if (buUser == null) { | if (buUser == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "登录用户未找到"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "登录用户未找到"); | ||||
| } | } | ||||
| logger.info(JSON.toJSONString(buUser)); | |||||
| //其他参数 | //其他参数 | ||||
| String systemInfo = param.get("systemInfo"); | String systemInfo = param.get("systemInfo"); | ||||
| WxAppinfo wxAppinfo = getAppInfo(appId); | WxAppinfo wxAppinfo = getAppInfo(appId); | ||||
| @@ -102,14 +101,11 @@ public class WxInfoController extends BaseController { | |||||
| if(appPlat == null){ | if(appPlat == null){ | ||||
| return new ResultData(ErrorCode.APP_PLAT_ERROR); | return new ResultData(ErrorCode.APP_PLAT_ERROR); | ||||
| } | } | ||||
| logger.info(JSON.toJSONString(wxAppinfo)); | |||||
| WxMall wxMall = mallService.getByTenantId(wxAppinfo.getTenantId()); | WxMall wxMall = mallService.getByTenantId(wxAppinfo.getTenantId()); | ||||
| if(wxMall == null){ | if(wxMall == null){ | ||||
| return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); | return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); | ||||
| } | } | ||||
| logger.info(JSON.toJSONString(wxMall)); | |||||
| String session_key = null; | String session_key = null; | ||||
| String openId = null; | String openId = null; | ||||
| String unionId = null; | String unionId = null; | ||||
| @@ -218,11 +218,11 @@ public class WxMerchantBUserServiceImpl implements WxMerchantBUserService { | |||||
| List<WxMerchantBuInfoVo> listvo = new ArrayList<>(); | List<WxMerchantBuInfoVo> listvo = new ArrayList<>(); | ||||
| for (WxMerchantBUser bUser:orgList) { | for (WxMerchantBUser bUser:orgList) { | ||||
| WxMerchantBuInfoVo mbvo = new WxMerchantBuInfoVo(); | WxMerchantBuInfoVo mbvo = new WxMerchantBuInfoVo(); | ||||
| WxMall wxMall = mallMap.get(mbvo.getTenantId()); | |||||
| WxMall wxMall = mallMap.get(bUser.getTenantId()); | |||||
| mbvo.updateTenantInfo(wxMall); | mbvo.updateTenantInfo(wxMall); | ||||
| mbvo.setTenantName(wxMall.getName()); | mbvo.setTenantName(wxMall.getName()); | ||||
| mbvo.setMerchantId(mbvo.getMerchantId()); | mbvo.setMerchantId(mbvo.getMerchantId()); | ||||
| WxMerchant merchant = merchantMap.get(mbvo.getMerchantId()); | |||||
| WxMerchant merchant = merchantMap.get(bUser.getMerchantId()); | |||||
| mbvo.setMerchantName(merchant.getName()); | mbvo.setMerchantName(merchant.getName()); | ||||
| mbvo.setImgUrl(merchant.getImgUrl()); | mbvo.setImgUrl(merchant.getImgUrl()); | ||||
| mbvo.setBuUserId(bUser.getId()); | mbvo.setBuUserId(bUser.getId()); | ||||