Browse Source

//activity v.2

release_toaliyun_real
xiaohu 1 year ago
parent
commit
72ecec0b10
6 changed files with 6 additions and 6 deletions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxVtwoAmountGiftActivity.java View File

@@ -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;


/** /**
* 活动状态 * 活动状态


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxVtwoCashBackActivity.java View File

@@ -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;


/** /**
* 活动状态 * 活动状态


+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxVtwoPrizeDrawActivity.java View File

@@ -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;


/** /**
* 活动状态 * 活动状态


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java View File

@@ -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;
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java View File

@@ -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;
} }


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java View File

@@ -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;
} }


Loading…
Cancel
Save