|
@@ -1,16 +1,17 @@
|
|
|
package com.qs.mp.web.controller.api.admin;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.qs.mp.admin.domain.Marketing;
|
|
|
import com.qs.mp.admin.domain.MarketingAwards;
|
|
|
import com.qs.mp.admin.domain.MarketingAwardsPrize;
|
|
|
-import com.qs.mp.admin.domain.TicketAwards;
|
|
|
import com.qs.mp.admin.domain.param.MarketingCreateParam;
|
|
|
import com.qs.mp.admin.domain.param.MarketingQueryParam;
|
|
|
import com.qs.mp.admin.domain.param.MarketingUpdateParam;
|
|
|
import com.qs.mp.admin.domain.vo.MarketingAwardsVO;
|
|
|
import com.qs.mp.admin.domain.vo.MarketingListVO;
|
|
|
+import com.qs.mp.admin.domain.vo.MarketingUserCodeListVO;
|
|
|
import com.qs.mp.admin.domain.vo.MarketingVO;
|
|
|
import com.qs.mp.admin.service.IMarketingAwardsPrizeService;
|
|
|
import com.qs.mp.admin.service.IMarketingAwardsService;
|
|
@@ -20,6 +21,9 @@ import com.qs.mp.common.core.domain.AjaxResult;
|
|
|
import com.qs.mp.common.core.page.TableDataInfo;
|
|
|
import com.qs.mp.common.enums.BusinessType;
|
|
|
import com.qs.mp.common.enums.MarketingStatusEnum;
|
|
|
+import com.qs.mp.common.enums.UserTypeEnum;
|
|
|
+import com.qs.mp.user.domain.MarketingUserCode;
|
|
|
+import com.qs.mp.user.service.IMarketingUserCodeService;
|
|
|
import com.qs.mp.web.controller.common.BaseApiController;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -54,6 +58,9 @@ public class MarketingMgrController extends BaseApiController {
|
|
|
@Autowired
|
|
|
private IMarketingAwardsPrizeService marketingAwardsPrizeService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IMarketingUserCodeService marketingUserCodeService;
|
|
|
+
|
|
|
@Log(title = "营销活动新增", businessType = BusinessType.INSERT)
|
|
|
@ApiOperation(value = "营销活动新增")
|
|
|
@PostMapping("/create")
|
|
@@ -177,4 +184,20 @@ public class MarketingMgrController extends BaseApiController {
|
|
|
return AjaxResult.success();
|
|
|
}
|
|
|
|
|
|
+ @PostMapping("/data/{id}")
|
|
|
+ @PreAuthorize("@ss.hasPermi('business:marketing:queryData')")
|
|
|
+ @ApiOperation("活动数据")
|
|
|
+ public TableDataInfo dataInfo(@PathVariable("id") Long id) {
|
|
|
+ startPage();
|
|
|
+ QueryWrapper<MarketingUserCode> queryWrapper = new QueryWrapper<>();
|
|
|
+ queryWrapper.eq("t1.marketing_id", id);
|
|
|
+ queryWrapper.eq("t1.user_type", UserTypeEnum.ORDINARY.getValue());
|
|
|
+
|
|
|
+ queryWrapper.orderByAsc("t4.sort");
|
|
|
+ queryWrapper.orderByDesc("t1.created_time");
|
|
|
+
|
|
|
+ List<MarketingUserCodeListVO> list = marketingUserCodeService.listMarketingUserCodeByQueryWrapper(queryWrapper);
|
|
|
+ return getDataTable(list);
|
|
|
+ }
|
|
|
+
|
|
|
}
|