From 1401640491036d1a37f7f3f4d6498270f0e7a0c9 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Wed, 13 Sep 2023 14:45:10 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=8A=B5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E9=83=A8=E5=88=86=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=B8=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WxCouponOrderServiceImpl.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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 68d404b13..8137fbeba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -3,7 +3,9 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.aliyun.openservices.shade.com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -50,6 +52,8 @@ import java.math.BigDecimal; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; @Service public class WxCouponOrderServiceImpl implements WxCouponOrderService { @@ -955,7 +959,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } private List handleQueryResult(boolean cUserEntry,List list,TenantEntity couponOrderTenantEntity) { - if (null != list && list.size() > 0) { + // 获取该租户下所有的商户 + List merchants = wxMerchantMapper.selectList(new LambdaQueryWrapper().select(WxMerchant::getId, WxMerchant::getName).eq(WxMerchant::getTenantId, couponOrderTenantEntity.getFinalTenantId())); + Map merchantMap = merchants.stream().collect(Collectors.toMap(WxMerchant::getId, WxMerchant::getName)); + + if (null != list && list.size() > 0) { //循环list,获取 cUserId List cUserIdList = new ArrayList(); @@ -1073,7 +1081,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } } - + Map merchantNameMap = new HashMap(); if (null != mallMerchantIdList && mallMerchantIdList.size() > 0 ) { for (Iterator it = mallMerchantIdList.keySet().iterator();it.hasNext();) { @@ -1122,7 +1130,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { co.setUpdateDate(null); } if (null != co.getSendMerchantId()) { - co.setSendMerchantName(merchantNameMap.get(co.getSendMerchantId())); +// co.setSendMerchantName(merchantNameMap.get(co.getSendMerchantId())); + co.setSendMerchantName(merchantMap.get(co.getSendMerchantId())); } WxCoupon coupon = couponMap.get(co.getCouponId()); if (null != coupon) {