caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码同步

Browse Source
This commit is contained in:
Chopper 2021-06-15 15:28:33 +08:00
parent 10dbed04b6
commit 24bb6a4169
5 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java
View File

@ -41,10 +41,10 @@ public class AppVersionBuyerController {
@ApiOperation(value = "获取版本号列表")
@ApiImplicitParam(name = "appType", value = "app类型", required = true, paramType = "path")
@GetMapping("/appVersion/{type}")
public ResultMessage<IPage<AppVersion>> appVersion(PageVO pageVO, @PathVariable String appType) {
@GetMapping("/appVersion/{appType}")
public ResultMessage<IPage<AppVersion>> appVersion(@PathVariable String appType, PageVO pageVO) {
IPage<AppVersion> page=appVersionService.page(PageUtil.initPage(pageVO), new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getType, appType));
IPage<AppVersion> page = appVersionService.page(PageUtil.initPage(pageVO), new LambdaQueryWrapper<AppVersion>().eq(AppVersion::getType, appType));
return ResultUtil.data(page);
}
}

6
framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java
View File

@ -104,4 +104,10 @@ public interface CouponService extends IService<Coupon> {
void usedCoupon(String couponId, Integer usedNum);
/**
* 活动优惠券列表
*/
IPage<Coupon> activityCoupons();
}

10
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
View File

@ -266,6 +266,16 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
this.mongoTemplate.save(couponVO);
}
@Override
public IPage<Coupon> activityCoupons() {
PageVO page = new PageVO();
page.setPageSize(9999);
page.setPageNumber(1);
LambdaQueryWrapper<Coupon> queryWrapper = new LambdaQueryWrapper();
queryWrapper.eq(Coupon::getGetType, CouponGetEnum.ACTIVITY.name());
return page(PageUtil.initPage(page), queryWrapper);
}
/**
* 检查优惠券信息是否合法
*

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

@ -6,11 +6,13 @@ import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.PageUtil;
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.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.modules.promotion.service.CouponService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -33,6 +35,8 @@ public class CouponActivityManagerController {
@Autowired
private CouponActivityService couponActivityService;
@Autowired
private CouponService couponService;
@ApiOperation(value = "获取优惠券活动分页")
@GetMapping
@ -42,20 +46,21 @@ public class CouponActivityManagerController {
@ApiOperation(value = "获取优惠券活动")
@ApiImplicitParam(name = "couponActivityId", value = "优惠券活动ID", required = true, paramType = "path")
@GetMapping("/getCouponActivity/{couponActivityId}")
@GetMapping("/{couponActivityId}")
public ResultMessage<CouponActivityVO> getCouponActivity(@PathVariable String couponActivityId) {
return ResultUtil.data(couponActivityService.getCouponActivityVO(couponActivityId));
}
@ApiOperation(value = "添加优惠券活动")
@PostMapping("/addCouponActivity")
@PostMapping
public ResultMessage<CouponActivity> addCouponActivity(@Validated CouponActivityDTO couponActivityDTO) {
return ResultUtil.data(couponActivityService.addCouponActivity(couponActivityDTO));
}
@ApiOperation(value = "修改优惠券活动")
@PutMapping("/updateCouponActivity")
public ResultMessage<CouponActivity> updateCouponActivity(@Validated CouponActivityDTO couponActivityDTO) {
@PutMapping("/{id}")
public ResultMessage<CouponActivity> updateCouponActivity(@PathVariable String id, @Validated CouponActivityDTO couponActivityDTO) {
couponActivityDTO.setId(id);
return ResultUtil.data(couponActivityService.updateCouponActivity(couponActivityDTO));
}
@ -65,10 +70,18 @@ public class CouponActivityManagerController {
@ApiImplicitParam(name = "promotionStatus", value = "活动状态", required = true, dataType = "String", paramType = "path")
})
@PutMapping("/updateStatus/{id}/{promotionStatus}")
public ResultMessage<CouponActivity> updateStatus(@PathVariable String id,@PathVariable String promotionStatus) {
if(couponActivityService.updateCouponActivityStatus(id, PromotionStatusEnum.valueOf(promotionStatus))){
public ResultMessage<CouponActivity> updateStatus(@PathVariable String id, @PathVariable String promotionStatus) {
if (couponActivityService.updateCouponActivityStatus(id, PromotionStatusEnum.valueOf(promotionStatus))) {
return ResultUtil.success(ResultCode.SUCCESS);
}
throw new ServiceException(ResultCode.ERROR);
}
@ApiOperation(value = "获取活动优惠券列表")
@GetMapping("/activityCoupons")
public ResultMessage<IPage<Coupon>> activityCoupons() {
return ResultUtil.data(couponService.activityCoupons());
}
}

5
manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.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.Seckill;
import cn.lili.modules.promotion.entity.dos.SeckillApply;
import cn.lili.modules.promotion.entity.enums.SeckillApplyStatusEnum;
import cn.lili.modules.promotion.entity.vos.SeckillSearchParams;
import cn.lili.modules.promotion.entity.vos.SeckillVO;
import cn.lili.modules.promotion.service.SeckillApplyService;
@ -35,8 +34,8 @@ public class SeckillManagerController {
private SeckillApplyService seckillApplyService;
@ApiOperation(value = "添加秒杀活动(初始化方法，默认初始化30天内的活动）")
@GetMapping
@ApiOperation(value = "初始化秒杀活动(初始化方法，默认初始化30天内的活动）")
@GetMapping("/init")
public void addSeckill() {
seckillService.init();
}