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

Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

Browse Source
This commit is contained in:
paulGao
2023-01-10 14:34:52 +08:00
parent eefca656c6 3a63f87807
commit 5080cf65c7
139 changed files with 4832 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,8 @@ public class CouponActivityManagerController {
@ApiOperation(value = "获取优惠券活动分页")
@GetMapping
public ResultMessage<IPage<CouponActivity>> getCouponActivityPage(PageVO page) {
return ResultUtil.data(couponActivityService.page(PageUtil.initPage(page)));
public ResultMessage<IPage<CouponActivity>> getCouponActivityPage(PageVO page, CouponActivity couponActivity) {
return ResultUtil.data(couponActivityService.page(PageUtil.initPage(page), PageUtil.initWrapper(couponActivity)));
}
@ApiOperation(value = "获取优惠券活动")
@@ -52,7 +52,7 @@ public class CouponActivityManagerController {
@PostMapping
public ResultMessage<CouponActivity> addCouponActivity(@RequestBody(required = false) CouponActivityDTO couponActivityDTO) {
for (CouponActivityItem couponActivityItem : couponActivityDTO.getCouponActivityItems()) {
if (couponActivityItem.getNum() > 3) {
if (couponActivityItem.getNum() > 5) {
throw new ServiceException(ResultCode.COUPON_ACTIVITY_MAX_NUM);
}
}
@@ -63,9 +63,7 @@ public class CouponActivityManagerController {
}
@ApiOperation(value = "关闭优惠券活动")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "优惠券活动ID", required = true, dataType = "String", paramType = "path")
})
@ApiImplicitParams({@ApiImplicitParam(name = "id", value = "优惠券活动ID", required = true, dataType = "String", paramType = "path")})
@DeleteMapping("/{id}")
public ResultMessage<CouponActivity> updateStatus(@PathVariable String id) {
if (couponActivityService.updateStatus(Collections.singletonList(id), null, null)) {

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

@@ -248,6 +248,8 @@ lili:
order-group: lili_order_group
member-topic: lili_member_topic
member-group: lili_member_group
store-topic: lili_store_topic
store-group: lili_store_group
other-topic: lili_other_topic
other-group: lili_other_group
notice-topic: lili_notice_topic