diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java index ee8d9e7b2..334453d24 100644 --- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java +++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopCouponController.java @@ -1,10 +1,13 @@ package com.czg.controller.admin; +import com.czg.account.dto.QueryReceiveDto; import com.czg.account.dto.ShopCouponDTO; import com.czg.account.service.ShopCouponService; +import com.czg.account.vo.CouponReceiveVo; import com.czg.annotation.SaAdminCheckPermission; import com.czg.resp.CzgResult; import com.czg.sa.StpKit; +import com.mybatisflex.core.paginate.Page; import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -57,4 +60,16 @@ public class ShopCouponController { couponDTO.setShopId(StpKit.USER.getShopId()); return CzgResult.success(couponService.edit(couponDTO)); } + + /** + * 店铺优惠券获取记录 + * 权限标识: coupon:delete + */ + @SaAdminCheckPermission("coupon:queryReceive") + @PostMapping("/queryReceive") + public CzgResult> queryReceive(@Validated @RequestBody QueryReceiveDto param) { + return CzgResult.success(couponService.queryReceive(param)); + } + + } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java new file mode 100644 index 000000000..fac0aebce --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java @@ -0,0 +1,27 @@ +package com.czg.account.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @author ww + */ +@Data +public class QueryReceiveDto { + @NotBlank(message = "优惠券id 不可为空") + private Long couponId; + @NotBlank(message = "店铺Id 不可为空") + private Long shopId; + //用户昵称 手机号 模糊 + private String value; + //状态 0未使用 1已使用 2已过期 + private Integer status; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime startTime; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime endTime; +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java index 2b6011939..0c77a38bf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java @@ -1,5 +1,8 @@ package com.czg.account.service; +import com.czg.account.dto.QueryReceiveDto; +import com.czg.account.vo.CouponReceiveVo; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import com.czg.account.entity.ShopActivateCouponRecord; @@ -11,4 +14,6 @@ import com.czg.account.entity.ShopActivateCouponRecord; */ public interface ShopActivateCouponRecordService extends IService { + + Page queryReceive(Page page, QueryReceiveDto param); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java index 817f4ddcc..aa660814a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopCouponService.java @@ -1,8 +1,11 @@ package com.czg.account.service; +import com.czg.account.dto.QueryReceiveDto; import com.czg.account.dto.ShopCouponDTO; import com.czg.account.entity.ShopActivateCouponRecord; import com.czg.account.entity.ShopCoupon; +import com.czg.account.vo.CouponReceiveVo; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.service.IService; import java.util.List; @@ -28,6 +31,8 @@ public interface ShopCouponService extends IService { Boolean edit(ShopCouponDTO couponDTO); + Page queryReceive(QueryReceiveDto param); + List find(Long shopUserId, Integer status); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/vo/CouponReceiveVo.java b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/CouponReceiveVo.java new file mode 100644 index 000000000..c409970f1 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/vo/CouponReceiveVo.java @@ -0,0 +1,50 @@ +package com.czg.account.vo; + +import lombok.Data; + +/** + * 券记录ID + * @author ww + */ +@Data +public class CouponReceiveVo { + /** + * 券记录ID + */ + private Integer id; + /** + * shopUserId + */ + private Integer userId; + /** + * 用户名称 + */ + private String name; + /** + * 用户手机号 + */ + private String phone; + /** + * 券领取时间 + */ + private String receiveTime; + /** + * 券使用时间 + */ + private String useTime; + /** + * 券来源 + */ + private String source; + /** + * 券状态 + * 未使用 0 + * 已使用 1 + * 已过期 2 + */ + private String status; + + + + +} diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java index e69ba7ec4..81a4a324b 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoAddDTO.java @@ -111,4 +111,11 @@ public class OrderInfoAddDTO implements Serializable { public String getDineMode() { return StrUtil.isBlank(dineMode) ? "dine-in" : dineMode; } + + public Integer getPlaceNum() { + if (placeNum == null || placeNum == 0) { + return 1; + } + return placeNum; + } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java index 0c137771b..80ceac23d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopActivateCouponRecordMapper.java @@ -1,7 +1,10 @@ package com.czg.service.account.mapper; +import com.czg.account.dto.QueryReceiveDto; +import com.czg.account.vo.CouponReceiveVo; import com.mybatisflex.core.BaseMapper; import com.czg.account.entity.ShopActivateCouponRecord; +import com.mybatisflex.core.paginate.Page; /** * 活动商品赠送记录表 映射层。 @@ -11,4 +14,5 @@ import com.czg.account.entity.ShopActivateCouponRecord; */ public interface ShopActivateCouponRecordMapper extends BaseMapper { + Page queryReceive(Page page, QueryReceiveDto param); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java index 708850532..30fa6d6b9 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateCouponRecordServiceImpl.java @@ -1,8 +1,11 @@ package com.czg.service.account.service.impl; +import com.czg.account.dto.QueryReceiveDto; import com.czg.account.entity.ShopActivateCouponRecord; import com.czg.account.service.ShopActivateCouponRecordService; +import com.czg.account.vo.CouponReceiveVo; import com.czg.service.account.mapper.ShopActivateCouponRecordMapper; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; import org.apache.dubbo.config.annotation.DubboService; @@ -15,4 +18,8 @@ import org.apache.dubbo.config.annotation.DubboService; @DubboService public class ShopActivateCouponRecordServiceImpl extends ServiceImpl implements ShopActivateCouponRecordService{ + @Override + public Page queryReceive(Page page, QueryReceiveDto param) { + return getMapper().queryReceive(page, param); + } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java index 2a6b43538..bc98b642e 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopCouponServiceImpl.java @@ -1,15 +1,19 @@ package com.czg.service.account.service.impl; import cn.hutool.core.bean.BeanUtil; +import com.czg.account.dto.QueryReceiveDto; import com.czg.account.dto.ShopCouponDTO; import com.czg.account.entity.ShopActivateCouponRecord; import com.czg.account.entity.ShopCoupon; import com.czg.account.service.ShopActivateCouponRecordService; import com.czg.account.service.ShopCouponService; +import com.czg.account.vo.CouponReceiveVo; import com.czg.product.entity.Product; import com.czg.product.service.ProductService; import com.czg.sa.StpKit; import com.czg.service.account.mapper.ShopCouponMapper; +import com.czg.utils.PageUtil; +import com.mybatisflex.core.paginate.Page; import com.mybatisflex.spring.service.impl.ServiceImpl; import jakarta.annotation.Resource; import org.apache.dubbo.config.annotation.DubboReference; @@ -60,6 +64,11 @@ public class ShopCouponServiceImpl extends ServiceImpl queryReceive(QueryReceiveDto param) { + return couponRecordService.queryReceive(PageUtil.buildPage(), param); + } + @Override public List find(Long shopUserId, Integer status) { diff --git a/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml index fef85eae1..eecac3b3b 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml @@ -4,4 +4,34 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> +