小程序首页初版，订单回显商户二维码，

src/main/java/com/chaozhanggui/system/cashierservice/entity/SysDict.java

@@ -18,8 +18,18 @@ public class SysDict implements Serializable {
 
     private Date updateTime;
 
+    private  Integer isChild;
+
     private static final long serialVersionUID = 1L;
 
+    public Integer getIsChild() {
+        return isChild;
+    }
+
+    public void setIsChild(Integer isChild) {
+        this.isChild = isChild;
+    }
+
     public Long getDictId() {
         return dictId;
     }

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMerchantCoupon.java

@@ -0,0 +1,411 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 优惠券(TbMerchantCoupon)实体类
+ *
+ * @author lyf
+ * @since 2024-04-02 09:22:41
+ */
+public class TbMerchantCoupon implements Serializable {
+    private static final long serialVersionUID = 391103766508753856L;
+    /**
+     * 自增
+     */
+    private Integer id;
+    /**
+     * 状态0-关闭 1 正常
+     */
+    private Integer status;
+    /**
+     *  优惠券名称
+     */
+    private String title;
+    
+    private String templateId;
+    
+    private String shopId;
+    
+    private String shopSnap;
+    /**
+     * 开始时间
+     */
+    private Date fromTime;
+    /**
+     * 到期时间
+     */
+    private Date toTime;
+    /**
+     * 限领数量
+     */
+    private String limitNumber;
+    /**
+     * 发放数量
+     */
+    private Integer number;
+    /**
+     * 剩余数量
+     */
+    private String leftNumber;
+    /**
+     * 优惠金额
+     */
+    private Double amount;
+    /**
+     * 订单满赠金额
+     */
+    private Double limitAmount;
+    /**
+     * 是否显示0-不显示 1显示
+     */
+    private Integer isShow;
+    /**
+     * 图标
+     */
+    private String pic;
+    /**
+     * 0-满减  1-折扣
+     */
+    private Integer type;
+    /**
+     * 折扣 ，一位小数
+     */
+    private Float ratio;
+    /**
+     * 最大折扣金额
+     */
+    private Double maxRatioAmount;
+    /**
+     * 优惠券途径，首充|分销
+     */
+    private String track;
+    /**
+     * 品类product 商品券 ---cateogry 品类券common -通 用券
+     */
+    private String classType;
+    /**
+     * 有效期类型：0-toTime有效  1-effectDays有效
+     */
+    private Integer effectType;
+    /**
+     * 领取之日有效天数
+     */
+    private Integer effectDays;
+    /**
+     * 关联商品Id
+     */
+    private String relationIds;
+    
+    private String relationList;
+    /**
+     * 发放人
+     */
+    private String editor;
+    /**
+     * 说明
+     */
+    private String note;
+    
+    private Long createdAt;
+    
+    private Long updatedAt;
+    /**
+     * 支持堂食
+     */
+    private Integer furnishMeal;
+    /**
+     * 支持配送
+     */
+    private Integer furnishExpress;
+    /**
+     * 支持自提
+     */
+    private Integer furnishDraw;
+    /**
+     * 支持虚拟
+     */
+    private Integer furnishVir;
+    
+    private Integer disableDistribute;
+    /**
+     * 商户Id
+     */
+    private String merchantId;
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTemplateId() {
+        return templateId;
+    }
+
+    public void setTemplateId(String templateId) {
+        this.templateId = templateId;
+    }
+
+    public String getShopId() {
+        return shopId;
+    }
+
+    public void setShopId(String shopId) {
+        this.shopId = shopId;
+    }
+
+    public String getShopSnap() {
+        return shopSnap;
+    }
+
+    public void setShopSnap(String shopSnap) {
+        this.shopSnap = shopSnap;
+    }
+
+    public Date getFromTime() {
+        return fromTime;
+    }
+
+    public void setFromTime(Date fromTime) {
+        this.fromTime = fromTime;
+    }
+
+    public Date getToTime() {
+        return toTime;
+    }
+
+    public void setToTime(Date toTime) {
+        this.toTime = toTime;
+    }
+
+    public String getLimitNumber() {
+        return limitNumber;
+    }
+
+    public void setLimitNumber(String limitNumber) {
+        this.limitNumber = limitNumber;
+    }
+
+    public Integer getNumber() {
+        return number;
+    }
+
+    public void setNumber(Integer number) {
+        this.number = number;
+    }
+
+    public String getLeftNumber() {
+        return leftNumber;
+    }
+
+    public void setLeftNumber(String leftNumber) {
+        this.leftNumber = leftNumber;
+    }
+
+    public Double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(Double amount) {
+        this.amount = amount;
+    }
+
+    public Double getLimitAmount() {
+        return limitAmount;
+    }
+
+    public void setLimitAmount(Double limitAmount) {
+        this.limitAmount = limitAmount;
+    }
+
+    public Integer getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Integer isShow) {
+        this.isShow = isShow;
+    }
+
+    public String getPic() {
+        return pic;
+    }
+
+    public void setPic(String pic) {
+        this.pic = pic;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Float getRatio() {
+        return ratio;
+    }
+
+    public void setRatio(Float ratio) {
+        this.ratio = ratio;
+    }
+
+    public Double getMaxRatioAmount() {
+        return maxRatioAmount;
+    }
+
+    public void setMaxRatioAmount(Double maxRatioAmount) {
+        this.maxRatioAmount = maxRatioAmount;
+    }
+
+    public String getTrack() {
+        return track;
+    }
+
+    public void setTrack(String track) {
+        this.track = track;
+    }
+
+    public String getClassType() {
+        return classType;
+    }
+
+    public void setClassType(String classType) {
+        this.classType = classType;
+    }
+
+    public Integer getEffectType() {
+        return effectType;
+    }
+
+    public void setEffectType(Integer effectType) {
+        this.effectType = effectType;
+    }
+
+    public Integer getEffectDays() {
+        return effectDays;
+    }
+
+    public void setEffectDays(Integer effectDays) {
+        this.effectDays = effectDays;
+    }
+
+    public String getRelationIds() {
+        return relationIds;
+    }
+
+    public void setRelationIds(String relationIds) {
+        this.relationIds = relationIds;
+    }
+
+    public String getRelationList() {
+        return relationList;
+    }
+
+    public void setRelationList(String relationList) {
+        this.relationList = relationList;
+    }
+
+    public String getEditor() {
+        return editor;
+    }
+
+    public void setEditor(String editor) {
+        this.editor = editor;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public Long getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Long createdAt) {
+        this.createdAt = createdAt;
+    }
+
+    public Long getUpdatedAt() {
+        return updatedAt;
+    }
+
+    public void setUpdatedAt(Long updatedAt) {
+        this.updatedAt = updatedAt;
+    }
+
+    public Integer getFurnishMeal() {
+        return furnishMeal;
+    }
+
+    public void setFurnishMeal(Integer furnishMeal) {
+        this.furnishMeal = furnishMeal;
+    }
+
+    public Integer getFurnishExpress() {
+        return furnishExpress;
+    }
+
+    public void setFurnishExpress(Integer furnishExpress) {
+        this.furnishExpress = furnishExpress;
+    }
+
+    public Integer getFurnishDraw() {
+        return furnishDraw;
+    }
+
+    public void setFurnishDraw(Integer furnishDraw) {
+        this.furnishDraw = furnishDraw;
+    }
+
+    public Integer getFurnishVir() {
+        return furnishVir;
+    }
+
+    public void setFurnishVir(Integer furnishVir) {
+        this.furnishVir = furnishVir;
+    }
+
+    public Integer getDisableDistribute() {
+        return disableDistribute;
+    }
+
+    public void setDisableDistribute(Integer disableDistribute) {
+        this.disableDistribute = disableDistribute;
+    }
+
+    public String getMerchantId() {
+        return merchantId;
+    }
+
+    public void setMerchantId(String merchantId) {
+        this.merchantId = merchantId;
+    }
+
+}
+

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java

@@ -91,6 +91,18 @@ public class TbShopInfo implements Serializable {
     private String proxyId;
 
     private String view;
+    /**
+     * 商家二维码
+     */
+    private String shopQrcode;
+
+    public String getShopQrcode() {
+        return shopQrcode;
+    }
+
+    public void setShopQrcode(String shopQrcode) {
+        this.shopQrcode = shopQrcode;
+    }
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/HomeDto.java

@@ -18,7 +18,7 @@ public class HomeDto {
      */
     private Integer orderBy;
     /**
-     * 附近1KM 1  0
+     * 附近1KM 1选中  0未选中
      */
     private Integer distance;
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/DicDetailVO.java

@@ -0,0 +1,50 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import com.chaozhanggui.system.cashierservice.entity.SysDictDetail;
+
+import java.util.List;
+
+/**
+ * @author lyf
+ */
+public class DicDetailVO {
+    private String name;
+
+    private String description;
+
+    private List<SysDictDetail> detail;
+
+    private  Integer isChild;
+
+    public Integer getIsChild() {
+        return isChild;
+    }
+
+    public void setIsChild(Integer isChild) {
+        this.isChild = isChild;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<SysDictDetail> getDetail() {
+        return detail;
+    }
+
+    public void setDetail(List<SysDictDetail> detail) {
+        this.detail = detail;
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeUpVO.java

@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.entity.vo;
 
+import com.chaozhanggui.system.cashierservice.entity.SysDict;
 import com.chaozhanggui.system.cashierservice.entity.TbPlatformDict;
 import lombok.Data;
 
@@ -8,7 +9,7 @@ import java.util.List;
 /**
  * @author lyf
  */
-@Data
+
 public class HomeUpVO {
     /**
      * 轮播图
@@ -18,5 +19,56 @@ public class HomeUpVO {
      * 金刚区
      */
     List<TbPlatformDict> district;
+    /**
+     * 条件查询
+     */
+    List<DicDetailVO> menu;
+    /**
+     * 今日上新
+     */
+    TodayRankingVO todayList;
+    /**
+     * 销量飙升
+     */
+    HotRankingVO salesList;
 
+    public TodayRankingVO getTodayList() {
+        return todayList;
+    }
+
+    public void setTodayList(TodayRankingVO todayList) {
+        this.todayList = todayList;
+    }
+
+    public HotRankingVO getSalesList() {
+        return salesList;
+    }
+
+    public void setSalesList(HotRankingVO salesList) {
+        this.salesList = salesList;
+    }
+
+    public List<TbPlatformDict> getCarousel() {
+        return carousel;
+    }
+
+    public void setCarousel(List<TbPlatformDict> carousel) {
+        this.carousel = carousel;
+    }
+
+    public List<TbPlatformDict> getDistrict() {
+        return district;
+    }
+
+    public void setDistrict(List<TbPlatformDict> district) {
+        this.district = district;
+    }
+
+    public List<DicDetailVO> getMenu() {
+        return menu;
+    }
+
+    public void setMenu(List<DicDetailVO> menu) {
+        this.menu = menu;
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeVO.java

@@ -10,10 +10,6 @@ public class HomeVO {
      * 店铺名称
      */
     private String shopName;
-    /**
-     * 距离
-     */
-    private String distance;
     /**
      * 商品名称
      */
@@ -33,7 +29,7 @@ public class HomeVO {
     /**
      * 折扣
      */
-    private BigDecimal discount;
+    private Float discount;
     /**
      * 共省金额
      */
@@ -45,6 +41,52 @@ public class HomeVO {
     private BigDecimal realSalesNumber;
 
     private Integer productId;
+    /**
+     * 店铺标签
+     */
+    private String shopTag;
+    /**
+     * 商品标签
+     */
+    private String proTag;
+    /**
+     * 距离
+     */
+    private String distances ="100";
+
+    private Integer id;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDistances() {
+        return distances;
+    }
+
+    public void setDistances(String distances) {
+        this.distances = distances;
+    }
+
+    public String getShopTag() {
+        return shopTag;
+    }
+
+    public void setShopTag(String shopTag) {
+        this.shopTag = shopTag;
+    }
+
+    public String getProTag() {
+        return proTag;
+    }
+
+    public void setProTag(String proTag) {
+        this.proTag = proTag;
+    }
 
     public Integer getProductId() {
         return productId;
@@ -62,13 +104,6 @@ public class HomeVO {
         this.shopName = shopName;
     }
 
-    public String getDistance() {
-        return distance;
-    }
-
-    public void setDistance(String distance) {
-        this.distance = distance;
-    }
 
     public String getProductName() {
         return productName;
@@ -102,11 +137,11 @@ public class HomeVO {
         this.salePrice = salePrice;
     }
 
-    public BigDecimal getDiscount() {
+    public Float getDiscount() {
         return discount;
     }
 
-    public void setDiscount(BigDecimal discount) {
+    public void setDiscount(Float discount) {
         this.discount = discount;
     }
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HotRankingVO.java

@@ -0,0 +1,40 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import java.util.List;
+
+/**
+ * @author lyf
+ */
+public class HotRankingVO {
+    /**
+     * 榜单名称
+     */
+    private String name = "飙升热榜";
+
+    private String Date = "8点更新";
+    List<HomeVO> hotList;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDate() {
+        return Date;
+    }
+
+    public void setDate(String date) {
+        Date = date;
+    }
+
+    public List<HomeVO> getHotList() {
+        return hotList;
+    }
+
+    public void setHotList(List<HomeVO> hotList) {
+        this.hotList = hotList;
+    }
+}

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/OrderVo.java

@@ -17,6 +17,7 @@ public class OrderVo {
     private String status;
 
     private String tableName;
+    private String shopQrcode;
 
     private List<TbOrderDetail> details;
 

src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TodayRankingVO.java

@@ -0,0 +1,40 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import java.util.List;
+
+/**
+ * @author lyf
+ */
+public class TodayRankingVO {
+    /**
+     * 榜单名称
+     */
+    private String name = "今日上新";
+
+    private String Date = "10点更新";
+    List<HomeVO> todayList;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDate() {
+        return Date;
+    }
+
+    public void setDate(String date) {
+        Date = date;
+    }
+
+    public List<HomeVO> getTodayList() {
+        return todayList;
+    }
+
+    public void setTodayList(List<HomeVO> todayList) {
+        this.todayList = todayList;
+    }
+}