|
@@ -5,13 +5,13 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
|
|
import cn.iocoder.yudao.module.product.api.spu.ProductSpuApi;
|
|
|
import cn.iocoder.yudao.module.product.api.spu.dto.ProductSpuRespDTO;
|
|
|
-import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.BargainActivityCreateReqVO;
|
|
|
-import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.BargainActivityPageReqVO;
|
|
|
-import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.BargainActivityRespVO;
|
|
|
-import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.BargainActivityUpdateReqVO;
|
|
|
+import cn.iocoder.yudao.module.promotion.controller.admin.bargain.vo.*;
|
|
|
import cn.iocoder.yudao.module.promotion.convert.bargain.BargainActivityConvert;
|
|
|
import cn.iocoder.yudao.module.promotion.dal.dataobject.bargain.BargainActivityDO;
|
|
|
+import cn.iocoder.yudao.module.promotion.enums.bargain.BargainRecordStatusEnum;
|
|
|
import cn.iocoder.yudao.module.promotion.service.bargain.BargainActivityService;
|
|
|
+import cn.iocoder.yudao.module.promotion.service.bargain.BargainHelpService;
|
|
|
+import cn.iocoder.yudao.module.promotion.service.bargain.BargainRecordService;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.util.Collection;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
|
|
@@ -33,7 +35,12 @@ import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.
|
|
|
public class BargainActivityController {
|
|
|
|
|
|
@Resource
|
|
|
- private BargainActivityService activityService;
|
|
|
+ private BargainActivityService bargainActivityService;
|
|
|
+ @Resource
|
|
|
+ private BargainRecordService bargainRecordService;
|
|
|
+ @Resource
|
|
|
+ private BargainHelpService bargainHelpService;
|
|
|
+
|
|
|
@Resource
|
|
|
private ProductSpuApi spuApi;
|
|
|
|
|
@@ -41,14 +48,14 @@ public class BargainActivityController {
|
|
|
@Operation(summary = "创建砍价活动")
|
|
|
@PreAuthorize("@ss.hasPermission('promotion:bargain-activity:create')")
|
|
|
public CommonResult<Long> createBargainActivity(@Valid @RequestBody BargainActivityCreateReqVO createReqVO) {
|
|
|
- return success(activityService.createBargainActivity(createReqVO));
|
|
|
+ return success(bargainActivityService.createBargainActivity(createReqVO));
|
|
|
}
|
|
|
|
|
|
@PutMapping("/update")
|
|
|
@Operation(summary = "更新砍价活动")
|
|
|
@PreAuthorize("@ss.hasPermission('promotion:bargain-activity:update')")
|
|
|
public CommonResult<Boolean> updateBargainActivity(@Valid @RequestBody BargainActivityUpdateReqVO updateReqVO) {
|
|
|
- activityService.updateBargainActivity(updateReqVO);
|
|
|
+ bargainActivityService.updateBargainActivity(updateReqVO);
|
|
|
return success(true);
|
|
|
}
|
|
|
|
|
@@ -57,7 +64,7 @@ public class BargainActivityController {
|
|
|
@Parameter(name = "id", description = "编号", required = true)
|
|
|
@PreAuthorize("@ss.hasPermission('promotion:bargain-activity:delete')")
|
|
|
public CommonResult<Boolean> deleteBargainActivity(@RequestParam("id") Long id) {
|
|
|
- activityService.deleteBargainActivity(id);
|
|
|
+ bargainActivityService.deleteBargainActivity(id);
|
|
|
return success(true);
|
|
|
}
|
|
|
|
|
@@ -66,23 +73,30 @@ public class BargainActivityController {
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|
|
|
@PreAuthorize("@ss.hasPermission('promotion:bargain-activity:query')")
|
|
|
public CommonResult<BargainActivityRespVO> getBargainActivity(@RequestParam("id") Long id) {
|
|
|
- return success(BargainActivityConvert.INSTANCE.convert(activityService.getBargainActivity(id)));
|
|
|
+ return success(BargainActivityConvert.INSTANCE.convert(bargainActivityService.getBargainActivity(id)));
|
|
|
}
|
|
|
|
|
|
@GetMapping("/page")
|
|
|
@Operation(summary = "获得砍价活动分页")
|
|
|
@PreAuthorize("@ss.hasPermission('promotion:bargain-activity:query')")
|
|
|
- public CommonResult<PageResult<BargainActivityRespVO>> getBargainActivityPage(
|
|
|
+ public CommonResult<PageResult<BargainActivityPageItemRespVO>> getBargainActivityPage(
|
|
|
@Valid BargainActivityPageReqVO pageVO) {
|
|
|
// 查询砍价活动
|
|
|
- PageResult<BargainActivityDO> pageResult = activityService.getBargainActivityPage(pageVO);
|
|
|
+ PageResult<BargainActivityDO> pageResult = bargainActivityService.getBargainActivityPage(pageVO);
|
|
|
if (CollUtil.isEmpty(pageResult.getList())) {
|
|
|
return success(PageResult.empty(pageResult.getTotal()));
|
|
|
}
|
|
|
|
|
|
// 拼接数据
|
|
|
List<ProductSpuRespDTO> spuList = spuApi.getSpuList(convertList(pageResult.getList(), BargainActivityDO::getSpuId));
|
|
|
- return success(BargainActivityConvert.INSTANCE.convertPage(pageResult, spuList));
|
|
|
+ // 统计数据
|
|
|
+ Collection<Long> activityIds = convertList(pageResult.getList(), BargainActivityDO::getId);
|
|
|
+ Map<Long, Integer> recordUserCountMap = bargainRecordService.getBargainRecordUserCountMap(activityIds, null);
|
|
|
+ Map<Long, Integer> recordSuccessUserCountMap = bargainRecordService.getBargainRecordUserCountMap(activityIds,
|
|
|
+ BargainRecordStatusEnum.SUCCESS.getStatus());
|
|
|
+ Map<Long, Integer> helpUserCountMap = bargainHelpService.getBargainHelpUserCountMap(activityIds);
|
|
|
+ return success(BargainActivityConvert.INSTANCE.convertPage(pageResult, spuList,
|
|
|
+ recordUserCountMap, recordSuccessUserCountMap, helpUserCountMap));
|
|
|
}
|
|
|
|
|
|
}
|