From 949f1bf347b9f214662a2a9a39de4023de34bb5f Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 1 Dec 2023 12:29:22 +0800 Subject: [PATCH] 12/1 --- .../com/yxt/yyth/api/lpkbank/LpkBank.java | 25 ++++++ .../com/yxt/yyth/api/lpkbank/LpkBankDto.java | 24 +++++ .../yxt/yyth/api/lpkbank/LpkBankQuery.java | 14 +++ .../com/yxt/yyth/api/lpkbank/LpkBankVo.java | 22 +++++ .../LpkCardBuildRecordVo.java | 1 + .../LpkCardGrantRecord.java | 32 +++++++ .../LpkCardGrantRecordDto.java | 26 ++++++ .../LpkCardGrantRecordQuery.java | 15 ++++ .../LpkCardGrantRecordVo.java | 20 +++++ .../lpkgiftbaggoods/LpkGiftBagGoodsVo.java | 3 + .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 1 + .../yyth/api/lpkgiftcard/CardGrantDto.java | 15 ++++ .../com/yxt/yyth/api/lpkgiftcard/GoodsVo.java | 3 + .../yxt/yyth/api/lpkgiftcard/LpkGiftCard.java | 2 + .../api/lpkgiftcard/LpkGiftCardListVo.java | 3 + .../lpkreserveorder/LpkReserveOrderVo.java | 1 + .../yxt/yyth/biz/lpkbank/LpkBankMapper.java | 29 ++++++ .../yxt/yyth/biz/lpkbank/LpkBankMapper.xml | 16 ++++ .../com/yxt/yyth/biz/lpkbank/LpkBankRest.java | 62 +++++++++++++ .../yxt/yyth/biz/lpkbank/LpkBankService.java | 74 +++++++++++++++ .../LpkCardBuildRecordService.java | 3 + .../LpkCardGrantRecordMapper.java | 20 +++++ .../LpkCardGrantRecordMapper.xml | 20 +++++ .../LpkCardGrantRecordRest.java | 41 +++++++++ .../LpkCardGrantRecordService.java | 58 ++++++++++++ .../biz/lpkgiftbag/LpkGiftBagService.java | 1 + .../LpkGiftBagGoodsMapper.java | 2 +- .../biz/lpkgiftcard/LpkGiftCardMapper.java | 5 ++ .../biz/lpkgiftcard/LpkGiftCardMapper.xml | 38 +++++--- .../yyth/biz/lpkgiftcard/LpkGiftCardRest.java | 5 ++ .../biz/lpkgiftcard/LpkGiftCardService.java | 89 ++++++++++++++++++- .../LpkReserveOrderMapper.java | 3 + .../LpkReserveOrderService.java | 8 ++ .../LpkReserveOrderGoodsService.java | 2 +- 34 files changed, 664 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/lpkbank/LpkBank.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkbank/LpkBankDto.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkbank/LpkBankQuery.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkbank/LpkBankVo.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecord.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordDto.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordQuery.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordVo.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkgiftcard/CardGrantDto.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.xml create mode 100644 src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankRest.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankService.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.xml create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordRest.java create mode 100644 src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordService.java diff --git a/src/main/java/com/yxt/yyth/api/lpkbank/LpkBank.java b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBank.java new file mode 100644 index 0000000..197d438 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBank.java @@ -0,0 +1,25 @@ +package com.yxt.yyth.api.lpkbank; + +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class LpkBank { + + private String id; + private String sid= UUID.randomUUID().toString(); + private String createTime; + private String remarks; + private String isEnable; + private String name; + private String shortName; + private String linker; + private String linkPhone; + private String address; + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankDto.java b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankDto.java new file mode 100644 index 0000000..796e37e --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankDto.java @@ -0,0 +1,24 @@ +package com.yxt.yyth.api.lpkbank; + +import com.yxt.common.core.dto.Dto; +import lombok.Data; + +import java.util.UUID; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class LpkBankDto implements Dto { + private String sid; + private String id; + private String createTime; + private String remarks; + private String isEnable; + private String name;//姓名 + private String shortName;//简称 + private String linker;//联系人 + private String linkPhone;//联系电话 + private String address;//地址 +} diff --git a/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankQuery.java b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankQuery.java new file mode 100644 index 0000000..87eb2a5 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankQuery.java @@ -0,0 +1,14 @@ +package com.yxt.yyth.api.lpkbank; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class LpkBankQuery implements Query { + private String shortName; + private String name; +} diff --git a/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankVo.java b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankVo.java new file mode 100644 index 0000000..64b5537 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkbank/LpkBankVo.java @@ -0,0 +1,22 @@ +package com.yxt.yyth.api.lpkbank; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 9:27 + */ +@Data +public class LpkBankVo implements Vo { + private String id; + private String sid; + private String createTime; + private String remarks; + private String isEnable; + private String name; + private String shortName; + private String linker; + private String linkPhone; + private String address; +} diff --git a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java index 30a20a4..bc40eff 100644 --- a/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkcardbuildrecord/LpkCardBuildRecordVo.java @@ -21,4 +21,5 @@ public class LpkCardBuildRecordVo implements Vo { private String startNumber; //起始号 private String endNumber; //结束号 private String bagName; + private String grantCountNumber; //发放总数 } diff --git a/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecord.java b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecord.java new file mode 100644 index 0000000..b1664af --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecord.java @@ -0,0 +1,32 @@ +package com.yxt.yyth.api.lpkcardgrantrecord; + +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_grant_record") +public class LpkCardGrantRecord { + + 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 giftcardSid; + @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/lpkcardgrantrecord/LpkCardGrantRecordDto.java b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordDto.java new file mode 100644 index 0000000..8cdbe65 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordDto.java @@ -0,0 +1,26 @@ +package com.yxt.yyth.api.lpkcardgrantrecord; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import lombok.Data; + +import java.util.Date; +import java.util.UUID; + + +@ApiModel(value = "礼品卡生成记录表 数据传输对象", description = "礼品卡生成记录表 数据传输对象") +@Data +public class LpkCardGrantRecordDto implements Dto { + 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; + @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/lpkcardgrantrecord/LpkCardGrantRecordQuery.java b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordQuery.java new file mode 100644 index 0000000..f44d34e --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordQuery.java @@ -0,0 +1,15 @@ +package com.yxt.yyth.api.lpkcardgrantrecord; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import lombok.Data; + + +@ApiModel(value = "礼品卡生成记录表 查询条件", description = "礼品卡生成记录表 查询条件") +@Data +public class LpkCardGrantRecordQuery implements Query { + + private String startDate; //开始时间 + private String endDate; //结束时间 + private String countNumber; //总数 +} diff --git a/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordVo.java b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordVo.java new file mode 100644 index 0000000..c93916f --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkcardgrantrecord/LpkCardGrantRecordVo.java @@ -0,0 +1,20 @@ +package com.yxt.yyth.api.lpkcardgrantrecord; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.NoArgsConstructor; + + +@Data +@ApiModel(value = "礼品卡生成记录表 视图数据对象", description = "礼品卡生成记录表 视图数据对象") +@NoArgsConstructor +public class LpkCardGrantRecordVo implements Vo { + + private String sid; + private String buildDate; //创建时间 + private String countNumber; //总数 + private String startNumber; //起始号 + private String endNumber; //结束号 + private String bagName; +} diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java index 02f1e82..e268dd6 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGiftBagGoodsVo.java @@ -17,4 +17,7 @@ public class LpkGiftBagGoodsVo implements Vo { private double goodsNumber; private String picUrl; private String goodsSid; + private String price; + private String unitName; + private String remarks; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java index d2f8b2a..3238a1a 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -34,6 +34,7 @@ public class AppletVo { private String reserveDate; //预约时间 private List goodsVos; private List select; + private String storeSid;//上次提货地点 public String getStart() { diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/CardGrantDto.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/CardGrantDto.java new file mode 100644 index 0000000..8b266d9 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/CardGrantDto.java @@ -0,0 +1,15 @@ +package com.yxt.yyth.api.lpkgiftcard; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2023/11/30 13:50 + */ +@Data +public class CardGrantDto { + private String start;//开始序列号 + private String end;//结束序列号 + private String bankSid;//网点sid + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java index ada7d45..dab006e 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/GoodsVo.java @@ -16,4 +16,7 @@ public class GoodsVo { private double select = 0; private String goodsSid; private double orderNum; //预约数量 + private String price; //预约数量 + private String unitName; //预约数量 + private String remarks; //预约数量 } 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 c96d07f..af2313c 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCard.java @@ -34,4 +34,6 @@ public class LpkGiftCard { private String customerSid; private String recordSid; private String recordId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date bingDate; } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java index 22547a9..9a99fcc 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardListVo.java @@ -27,4 +27,7 @@ public class LpkGiftCardListVo implements Vo { private String customerSid; private String bagName; private String recordId; + private String name; + private String buildDate; + private String countNumber; } diff --git a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java index 21226ba..acadc72 100644 --- a/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkreserveorder/LpkReserveOrderVo.java @@ -17,6 +17,7 @@ public class LpkReserveOrderVo implements Vo { private String userName; //用户名 private String userPhone; //用户电话 private String store; //门店 + private String storeSid; //门店 private String reserveDate; //预约时间 private String bagName; //礼包 private String code; //卡号 diff --git a/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.java b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.java new file mode 100644 index 0000000..5688259 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.java @@ -0,0 +1,29 @@ +package com.yxt.yyth.biz.lpkbank; + +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.lpkbank.LpkBank; +import com.yxt.yyth.api.lpkbank.LpkBankVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Mapper +public interface LpkBankMapper extends BaseMapper { + + IPage ListPageVo(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + @Select("select * from lpk_bank") + List listAll(); + + @Select("select * from lpk_bank where sid=#{sid}") + LpkBankVo getLpkBankBySid( @Param("sid") String sid); + +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.xml new file mode 100644 index 0000000..1f816d1 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankMapper.xml @@ -0,0 +1,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankRest.java b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankRest.java new file mode 100644 index 0000000..03cceca --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankRest.java @@ -0,0 +1,62 @@ +package com.yxt.yyth.biz.lpkbank; + +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.lpkbank.LpkBankDto; +import com.yxt.yyth.api.lpkbank.LpkBankQuery; +import com.yxt.yyth.api.lpkbank.LpkBankVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +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("lpkbank") +public class LpkBankRest { + + @Autowired + LpkBankService lpkBankService; + + @ApiOperation("分页列表") + @PostMapping("/listPage") + public ResultBean> ListPageVo(@RequestBody PagerQuery pq) { + return lpkBankService.ListPageVo(pq); + } + @ApiOperation("全部网点") + @GetMapping("/listAll") + public ResultBean listAll() { + return lpkBankService.listAll(); + } + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody LpkBankDto dto) { + return lpkBankService.save(dto); + } + @ApiOperation("修改") + @PostMapping("/update") + public ResultBean update(@RequestBody LpkBankDto dto) { + return lpkBankService.update(dto); + } + + @ApiOperation("根据sid查询") + @GetMapping("/getLpkBankBySid/{sid}") + public ResultBean getLpkBankBySid(@PathVariable String sid){ + ResultBean rb = ResultBean.fireFail(); + LpkBankVo lpkBankVo=lpkBankService.getLpkBankBySid(sid); + return rb.success().setData(lpkBankVo); + } + @ApiOperation("删除") + @DeleteMapping("/delete/{sid}") + public ResultBean delete(@PathVariable String sid) { + return lpkBankService.delete(sid); + } + + +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankService.java b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankService.java new file mode 100644 index 0000000..512a5d7 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkbank/LpkBankService.java @@ -0,0 +1,74 @@ +package com.yxt.yyth.biz.lpkbank; + +import cn.hutool.core.bean.BeanUtil; +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.lpkbank.LpkBank; +import com.yxt.yyth.api.lpkbank.LpkBankDto; +import com.yxt.yyth.api.lpkbank.LpkBankQuery; +import com.yxt.yyth.api.lpkbank.LpkBankVo; +import com.yxt.yyth.api.lpkcardbuildrecord.LpkCardBuildRecord; +import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Service +public class LpkBankService extends MybatisBaseService { + + + public ResultBean> ListPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkBankQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("name", query.getName()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.ListPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + public ResultBean listAll() { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.listAll(); + return rb.success().setData(pagging); + } + + public ResultBean save(LpkBankDto dto) { + ResultBean rb = ResultBean.fireFail(); + LpkBank entity=new LpkBank(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + return rb.success().setMsg("添加成功"); + } + public ResultBean update(LpkBankDto dto) { + ResultBean rb=new ResultBean(); + String dtoSid = dto.getSid(); + LpkBank entity=fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + return rb.success().setMsg("修改成功"); + } + public LpkBankVo getLpkBankBySid(String sid){ + return baseMapper.getLpkBankBySid(sid); + } + public ResultBean delete(String sid) { + ResultBean rb=new ResultBean(); + baseMapper.delete(new QueryWrapper().eq("sid",sid)); + return rb.success().setMsg("删除成功"); + } + + +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java index 08a1816..317df76 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkcardbuildrecord/LpkCardBuildRecordService.java @@ -50,6 +50,9 @@ public class LpkCardBuildRecordService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.recordListPage(page, qw); + for(LpkCardBuildRecordVo vo:pagging.getRecords()){ + vo.setGrantCountNumber(String.valueOf(lpkGiftCardService.cardGrantCount(vo.getSid()).getData())); + } PagerVo p = PagerUtil.pageToVo(pagging, null); return rb.success().setData(p); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.java b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.java new file mode 100644 index 0000000..07bfc26 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.java @@ -0,0 +1,20 @@ +package com.yxt.yyth.biz.lpkcardgrantrecord; + +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.lpkcardgrantrecord.LpkCardGrantRecord; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordVo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Mapper +public interface LpkCardGrantRecordMapper extends BaseMapper { + + IPage recordListPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.xml new file mode 100644 index 0000000..8936a23 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordMapper.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordRest.java b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordRest.java new file mode 100644 index 0000000..3ceca61 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordRest.java @@ -0,0 +1,41 @@ +package com.yxt.yyth.biz.lpkcardgrantrecord; + +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.lpkcardgrantrecord.LpkCardGrantRecordDto; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordQuery; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ + +@Api(tags = "礼品卡发放记录") +@RestController +@RequestMapping("lpkcardgrantrecord") +public class LpkCardGrantRecordRest { + + @Autowired + LpkCardGrantRecordService lpkCardGrantRecordService; + + @ApiOperation("发放记录列表") + @PostMapping("/recordListPage") + public ResultBean> recordListPage(@RequestBody PagerQuery pq) { + return lpkCardGrantRecordService.recordListPage(pq); + } + + @ApiOperation("保存") + @PostMapping("/save") + public ResultBean save(@RequestBody LpkCardGrantRecordDto dto) { + return lpkCardGrantRecordService.save(dto); + } +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordService.java b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordService.java new file mode 100644 index 0000000..dd10649 --- /dev/null +++ b/src/main/java/com/yxt/yyth/biz/lpkcardgrantrecord/LpkCardGrantRecordService.java @@ -0,0 +1,58 @@ +package com.yxt.yyth.biz.lpkcardgrantrecord; + +import cn.hutool.core.bean.BeanUtil; +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.lpkcardgrantrecord.LpkCardGrantRecord; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordDto; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordQuery; +import com.yxt.yyth.api.lpkcardgrantrecord.LpkCardGrantRecordVo; +import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author wangpengfei + * @date 2023/11/21 15:03 + */ +@Service +public class LpkCardGrantRecordService extends MybatisBaseService { + + @Autowired + private LpkGiftCardService lpkGiftCardService; + + public ResultBean> recordListPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + LpkCardGrantRecordQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("1", "1"); + if (StringUtils.isNotBlank(query.getCountNumber())) { + qw.eq("r.countNumber", query.getCountNumber()); + } +// String startDate = query.getStartDate(); +// String effEndTime = query.getEndDate(); +// qw.apply(org.apache.commons.lang3.StringUtils.isNotEmpty(startDate), "date_format (r.buildDate,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')"). +// apply(org.apache.commons.lang3.StringUtils.isNotEmpty(effEndTime), "date_format (r.buildDate,'%Y-%m-%d') <= date_format('" + effEndTime + "','%Y-%m-%d')" +// ); + qw.orderByDesc("r.createTime"); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.recordListPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return rb.success().setData(p); + } + public ResultBean save(LpkCardGrantRecordDto dto) { + ResultBean rb = ResultBean.fireFail(); + LpkCardGrantRecord entity=new LpkCardGrantRecord(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + String sid=entity.getSid(); + baseMapper.insert(entity); + return rb.success().setMsg(sid); + } + +} diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java index dffc814..0f30ee2 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbag/LpkGiftBagService.java @@ -177,4 +177,5 @@ public class LpkGiftBagService extends MybatisBaseService pagging = baseMapper.giftBagList(); return rb.success().setData(pagging); } + } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java index 6aecfcd..05c6496 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftbaggoods/LpkGiftBagGoodsMapper.java @@ -20,7 +20,7 @@ public interface LpkGiftBagGoodsMapper extends BaseMapper { int deleteGoodsByBagSid(@Param("sid") String sid); - @Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") + @Select("select goods.name as goodsName,bads.goodsNumber ,bads.goodsSid,goods.picUrl,goods.price,goods.unitName,goods.remarks from lpk_giftbag_goods bads left join lpk_goods goods on goods.sid =bads.goodsSid where bads.giftbagSid=#{sid}") List getGoodsByBagSid(String sid); List getRecordsByBagSid(@Param("sid") String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java index 78d9dca..e96c90d 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.java @@ -48,4 +48,9 @@ public interface LpkGiftCardMapper extends BaseMapper { IPage recordDetails(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List exportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + Integer updateState(@Param("serialNumbers") List serialNumbers ,@Param("state") String state,@Param("bankSid")String bankSid,@Param("recordSid")String recordSid); + @Select("select count(id) from lpk_giftcard where recordSid=#{recordSid} and grantRecordSid is not null") + Integer cardGrantCount(@Param("recordSid") String recordSid); + @Select("update lpk_giftcard set isItInvalid='1' where giftbagSid=#{giftbagSid} and state!=#{state} ") + Integer updateIsItInvalid(@Param("giftbagSid") String giftbagSid,@Param("state")String state); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml index 6520e79..2bb7929 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardMapper.xml @@ -23,6 +23,7 @@ ${ew.sqlSegment} + ORDER BY card.isItInvalid asc,card.bindDate desc - + + update lpk_giftcard set state=#{state}, bankSid=#{bankSid},grantRecordSid =#{recordSid} where serialNumber in + + #{item} + + \ No newline at end of file diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java index 23e8e57..69a1f04 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardRest.java @@ -80,5 +80,10 @@ public class LpkGiftCardRest { lpkGiftCardService.exportExcel(query); } + @ApiOperation(value = "礼包卡发放信息") + @PostMapping("/cardGrant") + public ResultBean cardGrant(@RequestBody CardGrantDto dto) { + return lpkGiftCardService.cardGrant(dto); + } } 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 d9d9bc3..afa02a4 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -17,15 +17,22 @@ 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.lpkcardgrantrecord.LpkCardGrantRecordDto; +import com.yxt.yyth.api.lpkgiftbag.LpkGiftBag; +import com.yxt.yyth.api.lpkgiftbag.LpkGiftBagVo; import com.yxt.yyth.api.lpkgiftbaggoods.LpkGiftBagGoodsVo; import com.yxt.yyth.api.lpkgiftcard.*; import com.yxt.yyth.api.lpkgoods.LpkGoods; import com.yxt.yyth.api.lpkgoods.LpkGoodsQuery; import com.yxt.yyth.api.lpkgoods.LpkGoodsVo; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderVo; 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.lpkcardgrantrecord.LpkCardGrantRecordService; +import com.yxt.yyth.biz.lpkgiftbag.LpkGiftBagService; import com.yxt.yyth.biz.lpkgiftcard.generateRule.UniqueIdGenerator; +import com.yxt.yyth.biz.lpkreserveorder.LpkReserveOrderService; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yyth.biz.lpkstore.LpkStoreService; import org.bouncycastle.math.Primes; @@ -64,16 +71,30 @@ public class LpkGiftCardService extends MybatisBaseService().eq("code", bindCardDto.getCode()) - .eq("codeKey", bindCardDto.getCodeKey()).eq("state", "2")); + .eq("codeKey", bindCardDto.getCodeKey())); + AppletVo vo=baseMapper.getGifCardBySid(lpkGiftCard.getSid()); if (null == lpkGiftCard) { return rb.setMsg("请核对卡号和密钥"); } + if(vo.getState().equals("失效")){ + return rb.setMsg("该卡已过期"); + } + if(StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())){ + return rb.setMsg("该卡已绑定"); + } lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid()); lpkGiftCard.setState("3"); + lpkGiftCard.setBingDate(new Date()); baseMapper.updateById(lpkGiftCard); return rb.success().setMsg("绑定成功"); } @@ -82,6 +103,7 @@ public class LpkGiftCardService extends MybatisBaseService qw = new QueryWrapper<>(); + updateIsItInvalid(); if (StringUtils.isNotBlank(query.getCustomerSid())) { qw.like("customerSid", query.getCustomerSid()); } @@ -91,7 +113,18 @@ public class LpkGiftCardService extends MybatisBaseServicelpkGiftBags=lpkGiftBagService.list(new QueryWrapper().lt("dateEnd",sdf.format(new Date()))); + for(LpkGiftBag lpkGiftBag:lpkGiftBags){ + Integer i=baseMapper.selectCount(new QueryWrapper().eq("giftbagSid",lpkGiftBag.getSid()).ne("state","5")); + if(i!=0){ + baseMapper.updateIsItInvalid(lpkGiftBag.getSid(),"5"); + } + } + return rb.success(); + } public ResultBean getGifCardBySid(String sid) { ResultBean rb = new ResultBean().fail(); AppletVo vo = baseMapper.getGifCardBySid(sid); @@ -103,6 +136,8 @@ public class LpkGiftCardService extends MybatisBaseService serialNumbers=new ArrayList<>(); + if(start>end){ + for (int i=0;end<=start;end++){ + serialNumbers.add(end); + } + Integer integer=baseMapper.selectCount(new QueryWrapper().in("serialNumber",serialNumbers).eq("state","2")); + if(integer!=0){ + return rb.setMsg("序列号错误"); + } + }else{ + for (int i=0;start<=end;start++){ + serialNumbers.add(start); + } + Integer integer=baseMapper.selectCount(new QueryWrapper().in("serialNumber",serialNumbers).eq("state","2")); + if(integer!=0){ + return rb.setMsg("序列号错误"); + } + } + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + LpkCardGrantRecordDto d=new LpkCardGrantRecordDto(); + d.setBuildDate(new Date()); + d.setEndNumber(dto.getEnd()); + d.setStartNumber(dto.getStart()); + d.setCountNumber(String.valueOf(serialNumbers.size())); + String r=lpkCardGrantRecordService.save(d).getMsg(); + baseMapper.updateState(serialNumbers,"2",dto.getBankSid(),r); + return rb.success().setData("成功"); + } + public ResultBean cardGrantCount(String recordSid) { + ResultBean rb=new ResultBean().fail(); + Integer i=baseMapper.cardGrantCount(recordSid); + return rb.success().setData(i); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java index 599769c..71dd42f 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderMapper.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.yyth.api.lpkreserveorder.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -23,4 +24,6 @@ public interface LpkReserveOrderMapper extends BaseMapper { IPage orderListByUserSid(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); List exportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); + @Select("select * from lpk_reserve_order where customerSid =#{sid} order by createTime desc limit 1") + LpkReserveOrderVo getStoreByCustomerSid(@Param("sid") String sid); } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java index 17efe8b..d79e056 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveorder/LpkReserveOrderService.java @@ -28,10 +28,13 @@ import com.yxt.yyth.biz.lpkgiftcard.LpkGiftCardMapper; import com.yxt.yyth.biz.lpkgoods.LpkGoodsService; import com.yxt.yyth.biz.lpkreserveordergoods.LpkReserveOrderGoodsService; import com.yxt.yyth.biz.lpkstore.LpkStoreService; +import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.list.AbstractLinkedList; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import javax.servlet.http.HttpServletResponse; import java.text.ParseException; @@ -258,4 +261,9 @@ public class LpkReserveOrderService extends MybatisBaseService getStoreByCustomerSid(String sid) { + return new ResultBean().success().setData(baseMapper.getStoreByCustomerSid(sid)); + } } diff --git a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java index ecc4eb4..d244c28 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkreserveordergoods/LpkReserveOrderGoodsService.java @@ -50,7 +50,7 @@ public class LpkReserveOrderGoodsService extends MybatisBaseService