礼品卡创建记录

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;
+
+}

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 {
+
+}

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; //总数
+}

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; //结束号
+}

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;
 
 }

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<LpkCardBuildRecord> {
+
+    IPage<LpkCardBuildRecordVo> recordListPage(IPage<LpkCardBuildRecord> page, @Param(Constants.WRAPPER) QueryWrapper<LpkCardBuildRecord> qw);
+}

src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.yyth.biz.lpkcardbuildrecord.LpkCardBuildRecordMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+
+
+    <select id="recordListPage" resultType="com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecordVo">
+        select
+        sid,
+        date_format(buildDate, '%Y-%m-%d') as buildDate,
+        countNumber,
+        startNumber,
+        endNumber
+        from lpk_card_build_record
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+</mapper>

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<PagerVo<LpkCardBuildRecordVo>> recordListPage(@RequestBody PagerQuery<LpkCardBuildRecordQuery> pq) {
+        return lpkCardBuildRecordService.recordListPage(pq);
+    }
+
+}

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<LpkCardBuildRecordMapper, LpkCardBuildRecord> {
+
+
+    public ResultBean<PagerVo<LpkCardBuildRecordVo>> recordListPage(PagerQuery<LpkCardBuildRecordQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        LpkCardBuildRecordQuery query = pq.getParams();
+        QueryWrapper<LpkCardBuildRecord> 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<LpkCardBuildRecord> page = PagerUtil.queryToPage(pq);
+        IPage<LpkCardBuildRecordVo> pagging = baseMapper.recordListPage(page, qw);
+        PagerVo<LpkCardBuildRecordVo> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+}

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<LpkGiftCardMapper, Lp
     LpkStoreService lpkStoreService;
     @Autowired
     private FileUploadComponent fileUploadComponent;
+    @Autowired
+    private LpkCardBuildRecordService lpkCardBuildRecordService;
 
     public ResultBean bindCard(BindCardDto bindCardDto) {
         ResultBean rb = new ResultBean().fail();
@@ -149,6 +154,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         return rb.success().setData(vo);
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public ResultBean generateCard(LpkGiftCardDto dto) {
         ResultBean rb = ResultBean.fireFail();
         if (StringUtils.isBlank(dto.getBagSid())) {
@@ -158,8 +164,16 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             return rb.setMsg("请输入生成卡片的数量");
         }
         int i = Integer.parseInt(dto.getNum());
+        LpkCardBuildRecord record = new LpkCardBuildRecord();
+        record.setCountNumber(dto.getNum());
+        record.setBuildDate(new DateTime());
+        record.setCreateTime(new DateTime());
+        record.setGiftbagSid(dto.getBagSid());
+        String startNum = "";
+        String endNum = "";
         for (int j = 0; j < i; j++) {
             LpkGiftCard card = new LpkGiftCard();
+            card.setRecordSid(record.getSid());
             card.setState("1");
             card.setCreateTime(new DateTime());
             card.setGiftbagSid(dto.getBagSid());
@@ -181,8 +195,17 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                 }
                 card.setSerialNumber(num);
             }
+            if (j == 0) {
+                startNum = card.getSerialNumber();
+            }
+            if (j == i - 1) {
+                endNum = card.getSerialNumber();
+            }
             baseMapper.insert(card);
         }
+        record.setStartNumber(startNum);
+        record.setEndNumber(endNum);
+        lpkCardBuildRecordService.insert(record);
         return rb.success();
     }