From c7187fe1ab46b2f6655c5ff6f1333bc1aaea589d Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Sat, 26 Oct 2024 17:04:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=20=E9=A2=86?= =?UTF-8?q?=E5=8F=96=E8=AF=A6=E6=83=85=20=E4=BB=A5=E5=8F=8A=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbShopCouponController.java | 18 ++++++++- .../cn/ysk/cashier/dto/QueryReceiveDto.java | 19 ++++++++++ .../mybatis/mapper/TbShopCouponMapper.java | 37 +++++++++++++++++++ .../mybatis/service/TbShopCouponService.java | 6 ++- .../service/impl/TbShopCouponServiceImpl.java | 21 +++++++++-- .../cn/ysk/cashier/vo/QueryReceiveVo.java | 24 ++++++++++++ 6 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/dto/QueryReceiveDto.java create mode 100644 eladmin-system/src/main/java/cn/ysk/cashier/vo/QueryReceiveVo.java diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopCouponController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopCouponController.java index fb1b0a2f..bae5fed1 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopCouponController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/TbShopCouponController.java @@ -1,5 +1,6 @@ package cn.ysk.cashier.controller; +import cn.ysk.cashier.dto.QueryReceiveDto; import cn.ysk.cashier.exception.BadRequestException; import cn.ysk.cashier.mybatis.entity.TbShopCoupon; import cn.ysk.cashier.mybatis.service.TbShopCouponService; @@ -7,6 +8,7 @@ import cn.ysk.cashier.mybatis.vo.TbShopCouponVo; import cn.ysk.cashier.utils.SecurityUtils; import io.swagger.annotations.Api; import org.springframework.util.CollectionUtils; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; @@ -69,10 +71,24 @@ public class TbShopCouponController { } @DeleteMapping - @ApiOperation("删除") + @ApiOperation("删除优惠券") public ResponseEntity delete(@RequestBody Integer[] ids) { tbShopCouponService.delete(ids); return new ResponseEntity<>(HttpStatus.OK); } + + + @PostMapping("/queryReceive") + @ApiOperation("领取详情") + public ResponseEntity queryReceive(@Validated @RequestBody QueryReceiveDto param) { + return new ResponseEntity<>(tbShopCouponService.queryReceive(param), HttpStatus.OK); + } + + @DeleteMapping("receive") + @ApiOperation("删除用户的券") + public ResponseEntity deleteReceive(@RequestBody Integer[] ids) { + tbShopCouponService.deleteReceive(ids); + return new ResponseEntity<>(HttpStatus.OK); + } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/dto/QueryReceiveDto.java b/eladmin-system/src/main/java/cn/ysk/cashier/dto/QueryReceiveDto.java new file mode 100644 index 00000000..de0dee0c --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/QueryReceiveDto.java @@ -0,0 +1,19 @@ +package cn.ysk.cashier.dto; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class QueryReceiveDto extends BaseQueryDto{ + @NotBlank(message = "优惠券id 不可为空") + private String couponId; + //用户昵称 手机号 模糊 + private String value; + //状态 0 未使用 1 已使用 + private Integer status; + + private Integer page = 1; + + private Integer size = 10; +} diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopCouponMapper.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopCouponMapper.java index b56eae0d..8f67d9d4 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopCouponMapper.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbShopCouponMapper.java @@ -1,7 +1,15 @@ package cn.ysk.cashier.mybatis.mapper; +import cn.ysk.cashier.dto.QueryReceiveDto; +import cn.ysk.cashier.pojo.shop.TbFullShopId; +import cn.ysk.cashier.vo.QueryReceiveVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.ysk.cashier.mybatis.entity.TbShopCoupon; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 优惠券(TbShopCoupon)表数据库访问层 @@ -11,5 +19,34 @@ import cn.ysk.cashier.mybatis.entity.TbShopCoupon; */ public interface TbShopCouponMapper extends BaseMapper { + @Select("") + Page queryReceive(QueryReceiveDto param ,Page page); } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbShopCouponService.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbShopCouponService.java index e239be2d..a635fb40 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbShopCouponService.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/TbShopCouponService.java @@ -1,9 +1,12 @@ package cn.ysk.cashier.mybatis.service; import cn.ysk.cashier.dto.CouponDto; +import cn.ysk.cashier.dto.QueryReceiveDto; import cn.ysk.cashier.mybatis.entity.TbActivateOutRecord; import cn.ysk.cashier.mybatis.entity.TbCouponProduct; import cn.ysk.cashier.mybatis.vo.TbShopCouponVo; +import cn.ysk.cashier.vo.QueryReceiveVo; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import cn.ysk.cashier.mybatis.entity.TbShopCoupon; import cn.ysk.cashier.dto.TbShopCouponQueryCriteria; @@ -22,11 +25,12 @@ public interface TbShopCouponService extends IService { Map queryAll(TbShopCouponQueryCriteria criteria); - + Map queryReceive(QueryReceiveDto param); TbShopCoupon findById (Integer id); boolean update(TbShopCouponVo param); boolean delete(Integer[] ids); + boolean deleteReceive(Integer[] ids); ResponseEntity find(CouponDto param); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java index 7e9f0c9e..ce4b3b1a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/service/impl/TbShopCouponServiceImpl.java @@ -5,11 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUtil; import cn.ysk.cashier.dto.CouponDto; +import cn.ysk.cashier.dto.QueryReceiveDto; import cn.ysk.cashier.dto.TbShopCouponQueryCriteria; -import cn.ysk.cashier.mybatis.entity.TbActivateInRecord; -import cn.ysk.cashier.mybatis.entity.TbActivateOutRecord; -import cn.ysk.cashier.mybatis.entity.TbCouponProduct; -import cn.ysk.cashier.mybatis.entity.TbShopCoupon; +import cn.ysk.cashier.mybatis.entity.*; import cn.ysk.cashier.mybatis.mapper.TbActivateInRecordMapper; import cn.ysk.cashier.mybatis.mapper.TbActivateOutRecordMapper; import cn.ysk.cashier.mybatis.mapper.TbShopCouponMapper; @@ -27,6 +25,7 @@ import cn.ysk.cashier.repository.product.TbProductRepository; import cn.ysk.cashier.repository.shop.TbShopUserRepository; import cn.ysk.cashier.service.shop.TbShopUserService; import cn.ysk.cashier.utils.PageUtil; +import cn.ysk.cashier.vo.QueryReceiveVo; import cn.ysk.cashier.vo.TbUserCouponVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -86,6 +85,13 @@ public class TbShopCouponServiceImpl extends ServiceImpl queryReceive(QueryReceiveDto param) { + Page page = new Page<>(param.getPage(), param.getSize()); + Page ipage = tbShopCouponmapper.queryReceive(param, page); + return PageUtil.toPage(ipage.getRecords(), ipage.getTotal()); + } + @Override public TbShopCouponVo findById(Integer id) { TbShopCouponVo tbShopCouponVo = new TbShopCouponVo(); @@ -128,6 +134,12 @@ public class TbShopCouponServiceImpl extends ServiceImpl find(CouponDto param) { TbShopUser tbShopUser = shopUserRepository.selectByUserIdAndShopId(param.getUserId().toString(), param.getShopId().toString()); diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/vo/QueryReceiveVo.java b/eladmin-system/src/main/java/cn/ysk/cashier/vo/QueryReceiveVo.java new file mode 100644 index 00000000..8db77f94 --- /dev/null +++ b/eladmin-system/src/main/java/cn/ysk/cashier/vo/QueryReceiveVo.java @@ -0,0 +1,24 @@ +package cn.ysk.cashier.vo; + +import lombok.Data; + +import java.util.Date; + +@Data +public class QueryReceiveVo { + + private Integer id; + private Integer userId; + private String name; + private String phone; + private Date receiveTime; + private Date useTime; + private String num; + private String overNum; + private String source; + private String status; + + + + +}