首页下半更改

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

@@ -135,6 +135,7 @@ public class TbMerchantCoupon implements Serializable {
     private String merchantId;
 
 
+
     public Integer getId() {
         return id;
     }

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

@@ -12,12 +12,20 @@ public class HomeDto {
      */
     private String address;
     /**
-     * 品类
+     * 经度
+     */
+    private String lat;
+    /**
+     * 纬度
+     */
+    private String lng;
+    /**
+     * 品类 1.附近1Km
      */
     private String type;
 
     /**
-     * 1.理我最近 2.销量优先 3.价格优先
+     * 1.离我最近 2.销量优先 3.价格优先
      */
     private Integer orderBy;
 
@@ -26,52 +34,4 @@ public class HomeDto {
     private Integer page;
 
     private Integer size;
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public Integer getOrderBy() {
-        return orderBy;
-    }
-
-    public void setOrderBy(Integer orderBy) {
-        this.orderBy = orderBy;
-    }
-
-    public Integer getOther() {
-        return other;
-    }
-
-    public void setOther(Integer other) {
-        this.other = other;
-    }
-
-    public Integer getPage() {
-        return page;
-    }
-
-    public void setPage(Integer page) {
-        this.page = page;
-    }
-
-    public Integer getSize() {
-        return size;
-    }
-
-    public void setSize(Integer size) {
-        this.size = size;
-    }
 }

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

@@ -0,0 +1,41 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author lyf
+ */
+@Data
+public class CouAndShopVo {
+    /**
+     * 自增
+     */
+    private Integer id;
+    /**
+     *  优惠券名称
+     */
+    private String title;
+
+    private String shopId;
+    /**
+     * 优惠金额
+     */
+    private Double amount;
+    /**
+     * 发放数量
+     */
+    private Integer number;
+    /**
+     * 折扣 ，一位小数
+     */
+    private Float ratio;
+
+    /**
+     * 关联商品Id
+     */
+    private String relationIds;
+
+    private String shopName;
+
+    private String logo;
+}

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

@@ -36,7 +36,7 @@ public class HomeVO {
     /**
      * 折扣
      */
-    private Float discount;
+    private BigDecimal discount;
     /**
      * 共省金额
      */
@@ -164,11 +164,11 @@ public class HomeVO {
         this.salePrice = salePrice;
     }
 
-    public Float getDiscount() {
+    public BigDecimal getDiscount() {
         return discount;
     }
 
-    public void setDiscount(Float discount) {
+    public void setDiscount(BigDecimal discount) {
         this.discount = discount;
     }