From 322042dcb444f07897e1e2bb996b64e7848b0435 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 24 Nov 2023 16:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LpkCardBuildRecord.java | 33 +++++++++++++ .../LpkCardBuildRecordDto.java | 12 +++++ .../LpkCardBuildRecordQuery.java | 15 ++++++ .../LpkCardBuildRecordVo.java | 23 +++++++++ .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java | 2 +- .../LpkCardBuildRecordMapper.java | 23 +++++++++ .../LpkCardBuildRecordMapper.xml | 20 ++++++++ .../LpkCardBuildRecordRest.java | 34 +++++++++++++ .../LpkCardBuildRecordService.java | 49 +++++++++++++++++++ .../biz/lpkgiftcard/LpkGiftCardService.java | 23 +++++++++ 10 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordDto.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordQuery.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java new file mode 100644 index 0000000..fd46513 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecord.java @@ -0,0 +1,33 @@ +package com.yxt.yyth.api.lpkcardbuildrecord; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + +/** + * @author Fan + * @description + * @date 2023/11/24 16:03 + */ +@Data +@ApiModel(value = "礼品卡生成记录表", description = "礼品卡生成记录表") +@TableName("lpk_card_build_record") +public class LpkCardBuildRecord { + + private String id; + private String sid = UUID.randomUUID().toString(); + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + private String remarks; + private String giftbagSid; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date buildDate; + private String countNumber; + private String startNumber; + private String endNumber; + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordDto.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordDto.java new file mode 100644 index 0000000..aada8e5 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordDto.java @@ -0,0 +1,12 @@ +package com.yxt.yyth.api.lpkcardbuildrecord; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + + +@ApiModel(value = "礼品卡生成记录表 数据传输对象", description = "礼品卡生成记录表 数据传输对象") +@Data +public class LpkCardBuildRecordDto implements Dto { + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordQuery.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordQuery.java new file mode 100644 index 0000000..7fca03d --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordQuery.java @@ -0,0 +1,15 @@ +package com.yxt.yyth.api.lpkcardbuildrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + + +@ApiModel(value = "礼品卡生成记录表 查询条件", description = "礼品卡生成记录表 查询条件") +@Data +public class LpkCardBuildRecordQuery implements Query { + + private String startDate; //开始时间 + private String endDate; //结束时间 + private String countNumber; //总数 +} diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java new file mode 100644 index 0000000..e485139 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java @@ -0,0 +1,23 @@ +package com.yxt.yyth.api.lpkcardbuildrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; +import java.util.UUID; + + +@Data +@ApiModel(value = "礼品卡生成记录表 视图数据对象", description = "礼品卡生成记录表 视图数据对象") +@NoArgsConstructor +public class LpkCardBuildRecordVo implements Vo { + + private String sid; + private String buildDate; //创建时间 + private String countNumber; //总数 + private String startNumber; //起始号 + private String endNumber; //结束号 +} diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java index 1ab2b58..e263d2c 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java @@ -32,6 +32,6 @@ public class LpkGiftCard { private Date grantDate; private String customerMobile; private String customerSid; - + private String recordSid; } diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.java new file mode 100644 index 0000000..51963a4 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.java @@ -0,0 +1,23 @@ +package com.yxt.yyth.biz.lpkcardbuildrecord; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo; +import com.yxt.yyth.api.lpkcustomer.LpkCustomer; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Mapper +public interface LpkCardBuildRecordMapper extends BaseMapper { + + IPage recordListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml new file mode 100644 index 0000000..709cca6 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java new file mode 100644 index 0000000..7de6019 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordRest.java @@ -0,0 +1,34 @@ +package com.yxt.yyth.biz.lpkcardbuildrecord; + +import cn.hutool.core.util.IdUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ + +@Api(tags = "礼品卡生成记录") +@RestController +@RequestMapping("lpkcardbuildrecord") +public class LpkCardBuildRecordRest { + + @Autowired + LpkCardBuildRecordService lpkCardBuildRecordService; + + @ApiOperation("创建记录列表") + @PostMapping("/recordListPage") + public ResultBean> recordListPage(@RequestBody PagerQuery pq) { + return lpkCardBuildRecordService.recordListPage(pq); + } + +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java new file mode 100644 index 0000000..b4c2c0a --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java @@ -0,0 +1,49 @@ +package com.yxt.yyth.biz.lpkcardbuildrecord; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordQuery; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo; +import com.yxt.yyth.api.lpkcustomer.LpkCustomer; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerQuery; +import com.yxt.yyth.api.lpkcustomer.LpkCustomerVo; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Service +public class LpkCardBuildRecordService extends MybatisBaseService { + + + public ResultBean> recordListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkCardBuildRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1", "1"); + if (StringUtils.isNotBlank(query.getCountNumber())) { + qw.eq("countNumber", query.getCountNumber()); + } + String startDate = query.getStartDate(); + String effEndTime = query.getEndDate(); + qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"). + apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')" + ); + qw.orderByDesc("createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.recordListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java index ec7960d..be763e0 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -13,6 +13,7 @@ import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; import com.yxt.yyth.api.lpkgoods.LpkGoods; @@ -20,6 +21,7 @@ import com.yxt.yyth.api.lpkgoods.LpkGoodsQuery; import com.yxt.yyth.api.lpkgoods.LpkGoodsVo; import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods; import com.yxt.yyth.api.lpkstore.StoreSelect; +import com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordService; import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yyth.biz.lpkstore.LpkStoreService; @@ -27,6 +29,7 @@ import org.bouncycastle.math.Primes; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.awt.image.BufferedImage; import java.io.File; @@ -51,6 +54,8 @@ public class LpkGiftCardService extends MybatisBaseService