Merge branch 'test' into dev

# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
2024-08-27 11:02:42 +08:00
parent 5b95673507 1b1fe06844
commit 01da0ff8a5
53 changed files with 2994 additions and 188 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivate.java
@@ -1,7 +1,11 @@
 package com.chaozhanggui.system.cashierservice.entity;

+import org.springframework.util.CollectionUtils;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;

 public class TbActivate implements Serializable {
    private Integer id;
@@ -18,6 +22,10 @@ public class TbActivate implements Serializable {

    private String isDel;

+    //是否赠送商品 0否 1是
+    private Integer isGiftPro;
+    private List<String> gives;
+
    private static final long serialVersionUID = 1L;

    public Integer getId() {
@@ -75,4 +83,24 @@ public class TbActivate implements Serializable {
    public void setIsDel(String isDel) {
        this.isDel = isDel == null ? null : isDel.trim();
    }
+
+    public Integer getIsGiftPro() {
+        return isGiftPro;
+    }
+
+    public void setIsGiftPro(Integer isGiftPro) {
+        this.isGiftPro = isGiftPro;
+    }
+
+    public List<String> getGives() {
+        return gives;
+    }
+
+    public void setGives(List<String> gives) {
+        if(CollectionUtils.isEmpty(gives)){
+            this.gives = new ArrayList<>();
+        }else {
+            this.gives = gives;
+        }
+    }
 }
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateInRecord.java
@@ -0,0 +1,140 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 活动商品赠送表(TbActivateInRecord)实体类
+ *
+ * @author ww
+ * @since 2024-08-22 11:13:40
+ */
+public class TbActivateInRecord implements Serializable {
+    private static final long serialVersionUID = -35515830201618782L;
+
+    private Integer id;
+    /**
+     * 会员id
+     */
+    private Integer vipUserId;
+    /**
+     * 商品id
+     */
+    private Integer proId;
+    /**
+     * 赠送数量
+     */
+    private Integer num;
+    /**
+     * 未使用数量
+     */
+    private Integer overNum;
+    /**
+     * 店铺id
+     */
+    private Integer shopId;
+    /**
+     * 来源活动id
+     */
+    private Integer sourceActId;
+
+    private Integer sourceFlowId;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public TbActivateInRecord(Integer vipUserId, Integer proId, Integer num, Integer shopId, Integer sourceActId,Integer sourceFlowId) {
+        this.vipUserId = vipUserId;
+        this.proId = proId;
+        this.num = num;
+        this.overNum = num;
+        this.shopId = shopId;
+        this.sourceActId = sourceActId;
+        this.sourceFlowId = sourceFlowId;
+        this.createTime=new Date();
+    }
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getVipUserId() {
+        return vipUserId;
+    }
+
+    public void setVipUserId(Integer vipUserId) {
+        this.vipUserId = vipUserId;
+    }
+
+    public Integer getProId() {
+        return proId;
+    }
+
+    public void setProId(Integer proId) {
+        this.proId = proId;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public Integer getOverNum() {
+        return overNum;
+    }
+
+    public void setOverNum(Integer overNum) {
+        this.overNum = overNum;
+    }
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public Integer getSourceActId() {
+        return sourceActId;
+    }
+
+    public void setSourceActId(Integer sourceActId) {
+        this.sourceActId = sourceActId;
+    }
+
+    public Integer getSourceFlowId() {
+        return sourceFlowId;
+    }
+
+    public void setSourceFlowId(Integer sourceFlowId) {
+        this.sourceFlowId = sourceFlowId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}
+
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateOutRecord.java
@@ -0,0 +1,125 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 活动赠送商品使用记录表(TbActivateOutRecord)实体类
+ *
+ * @author ww
+ * @since 2024-08-22 11:21:56
+ */
+public class TbActivateOutRecord implements Serializable {
+    private static final long serialVersionUID = -54399746948905097L;
+
+    private Integer id;
+    /**
+     * 商品赠送Id
+     */
+    private Integer giveId;
+    /**
+     * 商品id
+     */
+    private Integer proId;
+    /**
+     * 使用数量
+     */
+    private Integer useNum;
+    /**
+     * 退单量
+     */
+    private Integer refNum;
+    /**
+     * 订单id
+     */
+    private String orderId;
+    //新建： create， 完成： closed, 取消：cancel,
+    private String status;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    public TbActivateOutRecord(Integer giveId, Integer proId, Integer useNum, String orderId, String status) {
+        this.giveId = giveId;
+        this.proId = proId;
+        this.useNum = useNum;
+        this.orderId = orderId;
+        this.status = status;
+        this.createTime = new Date();
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getGiveId() {
+        return giveId;
+    }
+
+    public void setGiveId(Integer giveId) {
+        this.giveId = giveId;
+    }
+
+    public Integer getProId() {
+        return proId;
+    }
+
+    public void setProId(Integer proId) {
+        this.proId = proId;
+    }
+
+    public Integer getUseNum() {
+        return useNum;
+    }
+
+    public void setUseNum(Integer useNum) {
+        this.useNum = useNum;
+    }
+
+    public Integer getRefNum() {
+        return refNum;
+    }
+
+    public void setRefNum(Integer refNum) {
+        this.refNum = refNum;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(String orderId) {
+        this.orderId = orderId;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}
+
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateProduct.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbActivateProduct.java
@@ -0,0 +1,83 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 活动赠送商品表(TbActivateProduct)实体类
+ *
+ * @author ww
+ * @since 2024-08-20 15:15:01
+ */
+public class TbActivateProduct implements Serializable {
+    private static final long serialVersionUID = 592370528166603965L;
+
+    private Integer id;
+/**
+     * 活动Id
+     */
+    private Integer activateId;
+/**
+     * 商品id
+     */
+    private Integer productId;
+/**
+     * 数量
+     */
+    private Integer num;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getActivateId() {
+        return activateId;
+    }
+
+    public void setActivateId(Integer activateId) {
+        this.activateId = activateId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}
+
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbCashierCart.java
@@ -58,6 +58,7 @@ public class TbCashierCart implements Serializable {
    private Long updatedAt;
    private Integer userId;
    private String tableId;
+    private Byte isVip;
    private TbProductSpec tbProductSpec;

    private static final long serialVersionUID = 1L;
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbConsInfo.java
@@ -0,0 +1,169 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TbConsInfo implements Serializable {
+    private Integer id;
+
+    private Integer shopId;
+
+    private Integer conTypeId;
+
+    private String conTypeName;
+
+    private String conCode;
+
+    private String conName;
+
+    private BigDecimal stockNumber;
+
+    private String conUnit;
+
+    private BigDecimal lasterInStock;
+
+    private BigDecimal conWarning;
+
+    private BigDecimal stockConsume;
+
+    private String status;
+
+    private BigDecimal price;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    private String isCheck;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public Integer getConTypeId() {
+        return conTypeId;
+    }
+
+    public void setConTypeId(Integer conTypeId) {
+        this.conTypeId = conTypeId;
+    }
+
+    public String getConTypeName() {
+        return conTypeName;
+    }
+
+    public void setConTypeName(String conTypeName) {
+        this.conTypeName = conTypeName == null ? null : conTypeName.trim();
+    }
+
+    public String getConCode() {
+        return conCode;
+    }
+
+    public void setConCode(String conCode) {
+        this.conCode = conCode == null ? null : conCode.trim();
+    }
+
+    public String getConName() {
+        return conName;
+    }
+
+    public void setConName(String conName) {
+        this.conName = conName == null ? null : conName.trim();
+    }
+
+    public BigDecimal getStockNumber() {
+        return stockNumber;
+    }
+
+    public void setStockNumber(BigDecimal stockNumber) {
+        this.stockNumber = stockNumber;
+    }
+
+    public String getConUnit() {
+        return conUnit;
+    }
+
+    public void setConUnit(String conUnit) {
+        this.conUnit = conUnit == null ? null : conUnit.trim();
+    }
+
+    public BigDecimal getLasterInStock() {
+        return lasterInStock;
+    }
+
+    public void setLasterInStock(BigDecimal lasterInStock) {
+        this.lasterInStock = lasterInStock;
+    }
+
+    public BigDecimal getConWarning() {
+        return conWarning;
+    }
+
+    public void setConWarning(BigDecimal conWarning) {
+        this.conWarning = conWarning;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public BigDecimal getStockConsume() {
+        return stockConsume;
+    }
+
+    public void setStockConsume(BigDecimal stockConsume) {
+        this.stockConsume = stockConsume;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public BigDecimal getPrice() {
+        return price;
+    }
+
+    public void setPrice(BigDecimal price) {
+        this.price = price;
+    }
+
+    public String getIsCheck() {
+        return isCheck;
+    }
+
+    public void setIsCheck(String isCheck) {
+        this.isCheck = isCheck;
+    }
+}
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderDetail.java
@@ -20,6 +20,8 @@ public class TbOrderDetail implements Serializable {

    private Integer num;

+    private Byte isVip;
+
    private String productName;
    private String status;

--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProskuCon.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbProskuCon.java
@@ -0,0 +1,89 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class TbProskuCon implements Serializable {
+    private Integer id;
+
+    private Integer shopId;
+
+    private Integer productId;
+
+    private Integer productSkuId;
+
+    private Integer conInfoId;
+
+    private BigDecimal surplusStock;
+
+    private String status;
+
+    private Date createTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public Integer getProductId() {
+        return productId;
+    }
+
+    public void setProductId(Integer productId) {
+        this.productId = productId;
+    }
+
+    public Integer getProductSkuId() {
+        return productSkuId;
+    }
+
+    public void setProductSkuId(Integer productSkuId) {
+        this.productSkuId = productSkuId;
+    }
+
+    public Integer getConInfoId() {
+        return conInfoId;
+    }
+
+    public void setConInfoId(Integer conInfoId) {
+        this.conInfoId = conInfoId;
+    }
+
+    public BigDecimal getSurplusStock() {
+        return surplusStock;
+    }
+
+    public void setSurplusStock(BigDecimal surplusStock) {
+        this.surplusStock = surplusStock;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status == null ? null : status.trim();
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+}
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopAd.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopAd.java
@@ -0,0 +1,63 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (TbShopAd)实体类
+ *
+ * @author GYJ
+ * @since 2024-08-19 14:25:09
+ */
+@Data
+public class TbShopAd implements Serializable {
+    private static final long serialVersionUID = -34028307481923067L;
+/**
+     * 自增id
+     */
+    private Integer id;
+/**
+     * 店铺id，如果是通用广告则为0
+     */
+    private Integer shopId;
+/**
+     * 广告图片地址
+     */
+    private String imgUrl;
+/**
+     * 跳转页面路径
+     */
+    private String linkPath;
+/**
+     * 广告展示圆角
+     */
+    private Integer borderRadius;
+/**
+     * 弹窗展示位置：home首页，make_order点餐页
+     */
+    private String showPosition;
+/**
+     * 显示频率：only_one 仅首次展示, every_show 每次打开都展示，every_day 每天展示一次，three_day 每三天展示一次， seven_day 每七天展示一次， thirty_day 没30天展示一次
+     */
+    private String frequency;
+/**
+     * 广告状态：0未启用，1已启用
+     */
+    private Integer status;
+/**
+     * 排序
+     */
+    private Integer sort;
+/**
+     * 创建时间
+     */
+    private Date createTime;
+/**
+     * 更新时间
+     */
+    private Date updateTime;
+
+}
+
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopExtend.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopExtend.java
@@ -0,0 +1,113 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 店铺扩展信息(TbShopExtend)实体类
+ *
+ * @author ww
+ * @since 2024-08-21 09:40:26
+ */
+public class TbShopExtend implements Serializable {
+    private static final long serialVersionUID = -25782280496188600L;
+    /**
+     * 自增id
+     */
+    private Integer id;
+    /**
+     * 商户Id
+     */
+    private Integer shopId;
+    /**
+     * img:图片；text:文本；
+     */
+    private String type;
+    /**
+     * 描述
+     */
+    private String name;
+    /**
+     * 自定义key
+     */
+    private String autokey;
+    /**
+     * 值
+     */
+    private String value;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(Integer shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getAutokey() {
+        return autokey;
+    }
+
+    public void setAutokey(String autokey) {
+        this.autokey = autokey;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+}
+
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java
@@ -320,4 +320,36 @@ public class TbShopUser implements Serializable {
    public void setMiniOpenId(String miniOpenId) {
        this.miniOpenId = miniOpenId == null ? null : miniOpenId.trim();
    }
+
+    public String getIsUser() {
+        return isUser;
+    }
+
+    public void setIsUser(String isUser) {
+        this.isUser = isUser;
+    }
+
+    public String getLat() {
+        return lat;
+    }
+
+    public void setLat(String lat) {
+        this.lat = lat;
+    }
+
+    public String getLng() {
+        return lng;
+    }
+
+    public void setLng(String lng) {
+        this.lng = lng;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
 }
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TbShopAdDto.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/TbShopAdDto.java
@@ -0,0 +1,61 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import com.chaozhanggui.system.cashierservice.entity.TbShopAd;
+import lombok.Data;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author GYJ
+ */
+@Data
+public class TbShopAdDto {
+    private Integer id;
+    /**
+     * 店铺id，如果是通用广告则为0
+     */
+    private Integer shopId;
+    /**
+     * 广告图片地址
+     */
+    private String imgUrl;
+    /**
+     * 跳转页面路径
+     */
+    private String linkPath;
+    /**
+     * 广告展示圆角
+     */
+    private Integer borderRadius;
+    /**
+     * 弹窗展示位置：home首页，make_order点餐页
+     */
+    private String showPosition;
+    /**
+     * 显示频率：only_one 仅首次展示, every_show 每次打开都展示，every_day 每天展示一次，three_day 每三天展示一次， seven_day 每七天展示一次， thirty_day 没30天展示一次
+     */
+    private String frequency;
+
+    /**
+     * 更新时间
+     */
+    private Long updateTime;
+
+    public static List<TbShopAdDto> convertShopAdDoToDtoList(List<TbShopAd> adList) {
+        return adList.stream().map(TbShopAdDto::convertShopAdDoToDto).collect(Collectors.toList());
+    }
+
+    public static TbShopAdDto convertShopAdDoToDto(TbShopAd ad) {
+        TbShopAdDto dto = new TbShopAdDto();
+        dto.setId(ad.getId());
+        dto.setShopId(ad.getShopId());
+        dto.setImgUrl(ad.getImgUrl());
+        dto.setLinkPath(ad.getLinkPath());
+        dto.setBorderRadius(ad.getBorderRadius());
+        dto.setShowPosition(ad.getShowPosition());
+        dto.setFrequency(ad.getFrequency());
+        dto.setUpdateTime(ad.getUpdateTime().getTime());
+        return dto;
+    }
+}
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OpenMemberVo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OpenMemberVo.java
@@ -6,10 +6,8 @@ import lombok.Data;
 public class OpenMemberVo {
    private Integer id;
    private Integer shopId;
-    private String headImg;
-
-    private String nickName;
-
    private String telephone;
+    private String nickName;
    private String birthDay;
+    private String headImg;
 }
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/VipProductsLimits.java
@@ -0,0 +1,11 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import com.chaozhanggui.system.cashierservice.entity.TbProduct;
+import lombok.Data;
+
+@Data
+public class VipProductsLimits extends TbProduct {
+
+    private Integer vipLimitNumber;
+
+}