| @@ -314,11 +314,15 @@ public class WxCUserBasicInfoController extends BaseController { | |||||
| couponIds.add(c.getCouponId()); | couponIds.add(c.getCouponId()); | ||||
| List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(corder.getTenantId(), couponIds); | List<Long> merchantIds = wxCouponMerchantMapper.findMerchantByProductIds(corder.getTenantId(), couponIds); | ||||
| if (null != merchantIds && merchantIds.size() > 0 ) { | if (null != merchantIds && merchantIds.size() > 0 ) { | ||||
| Map<String, Object> param = new HashMap<String, Object>(); | |||||
| param.put("ids", merchantIds); | |||||
| WxMerchant w = wxMerchantMapper.findByTrade(param); | |||||
| if (w != null) { | |||||
| c.setMerchantName(w.getName()); | |||||
| if (merchantIds.size() > 1) { | |||||
| c.setMerchantName("[多商户]"); | |||||
| }else { | |||||
| Map<String, Object> param = new HashMap<String, Object>(); | |||||
| param.put("ids", merchantIds); | |||||
| WxMerchant w = wxMerchantMapper.findByTrade(param); | |||||
| if (w != null) { | |||||
| c.setMerchantName(w.getName()); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||