初始化

ordermall/src/main/java/com/yxt/ordermall/OrdermallApplication.java

@@ -0,0 +1,24 @@
+package com.yxt.ordermall;
+
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @author dimengzhe
+ */
+@SpringBootApplication(scanBasePackages = {
+        "com.yxt.ordermall.config",
+        "com.yxt.common.base.config",
+        "com.yxt.ordermall"
+})
+// 启用自带定时任务
+@EnableScheduling
+@EnableFeignClients(basePackages = {})
+public class OrdermallApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(OrdermallApplication.class, args);
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/adminservice/AdminMallMapper.java

@@ -0,0 +1,20 @@
+package com.yxt.ordermall.adminservice;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.ordermall.apiadmin.vo.PmsBrandVo;
+import com.yxt.ordermall.apiadmin.vo.PmsProductCategoryVo;
+import com.yxt.ordermall.api.lpkgoods.LpkGoods;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@Mapper
+public interface AdminMallMapper extends BaseMapper<LpkGoods> {
+
+    @Select("select * from pms_brand ")
+    List<PmsBrandVo> listBrand();
+
+    @Select("select * from pms_product_category where parent_id=0 ")
+    List<PmsProductCategoryVo> listAllCategory();
+}

ordermall/src/main/java/com/yxt/ordermall/adminservice/AdminMallService.java

