diff --git a/docs/tester/1千张卡印制/定版/定版20231201/1-提货卡明细列表(白菜券).xls b/docs/tester/1千张卡印制/定版/定版20231201/1-提货卡明细列表(白菜券).xls new file mode 100644 index 0000000..fe5ac0b Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/1-提货卡明细列表(白菜券).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/2-提货卡明细列表(土豆券).xls b/docs/tester/1千张卡印制/定版/定版20231201/2-提货卡明细列表(土豆券).xls new file mode 100644 index 0000000..83ff591 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/2-提货卡明细列表(土豆券).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/3-提货卡明细列表(大葱券).xls b/docs/tester/1千张卡印制/定版/定版20231201/3-提货卡明细列表(大葱券).xls new file mode 100644 index 0000000..6f49636 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/3-提货卡明细列表(大葱券).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/4-提货卡明细列表(沙窝萝卜).xls b/docs/tester/1千张卡印制/定版/定版20231201/4-提货卡明细列表(沙窝萝卜).xls new file mode 100644 index 0000000..978f0e1 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/4-提货卡明细列表(沙窝萝卜).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/5-提货卡明细列表(包尖白菜).xls b/docs/tester/1千张卡印制/定版/定版20231201/5-提货卡明细列表(包尖白菜).xls new file mode 100644 index 0000000..8cbc4f2 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/5-提货卡明细列表(包尖白菜).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/6-提货卡明细列表(红薯粉条).xls b/docs/tester/1千张卡印制/定版/定版20231201/6-提货卡明细列表(红薯粉条).xls new file mode 100644 index 0000000..e1c27d6 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/6-提货卡明细列表(红薯粉条).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/7-提货卡明细列表(红薯).xls b/docs/tester/1千张卡印制/定版/定版20231201/7-提货卡明细列表(红薯).xls new file mode 100644 index 0000000..daf21f0 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/7-提货卡明细列表(红薯).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/8-提货卡明细列表(泥坑藕).xls b/docs/tester/1千张卡印制/定版/定版20231201/8-提货卡明细列表(泥坑藕).xls new file mode 100644 index 0000000..5d54961 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/8-提货卡明细列表(泥坑藕).xls differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/其余七款背面.jpg b/docs/tester/1千张卡印制/定版/定版20231201/其余七款背面.jpg new file mode 100644 index 0000000..e8c6ce6 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/其余七款背面.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/包尖白菜.jpg b/docs/tester/1千张卡印制/定版/定版20231201/包尖白菜.jpg new file mode 100644 index 0000000..a1715b0 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/包尖白菜.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/土豆.jpg b/docs/tester/1千张卡印制/定版/定版20231201/土豆.jpg new file mode 100644 index 0000000..7c934e1 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/土豆.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/大葱.jpg b/docs/tester/1千张卡印制/定版/定版20231201/大葱.jpg new file mode 100644 index 0000000..67b5acd Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/大葱.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/大葱背面.jpg b/docs/tester/1千张卡印制/定版/定版20231201/大葱背面.jpg new file mode 100644 index 0000000..e2b7411 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/大葱背面.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/沙窝萝卜.jpg b/docs/tester/1千张卡印制/定版/定版20231201/沙窝萝卜.jpg new file mode 100644 index 0000000..9de4e4b Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/沙窝萝卜.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/泥坑藕.jpg b/docs/tester/1千张卡印制/定版/定版20231201/泥坑藕.jpg new file mode 100644 index 0000000..a78c45e Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/泥坑藕.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/白菜.jpg b/docs/tester/1千张卡印制/定版/定版20231201/白菜.jpg new file mode 100644 index 0000000..f8352da Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/白菜.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/红薯.jpg b/docs/tester/1千张卡印制/定版/定版20231201/红薯.jpg new file mode 100644 index 0000000..433c21c Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/红薯.jpg differ diff --git a/docs/tester/1千张卡印制/定版/定版20231201/红薯粉条.jpg b/docs/tester/1千张卡印制/定版/定版20231201/红薯粉条.jpg new file mode 100644 index 0000000..2ca3174 Binary files /dev/null and b/docs/tester/1千张卡印制/定版/定版20231201/红薯粉条.jpg differ diff --git a/docs/xiugai/20231201/2023-11-30_修改方案.doc b/docs/xiugai/20231201/2023-11-30_修改方案.doc new file mode 100644 index 0000000..b3fe6dd --- /dev/null +++ b/docs/xiugai/20231201/2023-11-30_修改方案.doc @@ -0,0 +1,49 @@ + + +[pic] + 货物提完之后 ，卡片状态改变，变灰。不可点击 +[pic] +礼包————》云菜窖 +绑定卡接口 返回————》该卡已绑定 +[pic] +礼包————》云菜窖 +卡列表列表--倒序 +礼包详情----》详情 +日历控件 只显示本月日期 +预约提货 提货人员---提货人 提示语也修改 + 手机号码 --- 联系电话 +无数据时 显示无数据状态 或者图片 + +# 预约提货系统 +> # 小程序端 +## 1. 预约时选择提货点 +- 提货点要在新页面中以列表显示 +- 提货点列表显示提货点名称、位置、联系电话、营业时间 +- 提货点列表可以排序 +- 提货点列表可搜索查询 +- 如果当前用户有过预约，将上次预约时选择的提货点默认带入提货点，允许重新选择 + +## 2. 商品信息 +- 在提货卡详情页面，显示的商品列表要有规格（如：一份30斤） +- 在提货卡详情页面，点击商品在新页面展示商品详情 +## 3. 预约时间选择 +- 预约时间选择默认显示最早可提货时间所在月份 +- 样式优化 +## 4. 绑卡的验证 +- 已经过期的卡不可以绑卡，提示该卡已过期 +- 已经失效的卡点击进入后，显示该卡的提货记录 +- 卡券列表排序，有效的卡往前排，时间最近的往前排 +## 5. 提货记录 +- 未提货的往前排，时间最近的往前排 +> # 管理后台与接口 +## 1. 提货点信息 +- 完善提货点信息 +- 与小程序端协调接口 +## 2. 商品信息 +- 完善商品信息 +- 与小程序端协调接口 +## 3. 绑卡的验证 +- 与小程序端绑卡验证规则统一 +- 绑卡的流程进行前后端测试，保证逻辑正确 +## 4. 提货记录 +- 与小程序端协调接口 diff --git a/docs/xiugai/20231201/小程序页面截图 .doc b/docs/xiugai/20231201/小程序页面截图 .doc new file mode 100644 index 0000000..6b68578 --- /dev/null +++ b/docs/xiugai/20231201/小程序页面截图 .doc @@ -0,0 +1,23 @@ + +礼包首页面 + [pic] +绑定云菜窖卡 + [pic] +预约提货 + [pic] +礼包卡详情 + [pic] +本卡预约记录 + [pic] +总预约记录 + + [pic] + + +商品详情 + 基本只有一个图 + 其他都是文字字段 + 商品名称 单位 单价 备注 +提货点列表 没有详情图 只有文字字段 + 提货点名称 联系人 联系电话 营业时间 地址 + [pic] diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java index c6973fb..53794a9 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/LpkGiftCardExport.java @@ -12,11 +12,14 @@ import lombok.Data; public class LpkGiftCardExport { @ExportEntityMap(CnName = "提货二维码", EnName = "pic") private String pic; - @ExportEntityMap(CnName = "提货编码", EnName = "code") - private String code; + @ExportEntityMap(CnName = "提货编码第一行", EnName = "code1") + private String code1; + @ExportEntityMap(CnName = "提货编码第二行", EnName = "code2") + private String code2; @ExportEntityMap(CnName = "提货密码", EnName = "codeKey") private String codeKey; @ExportEntityMap(CnName = "序列号", EnName = "serialNumber") private String serialNumber; + private String code; } 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 3796c3c..d9a4250 100644 --- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java +++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java @@ -83,14 +83,14 @@ public class LpkGiftCardService extends MybatisBaseService().eq("code", bindCardDto.getCode()) .eq("codeKey", bindCardDto.getCodeKey())); - AppletVo vo=baseMapper.getGifCardBySid(lpkGiftCard.getSid()); + AppletVo vo = baseMapper.getGifCardBySid(lpkGiftCard.getSid()); if (null == lpkGiftCard) { return rb.setMsg("请核对卡号和密钥"); } - if(vo.getState().equals("失效")){ + if (vo.getState().equals("失效")) { return rb.setMsg("该卡已过期"); } - if(StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())){ + if (StringUtils.isNotBlank(lpkGiftCard.getCustomerSid())) { return rb.setMsg("该卡已绑定"); } lpkGiftCard.setCustomerSid(bindCardDto.getCustomerSid()); @@ -114,18 +114,20 @@ 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"); + ResultBean rb = new ResultBean(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + List lpkGiftBags = 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); @@ -207,8 +209,11 @@ public class LpkGiftCardService extends MybatisBaseService serialNumbers=new ArrayList<>(); - if(start>end){ - for (int i=0;end<=start;end++){ + ResultBean rb = new ResultBean().fail(); + int start = Integer.parseInt(dto.getStart()); + int end = Integer.parseInt(dto.getEnd()); + List 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){ + 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++){ + } 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){ + 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(); + 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); + 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); + + public ResultBean cardGrantCount(String recordSid) { + ResultBean rb = new ResultBean().fail(); + Integer i = baseMapper.cardGrantCount(recordSid); return rb.success().setData(i); } }