|
|
|
@@ -513,7 +513,7 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe |
|
|
|
merchantS.setShopNumber(merchantShopNumberMap.get(merchantId)); |
|
|
|
merchantS.setLegionId(merchantLegionMap.get(merchantId)==null?0L:merchantLegionMap.get(merchantId)); |
|
|
|
merchantS.setLegionName(legionConfigMap.get(merchantS.getLegionId())); |
|
|
|
if(StringUtils.isNotBlank(merchantS.getLegionName())){ |
|
|
|
if(StringUtils.isBlank(merchantS.getLegionName())){ |
|
|
|
merchantS.setLegionName("无联盟"); |
|
|
|
} |
|
|
|
Integer userCount = merchantCountStatisticsMap.get(merchantId)==null?0:merchantCountStatisticsMap.get(merchantId); |
|
|
|
|