@@ -0,0 +1,22 @@
+package com.yxt.ordermall.adminservice;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yxt.ordermall.apiadmin.vo.PmsBrandVo;
+import com.yxt.ordermall.apiadmin.vo.PmsProductCategoryVo;
+import com.yxt.ordermall.api.lpkgoods.LpkGoods;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class AdminMallService extends ServiceImpl<AdminMallMapper, LpkGoods> {
+
+
+    public List<PmsBrandVo> listBrand() {
+        return baseMapper.listBrand();
+    }
+
+    public List<PmsProductCategoryVo> listAllCategory() {
+        return baseMapper.listAllCategory();
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBag.java

@@ -0,0 +1,35 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+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 wangpengfei
+ * @date 2023/11/21 15:06
+ */
+@ApiModel(value = "礼包信息", description = "礼包信息")
+@TableName("applet_giftbag")
+@Data
+public class AppletGiftBag {
+    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 isEnable;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date dateStart;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date dateEnd;
+    private String name;
+    private String price;
+    private String iconUrl;
+    private String isGrounding;
+    private String isRecommend;
+    private String preferentialPrice;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBagDetailVo.java

@@ -0,0 +1,26 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/6 15:39
+ */
+@Data
+public class AppletGiftBagDetailVo {
+    private String sid;
+    private String name;
+    private String dateStart;
+    private String dateEnd;
+    private String price;
+    private String iconUrl;
+    private String isEnable;
+    private String isGrounding;
+    private String isRecommend;
+    private String remark;
+    private String count;
+    private List<GiftBagGoods> goods = new ArrayList<>();
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBagDto.java

@@ -0,0 +1,30 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:13
+ */
+@ApiModel(value = "礼包信息 数据传输对象", description = "礼包信息 数据传输对象")
+@Data
+public class AppletGiftBagDto implements Dto {
+
+    private String sid;
+    private String remarks;
+    private String dateStart;
+    private String dateEnd;
+    private String name;
+    private String price;
+    private String iconUrl;
+    private String isGrounding;
+    private String isRecommend;
+    private String preferentialPrice;
+    //商品sid
+    private List<GiftBagGoods> goods = new ArrayList<>();
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBagInitVo.java

@@ -0,0 +1,27 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/22 11:15
+ */
+@Data
+public class AppletGiftBagInitVo implements Vo {
+    private String sid;
+    private String remarks;
+    private String dateStart;
+    private String dateEnd;
+    private String name;
+    private String price;
+    private String iconUrl;
+    private String isRecommend;
+    private String preferentialPrice;
+    //商品sid
+    private List<GiftBagGoods> goods = new ArrayList<>();
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBagQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:31
+ */
+@ApiModel(value = "礼包信息 查询条件", description = "礼包信息 查询条件")
+@Data
+public class AppletGiftBagQuery implements Query {
+    private String name;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/AppletGiftBagVo.java

@@ -0,0 +1,45 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.ordermall.api.newcomerrecorecord.NewcomerRecoRecordVo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.text.DecimalFormat;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:12
+ */
+@Data
+@ApiModel(value = "礼包信息 视图数据对象", description = "礼包信息 视图数据对象")
+@NoArgsConstructor
+public class AppletGiftBagVo implements Vo {
+    private String sid;
+    private String name;//
+    private String dateStart;
+    private String dateEnd;
+    private String price;//礼包总价格
+    private String prefPrice;//优惠价格
+    private String iconUrl;//图片
+    private String isEnable;
+    private String isGrounding;
+    private String isRecommend;//是否推荐  1 推荐 0 默认
+    private String remarks;
+    private String count;//
+    private String goodsSid;
+    private String weight="0";//重量
+    private List<GiftBagGoods> giftBagGoods;
+    private List<RecommendRecord> recordList;
+    private List<NewcomerRecoRecordVo> newcomerRecoRecordVos;
+
+    public String getPrice() {
+        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+        if(null==price){
+            price="0";
+        }
+        return price=decimalFormat.format(Double.valueOf(price));
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoods.java

@@ -0,0 +1,87 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import cn.hutool.core.util.NumberUtil;
+import cn.hutool.core.util.StrUtil;
+import lombok.Data;
+
+/**
+ * @author Administrator
+ * @description
+ * @date 2023/11/22 11:08
+ */
+@Data
+public class GiftBagGoods {
+    private String goodsSid;
+    private String goodsNumber = "0";//份数
+    private String name; //商品名
+    private String unitName; //单位
+    private String price; //商品单价
+    private String iconUrl;//图片
+    private String remark; //备注
+    private String weight; //每份的重量
+    private String jPrice; //每斤单价
+    private String specificationUnit; //规格单位
+    private String totalValue; //总价值
+    private String spec; //总价值
+    private String count="0"; //总价值
+    private String mefenPrice;
+
+//    public String getJPrice() {
+//
+//        if (StringUtils.isBlank(jPrice)) {
+//            jPrice = "0";
+//        }
+//        DecimalFormat decimalFormat = new DecimalFormat("#0.00");
+//        return decimalFormat.format(Double.valueOf(jPrice));
+//    }
+
+    public String getMefenPrice() {
+        double dj = 0.0;
+        if (StrUtil.isNotBlank(price)) {
+            try {
+                dj = Double.parseDouble(price);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        int js = 1;
+        if (StrUtil.isNotBlank(weight)) {
+            try {
+                js = Integer.parseInt(weight);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        double mfjg = dj * js;
+        return NumberUtil.decimalFormatMoney(mfjg);
+    }
+
+    public String getSubtotal() {
+        double dj = 0.0;
+        if (StrUtil.isNotBlank(price)) {
+            try {
+                dj = Double.parseDouble(price);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        int js = 1;
+        if (StrUtil.isNotBlank(weight)) {
+            try {
+                js = Integer.parseInt(weight);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        int fs = 1;
+        if (StrUtil.isNotBlank(goodsNumber)) {
+            try {
+                fs = Integer.parseInt(goodsNumber);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        double mfjg = dj * js * fs;
+        return NumberUtil.decimalFormatMoney(mfjg);
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GiftBagGoodss.java

@@ -0,0 +1,70 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import cn.hutool.core.util.StrUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/16 12:07
+ */
+@Data
+public class GiftBagGoodss {
+    private String goodsSid;
+    private String goodsNumber = "0";//份数
+    private String name; //商品名
+    private String unitName; //单位
+    private String price; //商品单价
+    private String iconUrl;//图片
+    private String remark; //备注
+    private String weight; //每份的重量
+    private String jPrice; //每斤单价
+    private String specificationUnit; //规格单位
+    private String prefPrice;//优惠价格
+    private String bagPrice;//礼包价格
+    private String totalValue; //总价值
+    private String spec; //总价值
+    private String count="0"; //总价值
+    private String mefenPrice="0";
+    private boolean showCart=false;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date periodValidity;
+    private String state="0";
+    private String remarks;
+
+
+
+
+    public String getSubtotal() {
+        double dj = 0.0;
+        if (StrUtil.isNotBlank(price)) {
+            try {
+                dj = Double.parseDouble(price);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        int js = 1;
+        if (StrUtil.isNotBlank(weight)) {
+            try {
+                js = Integer.parseInt(weight);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        int fs = 1;
+        if (StrUtil.isNotBlank(goodsNumber)) {
+            try {
+                fs = Integer.parseInt(goodsNumber);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        double mfjg = dj * js * fs;
+        int m=(int)mfjg;
+//        return NumberUtil.decimalFormatMoney(mfjg);
+        return String.valueOf(m);
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/GoodsV.java

@@ -0,0 +1,16 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/17 10:18
+ */
+@Data
+public class GoodsV {
+    private String weight;
+    private String price;
+    private List<GiftBagGoodss> giftBagGoodssList;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/MyGoodsVo.java

@@ -0,0 +1,28 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/18 8:50
+ */
+@Data
+public class MyGoodsVo {
+    private String goodsSid;
+    private String name; //商品名
+    private String goodsNumber ;//份数
+    private String residue ;//剩余
+    private String iconUrl;//图片
+    private String weight; //每份的重量
+    private String remark; //备注
+    private String type; //0 百姓菜窖  1 精品菜窖 2 企业菜窖
+    private String specificationUnit; //规格单位
+    private String unitName; //份
+    private String count="0";
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date periodValidity;
+    private String state="0";//商品过期状态  0未过期 1已过期
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbag/RecommendRecord.java

@@ -0,0 +1,12 @@
+package com.yxt.ordermall.api.appletgiftbag;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/11 9:29
+ */
+@Data
+public class RecommendRecord {
+    private String content;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbaggoods/AppletGiftBagGoods.java

@@ -0,0 +1,29 @@
+package com.yxt.ordermall.api.appletgiftbaggoods;
+
+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 wangpengfei
+ * @date 2023/11/21 15:06
+ */
+@ApiModel(value = "礼包包含商品信息", description = "礼包包含商品信息")
+@TableName("applet_giftbag_goods")
+@Data
+public class AppletGiftBagGoods {
+    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;
+    private String goodsSid;
+    private String goodsNumber;
+//    private String isGrounding;
+    private double price;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbaggoods/AppletGiftBagGoodsDto.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.appletgiftbaggoods;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:13
+ */
+@ApiModel(value = "礼包包含商品信息 数据传输对象", description = "礼包包含商品信息 数据传输对象")
+@Data
+public class AppletGiftBagGoodsDto implements Dto {
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbaggoods/AppletGiftBagGoodsQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.appletgiftbaggoods;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:31
+ */
+@ApiModel(value = "礼包包含商品信息 查询条件", description = "礼包包含商品信息 查询条件")
+@Data
+public class AppletGiftBagGoodsQuery implements Query {
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletgiftbaggoods/AppletGiftBagGoodsVo.java

@@ -0,0 +1,23 @@
+package com.yxt.ordermall.api.appletgiftbaggoods;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:12
+ */
+@Data
+@ApiModel(value = "礼包包含商品信息 视图数据对象", description = "礼包包含商品信息 视图数据对象")
+@NoArgsConstructor
+public class AppletGiftBagGoodsVo implements Vo {
+    private String goodsName;
+    private double goodsNumber;
+    private  String picUrl;
+    private String goodsSid;
+    private String price;
+    private String unitName;
+    private String remarks;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletnotice/AppletNotice.java

@@ -0,0 +1,34 @@
+package com.yxt.ordermall.api.appletnotice;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:10
+ */
+@Data
+public class AppletNotice {
+    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 isEnable;
+    private String title;
+    private String content;
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date endDate;
+    private String sort;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date releaseTime;//发布时间
+    private String publisher;//发布人
+    private String isShow;
+
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletnotice/AppletNoticeDto.java

@@ -0,0 +1,32 @@
+package com.yxt.ordermall.api.appletnotice;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class AppletNoticeDto implements Dto {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String title;//标题
+    private String content;//内容
+
+    private String startDate;//开始时间
+
+    private String endDate;//结束时间
+    private String sort;//排序
+
+    private String releaseTime;//发布时间
+    private String publisher;//发布人
+    private String isShow;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletnotice/AppletNoticeQuery.java

@@ -0,0 +1,16 @@
+package com.yxt.ordermall.api.appletnotice;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class AppletNoticeQuery implements Query {
+    private String startDate; //开始时间
+    private String endDate; //结束时间
+    private String countNumber; //总数
+    private String name;
+}

ordermall/src/main/java/com/yxt/ordermall/api/appletnotice/AppletNoticeVo.java

@@ -0,0 +1,32 @@
+package com.yxt.ordermall.api.appletnotice;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class AppletNoticeVo implements Vo {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String title;//标题
+    private String content;//内容
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;//开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;//结束时间
+    private String sort;//排序
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date releaseTime;//发布时间
+    private String publisher;//发布人
+    private String isShow;
+}

ordermall/src/main/java/com/yxt/ordermall/api/approvalrecords/ApprovalRecords.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.approvalrecords;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class ApprovalRecords {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/approvalrecords/ApprovalRecordsDto.java

@@ -0,0 +1,22 @@
+package com.yxt.ordermall.api.approvalrecords;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class ApprovalRecordsDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+}

ordermall/src/main/java/com/yxt/ordermall/api/approvalrecords/ApprovalRecordsQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.approvalrecords;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class ApprovalRecordsQuery implements Query {
+    private String shortName;
+    private String name;
+    private String reviewStatus;
+}

ordermall/src/main/java/com/yxt/ordermall/api/approvalrecords/ApprovalRecordsVo.java

@@ -0,0 +1,23 @@
+package com.yxt.ordermall.api.approvalrecords;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class ApprovalRecordsVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+    private String customerName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/cannotreservedictionary/CannotReserveDictionary.java

@@ -0,0 +1,26 @@
+package com.yxt.ordermall.api.cannotreservedictionary;
+
+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 wangpengfei
+ * @date 2023/11/21 15:06
+ */
+@ApiModel(value = "不能预约时间字典", description = "不能预约时间字典")
+@TableName("cannot_reserve_dictionary")
+@Data
+public class CannotReserveDictionary {
+    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 unavailableTime;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/cannotreservedictionary/CannotReserveDictionaryDto.java

@@ -0,0 +1,23 @@
+package com.yxt.ordermall.api.cannotreservedictionary;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:13
+ */
+@ApiModel(value = "不能预约时间字典 数据传输对象", description = "不能预约时间字典 数据传输对象")
+@Data
+public class CannotReserveDictionaryDto implements Dto {
+    private String id;
+    private String sid ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String unavailableTime;
+}

ordermall/src/main/java/com/yxt/ordermall/api/cannotreservedictionary/CannotReserveDictionaryQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.cannotreservedictionary;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:31
+ */
+@ApiModel(value = "不能预约时间字典 查询条件", description = "不能预约时间字典 查询条件")
+@Data
+public class CannotReserveDictionaryQuery implements Query {
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/cannotreservedictionary/CannotReserveDictionaryVo.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.cannotreservedictionary;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:12
+ */
+@Data
+@ApiModel(value = "不能预约时间字典 视图数据对象", description = "不能预约时间字典 视图数据对象")
+@NoArgsConstructor
+public class CannotReserveDictionaryVo implements Vo {
+    private String id;
+    private String sid ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String unavailableTime;
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerinvoice/CustomerInvoice.java

@@ -0,0 +1,40 @@
+package com.yxt.ordermall.api.customerinvoice;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoice {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+    private String email;
+
+
+
+
+
+
+
+
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerinvoice/CustomerInvoiceDto.java

@@ -0,0 +1,29 @@
+package com.yxt.ordermall.api.customerinvoice;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceDto implements Dto {
+    private  String sid;
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+    private String email;
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerinvoice/CustomerInvoiceQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.customerinvoice;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceQuery implements Query {
+    private String shortName;
+    private String name;
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerinvoice/CustomerInvoiceVo.java

@@ -0,0 +1,29 @@
+package com.yxt.ordermall.api.customerinvoice;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class CustomerInvoiceVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceTypeSid;//发票类型sid
+    private String invoiceType;//发票类型
+    private String headingType;//发票类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String isDefault;//是否默认 1 为默认
+    private String customerSid;
+    private String email;
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerstore/CustomerStore.java

@@ -0,0 +1,31 @@
+package com.yxt.ordermall.api.customerstore;
+
+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 wangpengfei
+ * @date 2023/11/21 15:06
+ */
+@ApiModel(value = "礼包包含商品信息", description = "礼包包含商品信息")
+@TableName("customer_store")
+@Data
+public class CustomerStore {
+    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 isEnable;
+    private String customerSid;
+    private String storeSid;
+//    private String isGrounding;
+    private String phone;
+    private String name;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerstore/CustomerStoreDto.java

@@ -0,0 +1,28 @@
+package com.yxt.ordermall.api.customerstore;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:13
+ */
+@ApiModel(value = "礼包包含商品信息 数据传输对象", description = "礼包包含商品信息 数据传输对象")
+@Data
+public class CustomerStoreDto implements Dto {
+    private String id;
+    private String sid ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String storeSid;
+    //    private String isGrounding;
+    private String phone;
+    private String name;
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerstore/CustomerStoreQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.customerstore;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:31
+ */
+@ApiModel(value = "礼包包含商品信息 查询条件", description = "礼包包含商品信息 查询条件")
+@Data
+public class CustomerStoreQuery implements Query {
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/customerstore/CustomerStoreVo.java

@@ -0,0 +1,36 @@
+package com.yxt.ordermall.api.customerstore;
+
+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;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/21 15:12
+ */
+@Data
+@ApiModel(value = "礼包包含商品信息 视图数据对象", description = "礼包包含商品信息 视图数据对象")
+@NoArgsConstructor
+public class CustomerStoreVo implements Vo {
+    private String id;
+    private String sid ;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String storeSid;
+    private String storeName;//提货点名称
+    private String businessHours;//营业时间
+    private String address;//地址
+    //    private String isGrounding;
+    private String phone;//电话
+    private String name;//姓名
+    private String start;
+    private String end;
+    private String reserveDate;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpAppletNewVo.java

@@ -0,0 +1,99 @@
+package com.yxt.ordermall.api.empcard;
+
+import cn.hutool.core.date.DateUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.ordermall.api.empcardgift.EmpCardGiftVo;
+import com.yxt.ordermall.api.lpkgiftcard.GoodsVo;
+import com.yxt.ordermall.api.lpkreserveorder.LpkReserveOrderCardVo;
+import com.yxt.ordermall.api.lpkstore.StoreSelect;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+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<GoodsVo> goodsVos;
+    private List<StoreSelect> select;
+    private String storeSid;//上次提货地点
+    private String addressName;
+    private String isReservation;//是否超过预约时间 0 否 1是
+    private boolean notRese=true; //是否能预约
+    private List<EmpCardGiftVo> empCardGiftVos;
+    private String value;
+    private String serialNumber;
+    private String giftCode;
+    private String giftCodeKey;
+    private String qrCode;
+    private List<LpkReserveOrderCardVo> 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;
+    }
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpAppletVo.java

@@ -0,0 +1,241 @@
+package com.yxt.ordermall.api.empcard;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.ordermall.api.empcardgift.EmpCardGiftVo;
+import com.yxt.ordermall.api.lpkgiftcard.GoodsVo;
+import com.yxt.ordermall.api.lpkreserveorder.LpkReserveOrderCardVo;
+import com.yxt.ordermall.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 2023/12/8 11:26
+ */
+@Data
+public class EmpAppletVo {
+    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<GoodsVo> goodsVos;
+    private List<StoreSelect> select;
+    private String storeSid;//上次提货地点
+    private String addressName;
+    private String isReservation;//是否超过预约时间 0 否 1是
+    private boolean notRese=true; //是否能预约
+    private List<EmpCardGiftVo> empCardGiftVos;
+    private String value;
+    private String serialNumber;
+    private String giftCode;
+    private String giftCodeKey;
+    private String qrCode;
+    private List<LpkReserveOrderCardVo> orderCardVoList;
+    private String isTransfer;
+
+    public String getStart() {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        LocalDate today = LocalDate.now(); // 获取今天的日期
+        LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
+        LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
+
+        ZoneId zoneId = ZoneId.systemDefault();
+        Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
+//        System.out.println(date);
+        //1>2 1 、1<2 -1 、1=2 0
+        int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
+        if(String.valueOf(k).equals("1")){
+            int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15"))));
+            if(String.valueOf(j).equals("1")){
+                start=sdf.format(DateUtil.offsetDay(new Date(),+2));
+            }else{
+//                start=sdf.format(DateUtil.offsetDay(new Date(),+2));
+                start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+2));
+            }
+
+        }else{
+            int j=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse("2024-01-15"))));
+            if(String.valueOf(j).equals("1")){
+                start=sdf.format(DateUtil.offsetDay(new Date(),+1));
+            }else{
+//                start=sdf.format(DateUtil.offsetDay(new Date(),+2));
+                start=sdf.format(DateUtil.offsetDay(DateUtil.parse("2024-01-15"),+1));
+            }
+//            start=sdf.format(DateUtil.offsetDay(new Date(),+1));
+        }
+
+        if(StringUtils.isNotBlank(dateEnd)){
+            int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
+            if(String.valueOf(i).equals("-1")){
+                long o=DateUtil.between(DateUtil.parse(start),DateUtil.parse(dateEnd), DateUnit.DAY);
+                if(o<10){
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),10));
+                }else{
+//                    end=sdf.format(DateUtil.parse(dateEnd));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
+                }
+            }else{
+                if(String.valueOf(k).equals("1")){
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2));
+                }else{
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),1));
+                }
+            }
+        }
+        reserveDate=start;
+        return start;
+    }
+    public String getName() {
+        name=name+code;
+        return name;
+    }
+
+    public String getTime() {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd");
+        if(StringUtils.isNotBlank(dateStart)){
+            if(StringUtils.isNotBlank(dateEnd)){
+                time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd));
+            }
+        }
+        return time;
+    }
+
+  /*  public boolean isShowBtn() {
+        if(states.equals("5")){
+            if(isReservation.equals("1")){
+                this.state="已完成";
+                showBtn=false;
+            }
+        }
+        return showBtn;
+    }*/
+    /*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{
+                state="待提货";
+                if(states.equals("2")){
+                    this.state="已绑定";
+
+                }else if(states.equals("3")){
+                    this.state="已完成";
+                    showBtn=false;
+                }
+            }
+        }else{
+            state="已绑定";
+            if(states.equals("2")){
+                this.state="已预约";
+            }
+        }
+        return state;
+    }*/
+  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;
+  }
+//    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{
+//                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;
+//    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCard.java

@@ -0,0 +1,38 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:10
+ */
+@Data
+public class EmpCard {
+    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 isEnable;
+    private String recordId;
+    private String recordSid;
+    private String giftbagSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private Date bindDate;
+    private String isReservation ;//是否超过预约时间 0 否 1是
+    private String isTransfer ;//是否转增 0 未转赠 1 转赠
+    private String isItInvalid ;//是否失效 0 有效   1失效   用于排序失效卡排后边
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCardDto.java

@@ -0,0 +1,35 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardDto implements Dto {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String recordId;
+    private String recordSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    private String grantDate;
+    private String customerSid;
+    private String customerMobile;
+
+    private String giftbagSid;
+    private String num;
+    private String cardArea;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCardExport.java

@@ -0,0 +1,23 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 11:29
+ */
+@Data
+public class EmpCardExport {
+    @ExportEntityMap(CnName = "企业卡二维码", EnName = "pic")
+    private String pic;
+    @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;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCardQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardQuery implements Query {
+    private String state;
+    private String noEnd;
+    private String noStart;
+
+    private String number;
+    private String sid;
+    private String customerSid;
+    private String serialNumber;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCardStatisticsExportVo.java

@@ -0,0 +1,58 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/22 14:11
+ */
+@Data
+public class EmpCardStatisticsExportVo {
+    @ColumnWidth(30)
+    @ExcelProperty(value = "卡号",index = 1)
+    private String code;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "序列号",index = 0)
+    private String serialNumber;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "发行时间",index = 2)
+    private String createTime;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "卡片种类",index = 2)
+//    private String cardType;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "发行人",index = 3)
+//    private String people;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "状态",index = 3)
+    private String stateValue;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "是否过期",index = 5)
+//    private String isExpire;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "是否作废",index = 6)
+//    private String isCancel;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "绑定id",index = 7)
+//    private String bind;
+    @ColumnWidth(20)
+    @ExcelProperty(value = "绑定时间",index = 4)
+    private String bindDate;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "提货卡商品",index = 9)
+//    private String goodsName;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "商品数量(份)",index = 10)
+//    private String goodsNumber;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "已提数量(份)",index = 11)
+//    private String receiveNumber;
+//    @ColumnWidth(20)
+//    @ExcelProperty(value = "未提数量(份)",index = 12)
+//    private String unclaimedNumber;
+    @ExcelIgnore
+    private String isEnable;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcard/EmpCardVo.java

@@ -0,0 +1,35 @@
+package com.yxt.ordermall.api.empcard;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String recordId;
+    private String recordSid;
+    private String giftbagSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    private String grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private double goodsNumber;
+    private String goodsSid;
+    private String cardType;
+    private String stateValue;
+    private String bindDate;
+
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardbuildrecord/EmpCardBuildRecord.java

@@ -0,0 +1,31 @@
+package com.yxt.ordermall.api.empcardbuildrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:10
+ */
+@Data
+public class EmpCardBuildRecord {
+    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 isEnable;
+    private String giftbagSid;
+
+    private String startNumber;
+    private String endNumber;
+    private String countNumber;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date buildDate;
+    private String cardArea;
+
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardbuildrecord/EmpCardBuildRecordDto.java

@@ -0,0 +1,30 @@
+package com.yxt.ordermall.api.empcardbuildrecord;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardBuildRecordDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String recordId;
+    private String recordSid;
+    private String giftbagSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    private String grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String Num;
+    private String cardArea;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardbuildrecord/EmpCardBuildRecordQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.empcardbuildrecord;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardBuildRecordQuery implements Query {
+    private String startDate; //开始时间
+    private String endDate; //结束时间
+    private String countNumber; //总数
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardbuildrecord/EmpCardBuildRecordVo.java

@@ -0,0 +1,19 @@
+package com.yxt.ordermall.api.empcardbuildrecord;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardBuildRecordVo implements Vo {
+    private String sid;
+    private String buildDate; //创建时间
+    private String countNumber; //总数
+    private String startNumber; //起始号
+    private String endNumber; //结束号
+    private String bagName;
+    private String grantCountNumber; //发放总数
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGift.java

@@ -0,0 +1,51 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 16:54
+ */
+@Data
+public class EmpCardGift {
+    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 isEnable;
+    private String empCardSid;
+    private String empCardSerialNumber;
+    private String empCardCode;
+    private String empCardCustomerSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String recordSid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bindDate;
+    private String isItInvalid;
+    private String isReservation;
+    private String isShare;
+    @TableField(exist = false)
+    private String goods;
+    private String cardType; //1企业卡  2 福礼卡  3提货卡
+    private String isTransfer; //是否转增 0 未转赠 1 转赠
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endDate; //结束日期
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startDate; //开始日期
+    private String isSenior;//是否是最高级的卡   1 是  2不是
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftDto.java

@@ -0,0 +1,43 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 16:58
+ */
+@Data
+public class EmpCardGiftDto implements Dto {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String empCardSid;
+    private String empCardSerialNumber;
+    private String empCardCode;
+    private String empCardCustomerSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String recordSid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bindDate;
+    private String isItInvalid;
+    private String iReservation;
+    private List<GoodsVo> goodsVoList;
+    private String count;
+    private String cardType;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftExport.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/27 10:34
+ */
+@Data
+public class EmpCardGiftExport {
+    @ExportEntityMap(CnName = "提货二维码", EnName = "pic")
+    private String pic;
+    @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;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftListQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/24 10:07
+ */
+@Data
+public class EmpCardGiftListQuery implements Query {
+    private String state;
+    private String noStart; //序列号开始
+    private String noEnd; //序列号结束
+    private String sid;
+    private String number;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftListVo.java

@@ -0,0 +1,8 @@
+package com.yxt.ordermall.api.empcardgift;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 17:09
+ */
+public class EmpCardGiftListVo {
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftQuery.java

@@ -0,0 +1,39 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 16:57
+ */
+@Data
+public class EmpCardGiftQuery implements Query {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String empCardSid;
+    private String empCardSerialNumber;
+    private String empCardCode;
+    private String empCardCustomerSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String recordSid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bindDate;
+    private String isItInvalid;
+    private String iReservation;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftStatisticsQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/2
+ **/
+@Data
+public class EmpCardGiftStatisticsQuery implements Query {
+    private static final long serialVersionUID = -8730985789870186066L;
+    @ApiModelProperty("卡券序列号")
+    private String serialNumber;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftStatisticsVo.java

@@ -0,0 +1,24 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/1/2
+ **/
+@Data
+public class EmpCardGiftStatisticsVo {
+
+    @ApiModelProperty("卡券序列号")
+    private String serialNumber;
+    @ApiModelProperty("提货编号")
+    private String code;
+    @ApiModelProperty("发行时间")
+    private String createTime;
+    @ApiModelProperty("卡券状态")
+    private String stateValue;
+    @ApiModelProperty("绑定时间")
+    private String bindDate;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftVo.java

@@ -0,0 +1,48 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 16:57
+ */
+@Data
+public class EmpCardGiftVo implements Vo {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String empCardSid;
+    private String empCardSerialNumber;
+    private String empCardCode;
+    private String empCardCustomerSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String recordSid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date bindDate;
+    private String isItInvalid;
+    private String iReservation;
+    private String isShare;
+    private double goodsNumber=0;
+    private String qrCode;
+    private String goods;
+    private String share;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date startDate;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date endDate;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpCardGiftWordVo.java

@@ -0,0 +1,17 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/6 15:49
+ */
+@Data
+public class EmpCardGiftWordVo {
+    private String qrCode;//二维码
+    private String bagName;//礼包名
+    private String serialNumber;//序列号
+    private String code;//卡号
+    private String codeKey;//密码
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpGiftAppletNVo.java

@@ -0,0 +1,100 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import cn.hutool.core.date.DateUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.ordermall.api.lpkreserveorder.LpkReserveOrderCardVo;
+import com.yxt.ordermall.api.lpkstore.StoreSelect;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+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<GoodsVo> goodsVos;
+    private List<StoreSelect> select;
+    private String storeSid;//上次提货地点
+    private String addressName;
+    private String isReservation;//是否超过预约时间 0 否 1是
+    private boolean notRese = true; //是否能预约
+    private List<LpkReserveOrderCardVo> orderCardVoList;
+    private List<EmpCardGift> 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;
+    }
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/EmpGiftAppletVo.java

@@ -0,0 +1,170 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.yxt.common.base.utils.StringUtils;
+import com.yxt.ordermall.api.lpkreserveorder.LpkReserveOrderCardVo;
+import com.yxt.ordermall.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 2023/12/11 17:14
+ */
+@Data
+public class EmpGiftAppletVo {
+
+    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<GoodsVo> goodsVos;
+    private List<StoreSelect> select;
+    private String storeSid;//上次提货地点
+    private String addressName;
+    private String isReservation;//是否超过预约时间 0 否 1是
+    private boolean notRese = true; //是否能预约
+    private List<LpkReserveOrderCardVo> orderCardVoList;
+    private List<EmpCardGift> empCardGifts;
+    private String value;
+    private String serialNumber;
+    private String isEnable;
+    private String isTransfer;//是否转增 0 未转赠 1 转赠
+    private String isSenior;//是否是最高级的卡   1 是  2不是
+
+
+
+    public String getStart() {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        SimpleDateFormat sdf1 =new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        LocalDate today = LocalDate.now(); // 获取今天的日期
+        LocalTime timeOfDay = LocalTime.of(15, 0); // 设置下午3点的小时数为15，分钟数为0
+        LocalDateTime dateAndTime = LocalDateTime.of(today, timeOfDay); // 将日期和时间合并成完整的日期时间对象
+
+        ZoneId zoneId = ZoneId.systemDefault();
+        Date date = Date.from(dateAndTime.atZone(zoneId).toInstant());
+//        System.out.println(date);
+        //1>2 1 、1<2 -1 、1=2 0
+        int k=DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(new Date())))).compareTo(DateUtil.parse(sdf1.format(DateUtil.parse(sdf1.format(date)))));
+        if(String.valueOf(k).equals("1")){
+            start=sdf.format(DateUtil.offsetDay(new Date(),+2));
+        }else{
+            start=sdf.format(DateUtil.offsetDay(new Date(),+1));
+        }
+
+        if(StringUtils.isNotBlank(dateEnd)){
+            int i=DateUtil.parse(sdf.format(DateUtil.parse(start))).compareTo(DateUtil.parse(sdf.format(DateUtil.parse(dateEnd))));
+            if(String.valueOf(i).equals("-1")){
+                long o=DateUtil.between(DateUtil.parse(start),DateUtil.parse(dateEnd), DateUnit.DAY);
+                if(o<10){
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),10));
+                }else{
+//                    end=sdf.format(DateUtil.parse(dateEnd));
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(start),4));
+                }
+            }else{
+                if(String.valueOf(k).equals("1")){
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),2));
+                }else{
+                    end=sdf.format(DateUtil.offsetDay(DateUtil.parse(dateEnd),1));
+                }
+            }
+        }
+        reserveDate=start;
+        return start;
+    }
+
+    public String getName() {
+        name=name+code;
+        return name;
+    }
+
+    public String getTime() {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy.MM.dd");
+        if(StringUtils.isNotBlank(dateStart)){
+            if(StringUtils.isNotBlank(dateEnd)){
+                time=sdf.format(DateUtil.parse(dateStart))+"~"+sdf.format(DateUtil.parse(dateEnd));
+            }
+        }
+        return time;
+    }
+
+    public boolean isShowBtn() {
+        if(states.equals("5")){
+            if(isReservation.equals("1")){
+                this.state="已完成";
+                showBtn=false;
+            }
+        }
+        return showBtn;
+    }
+
+    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;
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/GoodsVo.java

@@ -0,0 +1,21 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/22 15:35
+ */
+@Data
+public class GoodsVo {
+    private String goods;
+    private String pic;
+    private double num;
+    private double lNum;
+    private double select = 0;
+    private String goodsSid;
+    private double orderNum; //预约数量
+    private String price; //预约数量
+    private String unitName; //预约数量
+    private String remarks; //预约数量
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgift/SaveVegetableVo.java

@@ -0,0 +1,17 @@
+package com.yxt.ordermall.api.empcardgift;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/20 16:27
+ */
+@Data
+public class SaveVegetableVo {
+    private String goodsSid;
+    private String goodsName;
+    private String goodsNumber;
+    private String barndId;
+    private String cetegoryId;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgiftgoods/EmpCardGiftGoods.java

@@ -0,0 +1,26 @@
+package com.yxt.ordermall.api.empcardgiftgoods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:10
+ */
+@Data
+public class EmpCardGiftGoods {
+    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 empCardGiftSid;
+    private String goodsSid;
+    private String goodsNumber;
+
+
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgiftgoods/EmpCardGiftGoodsDto.java

@@ -0,0 +1,20 @@
+package com.yxt.ordermall.api.empcardgiftgoods;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGiftGoodsDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String empCardGiftSid;
+    private String goodsSid;
+    private double goodsNumber;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgiftgoods/EmpCardGiftGoodsQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.empcardgiftgoods;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGiftGoodsQuery implements Query {
+    private String empCardGiftSid;
+    private String goodsSid;
+    private String goodsNumber;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgiftgoods/EmpCardGiftGoodsVo.java

@@ -0,0 +1,27 @@
+package com.yxt.ordermall.api.empcardgiftgoods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGiftGoodsVo implements Vo {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String empCardGiftSid;
+    private String goodsSid;
+    private Integer goodsNumber;
+    private String name;
+    private String unitName;
+    private String picUrl;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgiftgoods/EmpCardGoodsVo.java

@@ -0,0 +1,20 @@
+package com.yxt.ordermall.api.empcardgiftgoods;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2024/1/9 11:42
+ */
+@Data
+public class EmpCardGoodsVo {
+    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;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgrantlog/EmpCardGrantLog.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.empcardgrantlog;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:10
+ */
+@Data
+public class EmpCardGrantLog {
+    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 empCardSid;
+    private String empCardCustomerSid;
+    private String serialNumber;
+    private String code;
+//    private String isShare;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgrantlog/EmpCardGrantLogDto.java

@@ -0,0 +1,30 @@
+package com.yxt.ordermall.api.empcardgrantlog;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGrantLogDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String recordId;
+    private String recordSid;
+    private String giftbagSid;
+    private String serialNumber;
+    private String code;
+    private String codeKey;
+    private String state;
+    private String grantName;
+    private String grantDate;
+    private String customerSid;
+    private String customerMobile;
+    private String Num;
+    private String cardArea;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgrantlog/EmpCardGrantLogQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.empcardgrantlog;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGrantLogQuery implements Query {
+    private String startDate; //开始时间
+    private String endDate; //结束时间
+    private String countNumber; //总数
+}

ordermall/src/main/java/com/yxt/ordermall/api/empcardgrantlog/EmpCardGrantLogVo.java

@@ -0,0 +1,30 @@
+package com.yxt.ordermall.api.empcardgrantlog;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.ordermall.api.empcardgift.GoodsVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/8 9:11
+ */
+@Data
+public class EmpCardGrantLogVo implements Vo {
+    private String sid;
+    private String buildDate; //创建时间
+    private String countNumber; //总数
+    private String startNumber; //起始号
+    private String endNumber; //结束号
+    private String bagName;
+    private String grantCountNumber; //发放总数
+    private List<GoodsVo> goodsVos;
+    private String cardSid;
+    private String goods;
+    private double goodsNumber=0;
+    private String goodsSid;
+    private String code;
+    private String codeKey;
+    private String remarks;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/EmpReserveOrder.java

@@ -0,0 +1,31 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:29
+ */
+@Data
+public class EmpReserveOrder {
+    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 reserveType;
+    private String cardSid;
+    private String cardCode;
+    private String isCustomer;
+    private String customerSid;
+    private String userName;
+    private String userPhone;
+    private String userAddress;
+    private String storeSid;
+    private String reserveDate;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/EmpReserveOrderCardVo.java

@@ -0,0 +1,47 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import cn.hutool.core.date.DateUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import com.yxt.ordermall.api.lpkgiftcard.GoodsVo;
+import lombok.Data;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/27 16:53
+ */
+@Data
+public class EmpReserveOrderCardVo implements Vo {
+    private String code; //卡号
+    private String sid;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
+    private Date reserveDate; //预约时间
+    private String store; //提货门店
+    private String storeSid; //提货门店
+    private String bagName; //礼包
+    private String cardSid; // 提货卡sid
+    private String orderSid; //预约订单sid
+    private String userName;
+    private String userPhone;
+    private String state;//提货状态
+    private List<GoodsVo> goodsVos;
+    private String goods;
+    private String serialNumber;
+
+    public String getState() {
+        SimpleDateFormat sdf =new SimpleDateFormat("yyyy-MM-dd");
+        int c= DateUtil.parse(sdf.format(reserveDate)).compareTo(DateUtil.parse(sdf.format(new Date())));
+        if(String.valueOf(c).equals("-1")){
+            this.state="已提货";
+        }else{
+            this.state="未提货";
+        }
+        return state;
+    }
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/EmpReserveOrderDto.java

@@ -0,0 +1,26 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.yxt.common.core.dto.Dto;
+import com.yxt.ordermall.api.empcardgift.GoodsVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:29
+ */
+@Data
+public class EmpReserveOrderDto implements Dto {
+    private String cardSid;//礼包卡sid
+    private String sid;
+    private String value;
+    private String storeSid;//发放点
+    private String customerSid;//客户sid
+    private String  reserveDate;//发放时间
+    private String  userName;//用户名
+    private String  userPhone;//用户联系方式
+    private List<GoodsVo> goodsVos;
+    private String orderSid;
+    private String addressName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/EmpReserveOrderQuery.java

@@ -0,0 +1,18 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:30
+ */
+@Data
+public class EmpReserveOrderQuery implements Query {
+    private String userName; //用户名
+    private String store; // 门店
+    private String startDate; //预约开始日期
+    private String endDate; // 预约结束日期
+    private String userSid;
+    private String storeSid;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/EmpReserveOrderVo.java

@@ -0,0 +1,29 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/27 15:11
+ */
+@Data
+public class EmpReserveOrderVo implements Vo {
+    private String sid; //预约订单sid
+    private String userName; //用户名
+    private String userPhone; //用户电话
+    private String store; //门店
+    private String storeSid; //门店
+    @JsonFormat(pattern = "yyyy-MM-dd ",timezone="GMT+8")
+    private Date reserveDate; //预约时间
+    private String bagName; //礼包
+    private String code; //卡号
+    private String goodsInfo;
+    private List<OrderGoodsVo> goodsVo = new ArrayList<>();
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/Goods.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 14:34
+ */
+@Data
+public class Goods {
+    private double goodsNumber;//数量
+    private String goodsSid;//商品sid
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/OrderGoodsVo.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/28 10:11
+ */
+@Data
+public class OrderGoodsVo implements Vo {
+    private int num;
+    private String goodName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/ReserveOrderExport.java

@@ -0,0 +1,28 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2023/11/28 10:26
+ */
+@Data
+public class ReserveOrderExport {
+    @ExportEntityMap(CnName = "预约时间", EnName = "reserveDate")
+    private String reserveDate;
+    @ExportEntityMap(CnName = "提货门店", EnName = "store")
+    private String store;
+    @ExportEntityMap(CnName = "姓名", EnName = "userName")
+    private String userName;
+    @ExportEntityMap(CnName = "联系方式", EnName = "userPhone")
+    private String userPhone;
+    @ExportEntityMap(CnName = "提货卡号", EnName = "code")
+    private String code;
+    @ExportEntityMap(CnName = "礼包名称", EnName = "bagName")
+    private String bagName;
+    @ExportEntityMap(CnName = "商品明细", EnName = "goodsInfo")
+    private String goodsInfo;
+    private String sid;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveorder/ReserveOrderExportByStore.java

@@ -0,0 +1,20 @@
+package com.yxt.ordermall.api.empreserveorder;
+
+import com.yxt.common.core.utils.ExportEntityMap;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/12/11 13:58
+ */
+@Data
+public class ReserveOrderExportByStore {
+    @ExportEntityMap(CnName = "预约时间", EnName = "reserveDate")
+    private String reserveDate;
+    @ExportEntityMap(CnName = "提货门店", EnName = "store")
+    private String store;
+    private String storeSid;
+    @ExportEntityMap(CnName = "商品明细", EnName = "goodsInfo")
+    private String goodsInfo;
+    private String sid;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveordergoods/EmpReserveOrderGoods.java

@@ -0,0 +1,26 @@
+package com.yxt.ordermall.api.empreserveordergoods;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:29
+ */
+@Data
+public class EmpReserveOrderGoods {
+    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 cardSid;
+    private String goodsSid;
+    private double goodsNumber;
+    private String num;
+    private String orderSid;
+    private String goodsName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveordergoods/EmpReserveOrderGoodsDto.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.empreserveordergoods;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:29
+ */
+@Data
+public class EmpReserveOrderGoodsDto {
+    private String cardSid;
+    private String goodsSid;
+    private String goodsNumber;
+}

ordermall/src/main/java/com/yxt/ordermall/api/empreserveordergoods/EmpReserveOrderGoodsQuery.java

@@ -0,0 +1,8 @@
+package com.yxt.ordermall.api.empreserveordergoods;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/23 10:30
+ */
+public class EmpReserveOrderGoodsQuery {
+}

ordermall/src/main/java/com/yxt/ordermall/api/enterprisecertification/EnterpriseCertification.java

@@ -0,0 +1,27 @@
+package com.yxt.ordermall.api.enterprisecertification;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class EnterpriseCertification {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String enterpriseName;
+    private String shippingAddress;
+    private String contacts;
+    private String telephone;
+    private String reviewStatus;
+    private String state;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/enterprisecertification/EnterpriseCertificationDto.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.enterprisecertification;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class EnterpriseCertificationDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String enterpriseName;//企业名称
+    private String shippingAddress;//地址
+    private String contacts;//联系人
+    private String telephone;//联系电话
+    private String reviewStatus;
+    private String state;
+    private String operator;
+}

ordermall/src/main/java/com/yxt/ordermall/api/enterprisecertification/EnterpriseCertificationQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.enterprisecertification;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class EnterpriseCertificationQuery implements Query {
+    private String shortName;
+    private String name;
+    private String reviewStatus;
+}

ordermall/src/main/java/com/yxt/ordermall/api/enterprisecertification/EnterpriseCertificationVo.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.enterprisecertification;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class EnterpriseCertificationVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String customerSid;
+    private String enterpriseName;
+    private String shippingAddress;
+    private String contacts;
+    private String telephone;
+    private String reviewStatus;
+    private String state;
+    private String customerName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoiceapprovalrecords/InvoiceApprovalRecords.java

@@ -0,0 +1,25 @@
+package com.yxt.ordermall.api.invoiceapprovalrecords;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecords {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoiceapprovalrecords/InvoiceApprovalRecordsDto.java

@@ -0,0 +1,22 @@
+package com.yxt.ordermall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsDto implements Dto {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoiceapprovalrecords/InvoiceApprovalRecordsQuery.java

@@ -0,0 +1,15 @@
+package com.yxt.ordermall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsQuery implements Query {
+    private String shortName;
+    private String name;
+    private String reviewStatus;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoiceapprovalrecords/InvoiceApprovalRecordsVo.java

@@ -0,0 +1,23 @@
+package com.yxt.ordermall.api.invoiceapprovalrecords;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceApprovalRecordsVo implements Vo {
+    private String id;
+    private String sid;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String orderSid;
+    private String approvalOpinions;//审核意见
+    private String operator;//操作人
+    private String operatorSid;//操作人sid
+    private String approvalStatus;//审核状态
+    private String customerName;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicerecords/InvoiceRecords.java

@@ -0,0 +1,34 @@
+package com.yxt.ordermall.api.invoicerecords;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceRecords {
+
+    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 isEnable;
+    private String invoiceType;//发票类型
+    private String headingType;//抬头类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String orderSid;//订单sid
+    private String state;
+    private String email;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicerecords/InvoiceRecordsDto.java

@@ -0,0 +1,32 @@
+package com.yxt.ordermall.api.invoicerecords;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceRecordsDto implements Dto {
+    private  String sid;
+    private String id;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceType;//发票类型
+    private String headingType;//抬头类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String orderSid;//订单sid
+    private String state;//2申请通过  3不通过
+    private String email;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicerecords/InvoiceRecordsQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.invoicerecords;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceRecordsQuery implements Query {
+    private String shortName;
+    private String name;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicerecords/InvoiceRecordsVo.java

@@ -0,0 +1,36 @@
+package com.yxt.ordermall.api.invoicerecords;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceRecordsVo implements Vo {
+    private String id;
+    private String sid;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createTime;
+    private String remarks;
+    private String isEnable;
+    private String invoiceType;//发票类型
+    private String headingType;//抬头类型
+    private String invoiceHeader;//发票抬头
+    private String dutyParagraph;//税号
+    private String bankOfDeposit;//开户行
+    private String bankAccount;//账号
+    private String enterpriseAddress;//企业地址
+    private String enterprisePhone;//企业电话
+    private String orderSid;//订单sid
+    private String totalTee;//金额
+    private String outTradeNo;//订单编号
+    private String nick;//昵称
+    private String mobile;//电话
+    private String state;
+    private String email;
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicetype/InvoiceType.java

@@ -0,0 +1,21 @@
+package com.yxt.ordermall.api.invoicetype;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceType {
+
+    private String id;
+    private String sid= UUID.randomUUID().toString();
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String name;
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicetype/InvoiceTypeDto.java

@@ -0,0 +1,19 @@
+package com.yxt.ordermall.api.invoicetype;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceTypeDto implements Dto {
+    private  String sid;
+    private String id;
+    private String createTime;
+    private String remarks;
+    private String isEnable;
+    private String name;//
+
+}

ordermall/src/main/java/com/yxt/ordermall/api/invoicetype/InvoiceTypeQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.ordermall.api.invoicetype;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/11/30 9:27
+ */
+@Data
+public class InvoiceTypeQuery implements Query {
+    private String shortName;
+    private String name;
+}