|
|
|
@@ -186,7 +186,7 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun |
|
|
|
amountGiftActivity.setAwardList(activityAwardList); |
|
|
|
if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(amountGiftActivity.getMerchantRule())){ |
|
|
|
List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); |
|
|
|
amountGiftActivity.setMerchanList(activityMerchantList); |
|
|
|
amountGiftActivity.setMerchantList(activityMerchantList); |
|
|
|
} |
|
|
|
return amountGiftActivity; |
|
|
|
} |
|
|
|
|