| @@ -101,7 +101,7 @@ public class WxVtwoAmountGiftActivity extends TenantEntity { | |||||
| private List<Long> merchantIdList; | private List<Long> merchantIdList; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxVtwoActivityMerchant> merchanList; | |||||
| private List<WxVtwoActivityMerchant> merchantList; | |||||
| /** | /** | ||||
| * 活动状态 | * 活动状态 | ||||
| @@ -100,7 +100,7 @@ public class WxVtwoCashBackActivity extends TenantEntity { | |||||
| private List<Long> merchantIdList; | private List<Long> merchantIdList; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxVtwoActivityMerchant> merchanList; | |||||
| private List<WxVtwoActivityMerchant> merchantList; | |||||
| /** | /** | ||||
| * 活动状态 | * 活动状态 | ||||
| @@ -107,7 +107,7 @@ public class WxVtwoPrizeDrawActivity extends TenantEntity { | |||||
| private List<Long> merchantIdList; | private List<Long> merchantIdList; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxVtwoActivityMerchant> merchanList; | |||||
| private List<WxVtwoActivityMerchant> merchantList; | |||||
| /** | /** | ||||
| * 活动状态 | * 活动状态 | ||||
| @@ -186,7 +186,7 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun | |||||
| amountGiftActivity.setAwardList(activityAwardList); | amountGiftActivity.setAwardList(activityAwardList); | ||||
| if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(amountGiftActivity.getMerchantRule())){ | if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(amountGiftActivity.getMerchantRule())){ | ||||
| List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | ||||
| amountGiftActivity.setMerchanList(activityMerchantList); | |||||
| amountGiftActivity.setMerchantList(activityMerchantList); | |||||
| } | } | ||||
| return amountGiftActivity; | return amountGiftActivity; | ||||
| } | } | ||||
| @@ -185,7 +185,7 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac | |||||
| if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(cashBackActivity.getMerchantRule())){ | if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(cashBackActivity.getMerchantRule())){ | ||||
| List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | ||||
| cashBackActivity.setMerchanList(activityMerchantList); | |||||
| cashBackActivity.setMerchantList(activityMerchantList); | |||||
| } | } | ||||
| return cashBackActivity; | return cashBackActivity; | ||||
| } | } | ||||
| @@ -191,7 +191,7 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD | |||||
| prizeDrawActivity.setAwardList(activityAwardList); | prizeDrawActivity.setAwardList(activityAwardList); | ||||
| if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(prizeDrawActivity.getMerchantRule())){ | if(!EnumOfflineActivityMerchantType.ALL.getCode().equals(prizeDrawActivity.getMerchantRule())){ | ||||
| List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | List<WxVtwoActivityMerchant> activityMerchantList = wxVtwoActivityMerchantService.getActivityMerchantList(id,tenantId); | ||||
| prizeDrawActivity.setMerchanList(activityMerchantList); | |||||
| prizeDrawActivity.setMerchantList(activityMerchantList); | |||||
| } | } | ||||
| return prizeDrawActivity; | return prizeDrawActivity; | ||||
| } | } | ||||