diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java index 39f536330..2a11cb11e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java @@ -11,12 +11,8 @@ import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxVtwoActivityCreditRule; -import com.iformall.enums.EnumOfflineActivityAwardsMoneyRule; -import com.iformall.enums.EnumOfflineActivityMerchantType; -import com.iformall.enums.EnumOfflineActivityStatus; -import com.iformall.enums.EnumYesOrNo; -import com.iformall.service.WxVtwoActivitySpecialTopicService; -import com.iformall.service.WxVtwoAmountGiftActivityService; +import com.iformall.enums.*; +import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -41,6 +37,15 @@ public class WxVtwoActivitySpecialTopicController extends BaseController { @Autowired private WxVtwoActivitySpecialTopicService wxVtwoActivitySpecialTopicService; + @Autowired + private WxVtwoPrizeDrawActivityService wxVtwoPrizeDrawActivityService; + + @Autowired + private WxVtwoAmountGiftActivityService wxVtwoAmountGiftActivityService; + + @Autowired + private WxVtwoCashBackActivityService wxVtwoCashBackActivityService; + @ApiVersion(group = SwaggerConstant.V_A_2_0) @ApiOperation("分页列表接口") @GetMapping("list") @@ -102,6 +107,29 @@ public class WxVtwoActivitySpecialTopicController extends BaseController { if(specialTopic.getActivityList() == null || specialTopic.getActivityList().isEmpty()){ return new ResultData(Result.ERROR,"包含活动不能为空"); } + for (WxVtwoSpecialTopicActivity activity:specialTopic.getActivityList()){ + if(activity.getActivityId() == null || activity.getActivityType() == null){ + return new ResultData(Result.ERROR,"活动参数为空"); + } + EnumOfflineActivityType activityType = EnumOfflineActivityType.getEnum(activity.getActivityType()); + if(activityType == null){ + return new ResultData(Result.ERROR,"活动参数异常"); + } + switch (activityType) { + case LOTTERY_DRAW: + wxVtwoPrizeDrawActivityService.handleSpecialTopicActivity(tenantEntity, activity); + break; + case GIFT: + wxVtwoAmountGiftActivityService.handleSpecialTopicActivity(tenantEntity, activity); + break; + case CASHBACK: + wxVtwoCashBackActivityService.handleSpecialTopicActivity(tenantEntity, activity); + break; + default: + return new ResultData(Result.ERROR,"活动参数异常"); + } + } + wxVtwoActivitySpecialTopicService.saveOrUpdate(specialTopic); return new ResultData(specialTopic); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java index bbe5c33a0..a85402472 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java @@ -5,6 +5,8 @@ import com.iformall.domain.po.WxVtwoAmountGiftActivity; import com.baomidou.mybatisplus.extension.service.IService; import com.iformall.domain.po.WxVtwoCashBackActivity; import com.iformall.domain.po.WxVtwoPrizeDrawActivity; +import com.iformall.domain.po.WxVtwoSpecialTopicActivity; +import com.iformall.domain.po.base.TenantEntity; /** * @author xiaohu @@ -18,4 +20,6 @@ public interface WxVtwoAmountGiftActivityService extends IService