重构优化促销模块。移除促销相关的mongo
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
package cn.lili.controller.other;
|
||||
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
import cn.lili.common.enums.ResultCode;
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.exception.ServiceException;
|
||||
@@ -57,7 +59,8 @@ public class CustomWordsController {
|
||||
return "";
|
||||
}
|
||||
|
||||
if (!setting.getSettingValue().equals(secretKey)) {
|
||||
JSONObject jsonObject = JSONUtil.parseObj(setting.getSettingValue());
|
||||
if (!secretKey.equals(jsonObject.get("secretKey"))) {
|
||||
throw new ServiceException(ResultCode.CUSTOM_WORDS_SECRET_KEY_ERROR);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dos.CouponActivity;
|
||||
import cn.lili.modules.promotion.entity.dto.CouponActivityDTO;
|
||||
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
|
||||
import cn.lili.modules.promotion.entity.vos.CouponActivityVO;
|
||||
import cn.lili.modules.promotion.service.CouponActivityService;
|
||||
import cn.lili.mybatis.util.PageUtil;
|
||||
@@ -19,6 +18,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
/**
|
||||
* 优惠券活动
|
||||
*
|
||||
@@ -50,8 +51,10 @@ public class CouponActivityManagerController {
|
||||
@PostMapping
|
||||
@PutMapping(consumes = "application/json", produces = "application/json")
|
||||
public ResultMessage<CouponActivity> addCouponActivity(@RequestBody(required = false) CouponActivityDTO couponActivityDTO) {
|
||||
couponActivityDTO.setPromotionStatus(PromotionStatusEnum.NEW.name());
|
||||
return ResultUtil.data(couponActivityService.addCouponActivity(couponActivityDTO));
|
||||
if (couponActivityService.savePromotions(couponActivityDTO)) {
|
||||
return ResultUtil.data(couponActivityDTO);
|
||||
}
|
||||
return ResultUtil.error(ResultCode.COUPON_ACTIVITY_SAVE_ERROR);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "关闭优惠券活动")
|
||||
@@ -60,7 +63,7 @@ public class CouponActivityManagerController {
|
||||
})
|
||||
@DeleteMapping("/{id}")
|
||||
public ResultMessage<CouponActivity> updateStatus(@PathVariable String id) {
|
||||
if (couponActivityService.updateCouponActivityStatus(id, PromotionStatusEnum.END)) {
|
||||
if (couponActivityService.updateStatus(Collections.singletonList(id), null, null)) {
|
||||
return ResultUtil.success(ResultCode.SUCCESS);
|
||||
}
|
||||
throw new ServiceException(ResultCode.ERROR);
|
||||
|
||||
@@ -9,7 +9,6 @@ import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dos.Coupon;
|
||||
import cn.lili.modules.promotion.entity.dos.MemberCoupon;
|
||||
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
|
||||
import cn.lili.modules.promotion.entity.vos.CouponSearchParams;
|
||||
import cn.lili.modules.promotion.entity.vos.CouponVO;
|
||||
import cn.lili.modules.promotion.service.CouponService;
|
||||
@@ -44,13 +43,13 @@ public class CouponManagerController {
|
||||
@GetMapping
|
||||
public ResultMessage<IPage<CouponVO>> getCouponList(CouponSearchParams queryParam, PageVO page) {
|
||||
queryParam.setStoreId("platform");
|
||||
return ResultUtil.data(couponService.getCouponsByPageFromMongo(queryParam, page));
|
||||
return ResultUtil.data(couponService.pageVOFindAll(queryParam, page));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取优惠券详情")
|
||||
@GetMapping("/{couponId}")
|
||||
public ResultMessage<CouponVO> getCoupon(@PathVariable String couponId) {
|
||||
CouponVO coupon = couponService.getCouponDetailFromMongo(couponId);
|
||||
CouponVO coupon = couponService.getDetail(couponId);
|
||||
return ResultUtil.data(coupon);
|
||||
}
|
||||
|
||||
@@ -58,24 +57,24 @@ public class CouponManagerController {
|
||||
@PostMapping(consumes = "application/json", produces = "application/json")
|
||||
public ResultMessage<CouponVO> addCoupon(@RequestBody CouponVO couponVO) {
|
||||
this.setStoreInfo(couponVO);
|
||||
couponService.add(couponVO);
|
||||
couponService.savePromotions(couponVO);
|
||||
return ResultUtil.data(couponVO);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "修改优惠券")
|
||||
@PutMapping(consumes = "application/json", produces = "application/json")
|
||||
public ResultMessage<Coupon> updateCoupon(@RequestBody CouponVO couponVO) {
|
||||
this.setStoreInfo(couponVO);
|
||||
Coupon coupon = couponService.getById(couponVO.getId());
|
||||
couponVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
|
||||
couponService.updateCoupon(couponVO);
|
||||
couponService.updatePromotions(couponVO);
|
||||
return ResultUtil.data(coupon);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "修改优惠券状态")
|
||||
@PutMapping("/status")
|
||||
public ResultMessage<Object> updateCouponStatus(String couponIds, String promotionStatus) {
|
||||
public ResultMessage<Object> updateCouponStatus(String couponIds, Long startTime, Long endTime) {
|
||||
String[] split = couponIds.split(",");
|
||||
if (couponService.updateCouponStatus(Arrays.asList(split), PromotionStatusEnum.valueOf(promotionStatus))) {
|
||||
if (couponService.updateStatus(Arrays.asList(split), startTime, endTime)) {
|
||||
return ResultUtil.success(ResultCode.COUPON_EDIT_STATUS_SUCCESS);
|
||||
}
|
||||
throw new ServiceException(ResultCode.COUPON_EDIT_STATUS_ERROR);
|
||||
@@ -84,9 +83,7 @@ public class CouponManagerController {
|
||||
@ApiOperation(value = "批量删除")
|
||||
@DeleteMapping(value = "/{ids}")
|
||||
public ResultMessage<Object> delAllByIds(@PathVariable List<String> ids) {
|
||||
for (String id : ids) {
|
||||
couponService.deleteCoupon(id);
|
||||
}
|
||||
couponService.removePromotions(ids);
|
||||
return ResultUtil.success();
|
||||
}
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
|
||||
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
|
||||
import cn.lili.modules.promotion.entity.dos.FullDiscount;
|
||||
import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
|
||||
import cn.lili.modules.promotion.service.FullDiscountService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
/**
|
||||
* 管理端,满额活动接口
|
||||
*
|
||||
@@ -26,14 +28,15 @@ import org.springframework.web.bind.annotation.*;
|
||||
@Api(tags = "管理端,满额活动接口")
|
||||
@RequestMapping("/manager/promotion/fullDiscount")
|
||||
public class FullDiscountManagerController {
|
||||
|
||||
@Autowired
|
||||
private FullDiscountService fullDiscountService;
|
||||
|
||||
@ApiOperation(value = "获取满优惠列表")
|
||||
@GetMapping
|
||||
public ResultMessage<IPage<FullDiscountVO>> getCouponList(FullDiscountSearchParams searchParams, PageVO page) {
|
||||
public ResultMessage<IPage<FullDiscount>> getCouponList(FullDiscountSearchParams searchParams, PageVO page) {
|
||||
page.setNotConvert(true);
|
||||
return ResultUtil.data(fullDiscountService.getFullDiscountByPageFromMongo(searchParams, page));
|
||||
return ResultUtil.data(fullDiscountService.pageFindAll(searchParams, page));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取满优惠详情")
|
||||
@@ -42,20 +45,14 @@ public class FullDiscountManagerController {
|
||||
return ResultUtil.data(fullDiscountService.getFullDiscount(id));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取满优惠商品列表")
|
||||
@GetMapping("/goods/{id}")
|
||||
public ResultMessage<FullDiscountVO> getCouponGoods(@PathVariable String id) {
|
||||
return ResultUtil.data(fullDiscountService.getFullDiscount(id));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "修改满额活动状态")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "id", value = "满额活动ID", required = true, paramType = "path"),
|
||||
@ApiImplicitParam(name = "promotionStatus", value = "满额活动状态", required = true, paramType = "path")
|
||||
})
|
||||
@PutMapping("/status/{id}/{promotionStatus}")
|
||||
public ResultMessage<Object> updateCouponStatus(@PathVariable String id, @PathVariable String promotionStatus) {
|
||||
if (fullDiscountService.updateFullDiscountStatus(id, PromotionStatusEnum.valueOf(promotionStatus))) {
|
||||
@PutMapping("/status/{id}")
|
||||
public ResultMessage<Object> updateCouponStatus(@PathVariable String id, Long startTime, Long endTime) {
|
||||
if (fullDiscountService.updateStatus(Collections.singletonList(id), startTime, endTime)) {
|
||||
return ResultUtil.success(ResultCode.SUCCESS);
|
||||
}
|
||||
return ResultUtil.error(ResultCode.ERROR);
|
||||
|
||||
@@ -6,6 +6,7 @@ import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.exception.ServiceException;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dos.KanjiaActivityGoods;
|
||||
import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsDTO;
|
||||
import cn.lili.modules.promotion.entity.dto.KanjiaActivityGoodsOperationDTO;
|
||||
import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivityGoodsParams;
|
||||
@@ -43,7 +44,7 @@ public class KanJiaActivityGoodsManagerController {
|
||||
|
||||
@ApiOperation(value = "获取砍价活动分页")
|
||||
@GetMapping
|
||||
public ResultMessage<IPage<KanjiaActivityGoodsDTO>> getKanJiaActivityPage(KanjiaActivityGoodsParams KanJiaActivityParams, PageVO page) {
|
||||
public ResultMessage<IPage<KanjiaActivityGoods>> getKanJiaActivityPage(KanjiaActivityGoodsParams KanJiaActivityParams, PageVO page) {
|
||||
return ResultUtil.data(kanJiaActivityGoodsService.getForPage(KanJiaActivityParams, page));
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ import cn.lili.common.exception.ServiceException;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dos.Pintuan;
|
||||
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
|
||||
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
|
||||
import cn.lili.modules.promotion.entity.vos.PintuanSearchParams;
|
||||
import cn.lili.modules.promotion.entity.vos.PintuanVO;
|
||||
import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
|
||||
@@ -19,7 +19,7 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* 管理端,平台拼团接口
|
||||
@@ -38,46 +38,35 @@ public class PintuanManagerController {
|
||||
|
||||
@GetMapping(value = "/{id}")
|
||||
@ApiOperation(value = "通过id获取")
|
||||
public ResultMessage<Pintuan> get(@PathVariable String id) {
|
||||
Pintuan pintuan = pintuanService.getPintuanByIdFromMongo(id);
|
||||
public ResultMessage<PintuanVO> get(@PathVariable String id) {
|
||||
PintuanVO pintuan = pintuanService.getPintuanVO(id);
|
||||
return ResultUtil.data(pintuan);
|
||||
}
|
||||
|
||||
@GetMapping
|
||||
@ApiOperation(value = "根据条件分页查询拼团活动列表")
|
||||
public ResultMessage<IPage<PintuanVO>> getPintuanByPage(PintuanSearchParams queryParam, PageVO pageVo) {
|
||||
IPage<PintuanVO> pintuanByPageFromMongo = pintuanService.getPintuanByPageFromMongo(queryParam, pageVo);
|
||||
public ResultMessage<IPage<Pintuan>> getPintuanByPage(PintuanSearchParams queryParam, PageVO pageVo) {
|
||||
IPage<Pintuan> pintuanByPageFromMongo = pintuanService.pageFindAll(queryParam, pageVo);
|
||||
return ResultUtil.data(pintuanByPageFromMongo);
|
||||
}
|
||||
|
||||
@GetMapping("/goods/{pintuanId}")
|
||||
@ApiOperation(value = "根据条件分页查询拼团活动商品列表")
|
||||
public ResultMessage<IPage<PromotionGoodsDTO>> getPintuanGoodsByPage(@PathVariable String pintuanId, PageVO pageVo) {
|
||||
public ResultMessage<IPage<PromotionGoods>> getPintuanGoodsByPage(@PathVariable String pintuanId, PageVO pageVo) {
|
||||
PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams();
|
||||
searchParams.setPromotionId(pintuanId);
|
||||
searchParams.setPromotionType(PromotionTypeEnum.PINTUAN.name());
|
||||
IPage<PromotionGoodsDTO> promotionGoods = promotionGoodsService.getPromotionGoods(searchParams, pageVo);
|
||||
return ResultUtil.data(promotionGoods);
|
||||
return ResultUtil.data(promotionGoodsService.pageFindAll(searchParams, pageVo));
|
||||
}
|
||||
|
||||
@PutMapping("/open/{pintuanId}")
|
||||
@ApiOperation(value = "手动开启拼团活动")
|
||||
public ResultMessage<String> openPintuan(@PathVariable String pintuanId, Long startTime, Long endTime) {
|
||||
if (pintuanService.openPintuan(pintuanId, new Date(startTime), new Date(endTime))) {
|
||||
@PutMapping("/status/{pintuanIds}")
|
||||
@ApiOperation(value = "操作拼团活动状态")
|
||||
public ResultMessage<String> openPintuan(@PathVariable String pintuanIds, Long startTime, Long endTime) {
|
||||
if (pintuanService.updateStatus(Arrays.asList(pintuanIds.split(",")), startTime, endTime)) {
|
||||
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_OPEN_SUCCESS);
|
||||
}
|
||||
throw new ServiceException(ResultCode.PINTUAN_MANUAL_OPEN_ERROR);
|
||||
|
||||
}
|
||||
|
||||
@PutMapping("/close/{pintuanId}")
|
||||
@ApiOperation(value = "手动关闭拼团活动")
|
||||
public ResultMessage<String> closePintuan(@PathVariable String pintuanId) {
|
||||
if (pintuanService.closePintuan(pintuanId)) {
|
||||
return ResultUtil.success(ResultCode.PINTUAN_MANUAL_CLOSE_SUCCESS);
|
||||
}
|
||||
throw new ServiceException(ResultCode.PINTUAN_MANUAL_CLOSE_ERROR);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package cn.lili.controller.promotion;
|
||||
|
||||
import cn.lili.common.enums.ResultCode;
|
||||
import cn.lili.common.exception.ServiceException;
|
||||
import cn.lili.common.security.AuthUser;
|
||||
import cn.lili.common.security.context.UserContext;
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.exception.ServiceException;
|
||||
import cn.lili.common.security.context.UserContext;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dos.PointsGoods;
|
||||
import cn.lili.modules.promotion.entity.vos.PointsGoodsSearchParams;
|
||||
import cn.lili.modules.promotion.entity.vos.PointsGoodsVO;
|
||||
import cn.lili.modules.promotion.service.PointsGoodsService;
|
||||
@@ -16,9 +16,9 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 管理端,积分商品接口
|
||||
@@ -35,40 +35,34 @@ public class PointsGoodsManagerController {
|
||||
|
||||
@PostMapping(consumes = "application/json", produces = "application/json")
|
||||
@ApiOperation(value = "添加积分商品")
|
||||
public ResultMessage<Object> addPointsGoods(@RequestBody List<PointsGoodsVO> pointsGoodsList) {
|
||||
List<PointsGoodsVO> collect = new ArrayList<>();
|
||||
for (PointsGoodsVO i : pointsGoodsList) {
|
||||
i.setStoreName(i.getGoodsSku().getStoreName());
|
||||
i.setStoreId(i.getGoodsSku().getStoreId());
|
||||
collect.add(i);
|
||||
public ResultMessage<Object> addPointsGoods(@RequestBody List<PointsGoods> pointsGoodsList) {
|
||||
if (pointsGoodsService.savePointsGoodsBatch(pointsGoodsList)) {
|
||||
return ResultUtil.success();
|
||||
}
|
||||
pointsGoodsService.addPointsGoods(collect);
|
||||
return ResultUtil.success();
|
||||
return ResultUtil.error(ResultCode.POINT_GOODS_ERROR);
|
||||
}
|
||||
|
||||
@PutMapping(consumes = "application/json", produces = "application/json")
|
||||
@ApiOperation(value = "修改积分商品")
|
||||
public ResultMessage<Object> updatePointsGoods(@RequestBody PointsGoodsVO pointsGoods) {
|
||||
AuthUser currentUser = UserContext.getCurrentUser();
|
||||
pointsGoods.setStoreId(currentUser.getId());
|
||||
pointsGoods.setStoreName("platform");
|
||||
pointsGoodsService.updatePointsGoods(pointsGoods);
|
||||
Objects.requireNonNull(UserContext.getCurrentUser());
|
||||
pointsGoodsService.updatePromotions(pointsGoods);
|
||||
return ResultUtil.success();
|
||||
}
|
||||
|
||||
@PutMapping("/{ids}")
|
||||
@PutMapping("/status/{ids}")
|
||||
@ApiOperation(value = "修改积分商品状态")
|
||||
public ResultMessage<Object> updatePointsGoodsStatus(@PathVariable String ids, String promotionStatus) {
|
||||
if (pointsGoodsService.updatePointsGoodsPromotionStatus(Arrays.asList(ids.split(",")), promotionStatus)) {
|
||||
public ResultMessage<Object> updatePointsGoodsStatus(@PathVariable String ids, Long startTime, Long endTime) {
|
||||
if (pointsGoodsService.updateStatus(Arrays.asList(ids.split(",")), startTime, endTime)) {
|
||||
return ResultUtil.success();
|
||||
}
|
||||
throw new ServiceException(ResultCode.POINT_GOODS_ERROR);
|
||||
return ResultUtil.error(ResultCode.POINT_GOODS_ERROR);
|
||||
}
|
||||
|
||||
@DeleteMapping("/{ids}")
|
||||
@ApiOperation(value = "删除积分商品")
|
||||
public ResultMessage<Object> delete(@PathVariable String ids) {
|
||||
if (pointsGoodsService.deletePointsGoods(Arrays.asList(ids.split(",")))) {
|
||||
if (pointsGoodsService.removePromotions(Arrays.asList(ids.split(",")))) {
|
||||
return ResultUtil.success();
|
||||
}
|
||||
throw new ServiceException(ResultCode.POINT_GOODS_ERROR);
|
||||
@@ -76,8 +70,8 @@ public class PointsGoodsManagerController {
|
||||
|
||||
@GetMapping
|
||||
@ApiOperation(value = "分页获取积分商品")
|
||||
public ResultMessage<IPage<PointsGoodsVO>> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) {
|
||||
IPage<PointsGoodsVO> pointsGoodsByPage = pointsGoodsService.getPointsGoodsByPage(searchParams, page);
|
||||
public ResultMessage<IPage<PointsGoods>> getPointsGoodsPage(PointsGoodsSearchParams searchParams, PageVO page) {
|
||||
IPage<PointsGoods> pointsGoodsByPage = pointsGoodsService.pageFindAll(searchParams, page);
|
||||
return ResultUtil.data(pointsGoodsByPage);
|
||||
}
|
||||
|
||||
|
||||
@@ -3,9 +3,11 @@ package cn.lili.controller.promotion;
|
||||
import cn.lili.common.enums.ResultUtil;
|
||||
import cn.lili.common.vo.PageVO;
|
||||
import cn.lili.common.vo.ResultMessage;
|
||||
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
|
||||
import cn.lili.modules.promotion.service.PromotionService;
|
||||
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
|
||||
import cn.lili.modules.promotion.entity.enums.PromotionsStatusEnum;
|
||||
import cn.lili.modules.promotion.entity.vos.PromotionGoodsSearchParams;
|
||||
import cn.lili.modules.promotion.service.PromotionGoodsService;
|
||||
import cn.lili.modules.promotion.service.PromotionService;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
@@ -42,8 +44,12 @@ public class PromotionManagerController {
|
||||
|
||||
@GetMapping("/{promotionId}/goods")
|
||||
@ApiOperation(value = "获取当前进行中的促销活动商品")
|
||||
public ResultMessage<IPage<PromotionGoodsDTO>> getPromotionGoods(@PathVariable String promotionId, String promotionType, PageVO pageVO) {
|
||||
IPage<PromotionGoodsDTO> promotionGoods = promotionGoodsService.getCurrentPromotionGoods(promotionType, pageVO);
|
||||
public ResultMessage<IPage<PromotionGoods>> getPromotionGoods(@PathVariable String promotionId, String promotionType, PageVO pageVO) {
|
||||
PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams();
|
||||
searchParams.setPromotionId(promotionId);
|
||||
searchParams.setPromotionType(promotionType);
|
||||
searchParams.setPromotionStatus(PromotionsStatusEnum.START.name());
|
||||
IPage<PromotionGoods> promotionGoods = promotionGoodsService.pageFindAll(searchParams, pageVO);
|
||||
return ResultUtil.data(promotionGoods);
|
||||
}
|
||||
|
||||
|
||||
@@ -16,6 +16,8 @@ import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.Collections;
|
||||
|
||||
/**
|
||||
* 管理端,秒杀活动接口
|
||||
*
|
||||
@@ -40,9 +42,9 @@ public class SeckillManagerController {
|
||||
|
||||
|
||||
@ApiOperation(value = "修改秒杀活动")
|
||||
@PutMapping
|
||||
public ResultMessage<Seckill> updateSeckill(SeckillVO seckillVO) {
|
||||
seckillService.modifySeckill(seckillVO);
|
||||
@PutMapping(consumes = "application/json", produces = "application/json")
|
||||
public ResultMessage<Seckill> updateSeckill(@RequestBody SeckillVO seckillVO) {
|
||||
seckillService.updatePromotions(seckillVO);
|
||||
return ResultUtil.data(seckillVO);
|
||||
}
|
||||
|
||||
@@ -50,44 +52,36 @@ public class SeckillManagerController {
|
||||
@ApiImplicitParam(name = "id", value = "秒杀活动ID", required = true, dataType = "String", paramType = "path")
|
||||
@GetMapping(value = "/{id}")
|
||||
public ResultMessage<Seckill> get(@PathVariable String id) {
|
||||
Seckill seckill = seckillService.getSeckillByIdFromMongo(id);
|
||||
Seckill seckill = seckillService.getById(id);
|
||||
return ResultUtil.data(seckill);
|
||||
}
|
||||
|
||||
@ApiOperation(value = "分页查询秒杀活动列表")
|
||||
@GetMapping
|
||||
public ResultMessage<IPage<SeckillVO>> getAll(SeckillSearchParams param, PageVO pageVo) {
|
||||
return ResultUtil.data(seckillService.getSeckillByPageFromMongo(param, pageVo));
|
||||
public ResultMessage<IPage<Seckill>> getAll(SeckillSearchParams param, PageVO pageVo) {
|
||||
return ResultUtil.data(seckillService.pageFindAll(param, pageVo));
|
||||
}
|
||||
|
||||
@ApiOperation(value = "删除一个秒杀活动")
|
||||
@ApiImplicitParam(name = "id", value = "秒杀活动ID", required = true, dataType = "String", paramType = "path")
|
||||
@DeleteMapping("/{id}")
|
||||
public ResultMessage<Object> deleteSeckill(@PathVariable String id) {
|
||||
seckillService.deleteSeckill(id);
|
||||
seckillService.removePromotions(Collections.singletonList(id));
|
||||
return ResultUtil.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "关闭一个秒杀活动")
|
||||
@ApiOperation(value = "操作秒杀活动状态")
|
||||
@ApiImplicitParam(name = "id", value = "秒杀活动ID", required = true, dataType = "String", paramType = "path")
|
||||
@PutMapping("/close/{id}")
|
||||
public ResultMessage<Object> closeSeckill(@PathVariable String id) {
|
||||
seckillService.closeSeckill(id);
|
||||
return ResultUtil.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "开启一个秒杀活动")
|
||||
@ApiImplicitParam(name = "id", value = "秒杀活动ID", required = true, dataType = "String", paramType = "path")
|
||||
@PutMapping("/open/{id}")
|
||||
public ResultMessage<Object> openSeckill(@PathVariable String id) {
|
||||
seckillService.openSeckill(id);
|
||||
@PutMapping("/status/{id}")
|
||||
public ResultMessage<Object> updateSeckillStatus(@PathVariable String id, Long startTime, Long endTime) {
|
||||
seckillService.updateStatus(Collections.singletonList(id), startTime, endTime);
|
||||
return ResultUtil.success();
|
||||
}
|
||||
|
||||
@ApiOperation(value = "获取秒杀活动申请列表")
|
||||
@GetMapping("/apply")
|
||||
public ResultMessage<IPage<SeckillApply>> getSeckillApply(SeckillSearchParams param, PageVO pageVo) {
|
||||
IPage<SeckillApply> seckillApply = seckillApplyService.getSeckillApplyFromMongo(param, pageVo);
|
||||
IPage<SeckillApply> seckillApply = seckillApplyService.getSeckillApply(param, pageVo);
|
||||
return ResultUtil.data(seckillApply);
|
||||
}
|
||||
|
||||
|
||||
@@ -131,6 +131,7 @@ ignored:
|
||||
- /manager/user/login
|
||||
- /manager/user/refresh/**
|
||||
- /manager/elasticsearch
|
||||
- /manager/custom-words
|
||||
- /druid/**
|
||||
- /swagger-ui.html
|
||||
- /doc.html
|
||||
|
||||
Reference in New Issue
Block a user