From 2c76fe47ddef275115a99227e3e4749c7fec05ae Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 9 Jan 2024 16:48:23 +0800 Subject: [PATCH] 1/9 --- .../yxt/yyth/api/empcard/EmpAppletNewVo.java | 105 +++++++++++++++++ .../api/empcardgift/EmpGiftAppletNVo.java | 106 +++++++++++++++++ .../api/lpkgiftbaggoods/LpkGifGoodsVo.java | 6 +- .../yxt/yyth/api/lpkgiftcard/AppletNewVo.java | 108 ++++++++++++++++++ .../yxt/yyth/api/lpkgiftcard/AppletVo.java | 4 +- .../yxt/yyth/biz/empcard/EmpCardMapper.java | 1 + .../yxt/yyth/biz/empcard/EmpCardMapper.xml | 21 ++++ .../yxt/yyth/biz/empcard/EmpCardService.java | 39 +++++++ .../biz/empcardgift/EmpCardGiftMapper.java | 1 + .../biz/empcardgift/EmpCardGiftMapper.xml | 23 ++++ .../biz/empcardgift/EmpCardGiftService.java | 32 ++---- .../EmpCardGiftGoodsMapper.java | 2 +- .../EmpCardGiftGoodsService.java | 5 +- .../LpkGiftBagGoodsMapper.java | 10 ++ .../LpkGiftBagGoodsService.java | 4 +- .../biz/lpkgiftcard/LpkGiftCardMapper.java | 16 ++- .../biz/lpkgiftcard/LpkGiftCardService.java | 87 +++++--------- 17 files changed, 483 insertions(+), 87 deletions(-) create mode 100644 src/main/java/com/yxt/yyth/api/empcard/EmpAppletNewVo.java create mode 100644 src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletNVo.java create mode 100644 src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletNewVo.java diff --git a/src/main/java/com/yxt/yyth/api/empcard/EmpAppletNewVo.java b/src/main/java/com/yxt/yyth/api/empcard/EmpAppletNewVo.java new file mode 100644 index 0000000..c59032f --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/empcard/EmpAppletNewVo.java @@ -0,0 +1,105 @@ +package com.yxt.yyth.api.empcard; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.yyth.api.empcardgift.EmpCardGiftVo; +import com.yxt.yyth.api.lpkgiftcard.GoodsVo; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; +import com.yxt.yyth.api.lpkstore.StoreSelect; +import lombok.Data; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/1/9 15:26 + */ +@Data +public class EmpAppletNewVo { + private String dateStart; + private String dateEnd; + private String customerSid; + private String giftbagSid; + private String code; + private String sid ; + private String state; + private String states; + private boolean showBtn=true; + private boolean showRecord=true; + private String time; + private String name="卡号："; + private String pName; + private String start; + private String end; + private String store; //门店 + private String reserveDate; //预约时间 + private List goodsVos; + private List select; + private String storeSid;//上次提货地点 + private String addressName; + private String isReservation;//是否超过预约时间 0 否 1是 + private boolean notRese=true; //是否能预约 + private List empCardGiftVos; + private String value; + private String serialNumber; + private String giftCode; + private String giftCodeKey; + private String qrCode; + private List orderCardVoList; + private String isTransfer; + + + + + public String getState() { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + if(StringUtils.isNotBlank(dateEnd)){ + int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date()))); + if( String.valueOf(i).equals("-1")){ + state="已过期"; + showBtn=false; + }else if(isTransfer.equals("1")){ + state="已转赠"; + showBtn=false; + this.notRese=false; + } + else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + this.notRese=false; + }else{ + this.state="已完成"; + showBtn=false; + } + }else if(states.equals("4")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="待提货"; + } + } + } + }else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="已完成"; + showBtn=false; + } + } + } + return state; + } + +} diff --git a/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletNVo.java b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletNVo.java new file mode 100644 index 0000000..2a40f0c --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/empcardgift/EmpGiftAppletNVo.java @@ -0,0 +1,106 @@ +package com.yxt.yyth.api.empcardgift; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; +import com.yxt.yyth.api.lpkstore.StoreSelect; +import lombok.Data; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/1/9 15:29 + */ +@Data +public class EmpGiftAppletNVo { + private String dateStart; + private String dateEnd; + private String customerSid; + private String giftbagSid; + private String code; + private String sid; + private String state; + private String states; + private boolean showBtn = true; + private boolean showRecord = true; + private String time; + private String name = "卡号："; + private String pName; + private String start; + private String end; + private String store; //门店 + private String reserveDate; //预约时间 + private List goodsVos; + private List select; + private String storeSid;//上次提货地点 + private String addressName; + private String isReservation;//是否超过预约时间 0 否 1是 + private boolean notRese = true; //是否能预约 + private List orderCardVoList; + private List empCardGifts; + private String value; + private String serialNumber; + private String isEnable; + private String isTransfer;//是否转增 0 未转赠 1 转赠 + + + + + + public String getState() { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + if(StringUtils.isNotBlank(dateEnd)){ + int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date()))); + if( String.valueOf(i).equals("-1")){ + state="已过期"; + showBtn=false; + }else if(isEnable.equals("2")){ + state="已作废"; + showBtn=false; + } + else if(isTransfer.equals("1")){ + state="已转赠"; + showBtn=false; + this.notRese=false; + } + else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + this.notRese=false; + }else{ + this.state="已完成"; + showBtn=false; + } + }else if(states.equals("4")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="待提货"; + } + } + } + }else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="已完成"; + showBtn=false; + } + } + } + return state; + } + +} diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java index 2820ada..9ac993a 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftbaggoods/LpkGifGoodsVo.java @@ -8,13 +8,13 @@ import lombok.Data; */ @Data public class LpkGifGoodsVo { - private String goodsName; + private String goodsName;//商品名 private String goodsSid; private double goodsNumber; private double residue; private String unitName; private String specificationUnit; private String weight; - private String remarks; - private String content; + private String remarks; //5斤每份 + private String content;//剩余 } diff --git a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletNewVo.java b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletNewVo.java new file mode 100644 index 0000000..1dab077 --- /dev/null +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletNewVo.java @@ -0,0 +1,108 @@ +package com.yxt.yyth.api.lpkgiftcard; + +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.yxt.common.base.utils.StringUtils; +import com.yxt.yyth.api.empcardgift.EmpCardGift; +import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo; +import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; +import com.yxt.yyth.api.lpkstore.StoreSelect; +import lombok.Data; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.util.Date; +import java.util.List; + +/** + * @author wangpengfei + * @date 2024/1/9 15:24 + */ +@Data +public class AppletNewVo { + private String dateStart; + private String dateEnd; + private String customerSid; + private String giftbagSid; + private String code; + private String sid ; + private String state; + private String states; + private boolean showBtn=true; + private boolean showRecord=true; + private String time; + private String name="窖号："; + private String pName; + private String start; + private String end; + private String store; //门店 + private String reserveDate; //预约时间 + private List goodsVos; + private List select; + private String storeSid;//上次提货地点 + private String addressName; + private String isReservation;//是否超过预约时间 0 否 1是 + private boolean notRese=true; //是否能预约 + private List orderCardVoList; + private List empCardGifts; + private String value; + private String serialNumber; + private String goods; + private String isEnable; + private String isTransfer;//是否转增 0 未转赠 1 转赠 + private String type;//是否转增 1亲情卡 2家庭 3 企业 + private String logo;//查询标识 1亲情卡 2家庭 3 企业 + private List list; + + + public String getState() { + SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); + if(StringUtils.isNotBlank(dateEnd)){ + int i=DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))).compareTo(DateUtil.parse(sdf.format(DateUtil.date()))); + if( String.valueOf(i).equals("-1")){ + state="已过期"; + showBtn=false; + }else if(isEnable.equals("2")){ + state="已作废"; + showBtn=false; + } + else if(isTransfer.equals("1")){ + state="已转赠"; + showBtn=false; + this.notRese=false; + } + else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + this.notRese=false; + }else{ + this.state="已完成"; + showBtn=false; + } + }else if(states.equals("4")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="待提货"; + } + } + } + }else{ + state="待提货"; + if(states.equals("5")){ + if(isReservation.equals("0")){ + this.state="已预约"; + }else{ + this.state="已完成"; + showBtn=false; + } + } + } + return state; + } +} 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 8d97de6..b7fe6eb 100644 --- a/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java +++ b/src/main/java/com/yxt/yyth/api/lpkgiftcard/AppletVo.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import com.yxt.common.base.utils.StringUtils; import com.yxt.yyth.api.empcardgift.EmpCardGift; import com.yxt.yyth.api.empcardgift.EmpCardGiftVo; +import com.yxt.yyth.api.lpkgiftbaggoods.LpkGifGoodsVo; import com.yxt.yyth.api.lpkreserveorder.LpkReserveOrderCardVo; import com.yxt.yyth.api.lpkstore.StoreSelect; import lombok.Data; @@ -34,7 +35,7 @@ public class AppletVo { private boolean showBtn=true; private boolean showRecord=true; private String time; - private String name="卡号："; + private String name="窖号："; private String pName; private String start; private String end; @@ -55,6 +56,7 @@ public class AppletVo { private String isTransfer;//是否转增 0 未转赠 1 转赠 private String type;//是否转增 1亲情卡 2家庭 3 企业 private String logo;//查询标识 1亲情卡 2家庭 3 企业 + private List list; public String getStart() { SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd"); diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java index a0bdd9d..6611e1b 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.java @@ -24,6 +24,7 @@ public interface EmpCardMapper extends BaseMapper { IPage recordDetails(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); EmpAppletVo getEmpCardBySid(@Param("sid") String sid); + EmpAppletNewVo getEmpCardsBySid(@Param("sid") String sid); List exportExcel(@Param(Constants.WRAPPER) QueryWrapper qw); @Select("select count(id) from emp_card where recordSid=#{recordSid} and grantRecordSid is not null") diff --git a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml index fb60147..6a73f18 100644 --- a/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml +++ b/src/main/java/com/yxt/yyth/biz/empcard/EmpCardMapper.xml @@ -103,6 +103,27 @@ LEFT JOIN lpk_giftbag bag ON card.giftbagSid = bag.sid where card.sid = #{sid} + +