Browse Source

//activity v.2

release_toaliyun_real
xiaohu 1 year ago
parent
commit
b1653be4e1
8 changed files with 100 additions and 6 deletions
  1. +34
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/service/WxVtwoPrizeDrawActivityService.java
  5. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoAmountGiftActivityServiceImpl.java
  6. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoCashBackActivityServiceImpl.java
  7. +18
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoPrizeDrawActivityServiceImpl.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxVtwoSpecialTopicActivityServiceImpl.java

+ 34
- 6
mallinkAdmin/src/main/java/com/iformall/controller/market/WxVtwoActivitySpecialTopicController.java View File

@@ -11,12 +11,8 @@ import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.BaseEntity.SortField;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxVtwoActivityCreditRule; 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.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -41,6 +37,15 @@ public class WxVtwoActivitySpecialTopicController extends BaseController {
@Autowired @Autowired
private WxVtwoActivitySpecialTopicService wxVtwoActivitySpecialTopicService; private WxVtwoActivitySpecialTopicService wxVtwoActivitySpecialTopicService;


@Autowired
private WxVtwoPrizeDrawActivityService wxVtwoPrizeDrawActivityService;

@Autowired
private WxVtwoAmountGiftActivityService wxVtwoAmountGiftActivityService;

@Autowired
private WxVtwoCashBackActivityService wxVtwoCashBackActivityService;

@ApiVersion(group = SwaggerConstant.V_A_2_0) @ApiVersion(group = SwaggerConstant.V_A_2_0)
@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@@ -102,6 +107,29 @@ public class WxVtwoActivitySpecialTopicController extends BaseController {
if(specialTopic.getActivityList() == null || specialTopic.getActivityList().isEmpty()){ if(specialTopic.getActivityList() == null || specialTopic.getActivityList().isEmpty()){
return new ResultData(Result.ERROR,"包含活动不能为空"); 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); wxVtwoActivitySpecialTopicService.saveOrUpdate(specialTopic);
return new ResultData(specialTopic); return new ResultData(specialTopic);
} }


+ 4
- 0
mallinkService/src/main/java/com/iformall/service/WxVtwoAmountGiftActivityService.java View File

@@ -5,6 +5,8 @@ import com.iformall.domain.po.WxVtwoAmountGiftActivity;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.iformall.domain.po.WxVtwoCashBackActivity; import com.iformall.domain.po.WxVtwoCashBackActivity;
import com.iformall.domain.po.WxVtwoPrizeDrawActivity; import com.iformall.domain.po.WxVtwoPrizeDrawActivity;
import com.iformall.domain.po.WxVtwoSpecialTopicActivity;
import com.iformall.domain.po.base.TenantEntity;


/** /**
* @author xiaohu * @author xiaohu
@@ -18,4 +20,6 @@ public interface WxVtwoAmountGiftActivityService extends IService<WxVtwoAmountGi
WxVtwoAmountGiftActivity getInfoById(Long id, String tenantId); WxVtwoAmountGiftActivity getInfoById(Long id, String tenantId);


WxVtwoAmountGiftActivity getById(Long id, String tenantId); WxVtwoAmountGiftActivity getById(Long id, String tenantId);

void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity);
} }

+ 4
- 0
mallinkService/src/main/java/com/iformall/service/WxVtwoCashBackActivityService.java View File

@@ -5,6 +5,8 @@ import com.iformall.domain.po.WxVtwoAmountGiftActivity;
import com.iformall.domain.po.WxVtwoCashBackActivity; import com.iformall.domain.po.WxVtwoCashBackActivity;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.iformall.domain.po.WxVtwoPrizeDrawActivity; import com.iformall.domain.po.WxVtwoPrizeDrawActivity;
import com.iformall.domain.po.WxVtwoSpecialTopicActivity;
import com.iformall.domain.po.base.TenantEntity;


/** /**
* @author xiaohu * @author xiaohu
@@ -18,4 +20,6 @@ public interface WxVtwoCashBackActivityService extends IService<WxVtwoCashBackAc
WxVtwoCashBackActivity getInfoById(Long id, String tenantId); WxVtwoCashBackActivity getInfoById(Long id, String tenantId);


WxVtwoCashBackActivity getById(Long id, String tenantId); WxVtwoCashBackActivity getById(Long id, String tenantId);

void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity);
} }

+ 3
- 0
mallinkService/src/main/java/com/iformall/service/WxVtwoPrizeDrawActivityService.java View File

@@ -4,6 +4,8 @@ import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.WxVtwoActivityOrder; import com.iformall.domain.po.WxVtwoActivityOrder;
import com.iformall.domain.po.WxVtwoPrizeDrawActivity; import com.iformall.domain.po.WxVtwoPrizeDrawActivity;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.iformall.domain.po.WxVtwoSpecialTopicActivity;
import com.iformall.domain.po.base.TenantEntity;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@@ -22,4 +24,5 @@ public interface WxVtwoPrizeDrawActivityService extends IService<WxVtwoPrizeDraw


WxVtwoPrizeDrawActivity getById(Long id, String tenantId); WxVtwoPrizeDrawActivity getById(Long id, String tenantId);


void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity);
} }

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

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; import com.iformall.domain.vo.WxVtwoActivityOrderStatistics;
import com.iformall.domain.vo.WxVtwoActivityRuleDetail; import com.iformall.domain.vo.WxVtwoActivityRuleDetail;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.ExcelService; import com.iformall.service.ExcelService;
import com.iformall.service.WxVtwoActivityAwardService; import com.iformall.service.WxVtwoActivityAwardService;
@@ -221,6 +224,21 @@ public class WxVtwoAmountGiftActivityServiceImpl extends ServiceImpl<WxVtwoAmoun
public WxVtwoAmountGiftActivity getById(Long id, String tenantId) { public WxVtwoAmountGiftActivity getById(Long id, String tenantId) {
return wxVtwoAmountGiftActivityMapper.selectById(id, tenantId); return wxVtwoAmountGiftActivityMapper.selectById(id, tenantId);
} }

@Override
public void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity) {
WxVtwoAmountGiftActivity amountGiftActivity = wxVtwoAmountGiftActivityMapper.selectById(activity.getId(), tenantEntity.getTenantId());
if(amountGiftActivity == null){
throw new MallinkException(Result.ERROR,"未查询到活动");
}
activity.setActivityId(amountGiftActivity.getId());
activity.setActivityType(EnumOfflineActivityType.GIFT.getCode());
activity.setActivityName(amountGiftActivity.getName());
activity.setActivityCreateDate(amountGiftActivity.getCreateDate());
activity.setActivityStartTime(amountGiftActivity.getStartTime());
activity.setActivityEndTime(amountGiftActivity.getEndTime());
activity.setActivityStatus(amountGiftActivity.getStatus());
}
} }






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

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; import com.iformall.domain.vo.WxVtwoActivityOrderStatistics;
import com.iformall.domain.vo.WxVtwoActivityRuleDetail; import com.iformall.domain.vo.WxVtwoActivityRuleDetail;
import com.iformall.domain.vo.WxVtwoActivityTaxDeductionRule; import com.iformall.domain.vo.WxVtwoActivityTaxDeductionRule;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -221,6 +224,21 @@ public class WxVtwoCashBackActivityServiceImpl extends ServiceImpl<WxVtwoCashBac
return wxVtwoCashBackActivityMapper.selectById(id, tenantId); return wxVtwoCashBackActivityMapper.selectById(id, tenantId);
} }


@Override
public void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity) {
WxVtwoCashBackActivity cashBackActivity = wxVtwoCashBackActivityMapper.selectById(activity.getId(), tenantEntity.getTenantId());
if(cashBackActivity == null){
throw new MallinkException(Result.ERROR,"未查询到活动");
}
activity.setActivityId(cashBackActivity.getId());
activity.setActivityType(EnumOfflineActivityType.CASHBACK.getCode());
activity.setActivityName(cashBackActivity.getName());
activity.setActivityCreateDate(cashBackActivity.getCreateDate());
activity.setActivityStartTime(cashBackActivity.getStartTime());
activity.setActivityEndTime(cashBackActivity.getEndTime());
activity.setActivityStatus(cashBackActivity.getStatus());
}

} }






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

@@ -8,13 +8,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.Result;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.OfflineActivityRecordStatistics; import com.iformall.domain.vo.OfflineActivityRecordStatistics;
import com.iformall.domain.vo.WxVtwoActivityOrderStatistics; import com.iformall.domain.vo.WxVtwoActivityOrderStatistics;
import com.iformall.domain.vo.WxVtwoActivityRule; import com.iformall.domain.vo.WxVtwoActivityRule;
import com.iformall.domain.vo.WxVtwoActivityRuleDetail; import com.iformall.domain.vo.WxVtwoActivityRuleDetail;
import com.iformall.enums.*; import com.iformall.enums.*;
import com.iformall.exception.MallinkException;
import com.iformall.mapper.*; import com.iformall.mapper.*;
import com.iformall.service.*; import com.iformall.service.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -228,6 +231,21 @@ public class WxVtwoPrizeDrawActivityServiceImpl extends ServiceImpl<WxVtwoPrizeD
return wxVtwoPrizeDrawActivityMapper.selectById(id, tenantId); return wxVtwoPrizeDrawActivityMapper.selectById(id, tenantId);
} }


@Override
public void handleSpecialTopicActivity(TenantEntity tenantEntity, WxVtwoSpecialTopicActivity activity) {
WxVtwoPrizeDrawActivity prizeDrawActivity = wxVtwoPrizeDrawActivityMapper.selectById(activity.getId(), tenantEntity.getTenantId());
if(prizeDrawActivity == null){
throw new MallinkException(Result.ERROR,"未查询到活动");
}
activity.setActivityId(prizeDrawActivity.getId());
activity.setActivityType(EnumOfflineActivityType.LOTTERY_DRAW.getCode());
activity.setActivityName(prizeDrawActivity.getName());
activity.setActivityCreateDate(prizeDrawActivity.getCreateDate());
activity.setActivityStartTime(prizeDrawActivity.getStartTime());
activity.setActivityEndTime(prizeDrawActivity.getEndTime());
activity.setActivityStatus(prizeDrawActivity.getStatus());
}

} }






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

@@ -6,6 +6,7 @@ import com.iformall.common.IdWorker;
import com.iformall.domain.po.WxVtwoActivityAward; import com.iformall.domain.po.WxVtwoActivityAward;
import com.iformall.domain.po.WxVtwoSpecialTopicActivity; import com.iformall.domain.po.WxVtwoSpecialTopicActivity;
import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumOfflineActivityType;
import com.iformall.service.WxVtwoSpecialTopicActivityService; import com.iformall.service.WxVtwoSpecialTopicActivityService;
import com.iformall.mapper.WxVtwoSpecialTopicActivityMapper; import com.iformall.mapper.WxVtwoSpecialTopicActivityMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;


Loading…
Cancel
Save