验证码

个人中心-菜单页
首页接口
预约到店(店铺列表)
通用商品列表
登录 退出登录
商品详情(缺少评价部分)
订单页 列表 详情

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

@@ -0,0 +1,118 @@
+package com.chaozhanggui.system.cashierservice.entity;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+/**
+ * 团购卷订单
+ *
+ * @author ww
+ * @since 2024-04-27 16:15:09
+ */
+@Data
+public class TbGroupOrderInfo implements Serializable {
+    private static final long serialVersionUID = -27465362251022601L;
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 商户Id
+     */
+    private Integer shopId;
+    /**
+     * 用户id
+     */
+    private Integer userId;
+    /**
+     * 商品id
+     */
+    private Integer proId;
+    /**
+     * 商品名称
+     */
+    private String proName;
+    /**
+     * 商品图
+     */
+    private String proImg;
+    /**
+     * 团购卷编号
+     */
+    private String couponNo;
+    /**
+     * 团购卷图片
+     */
+    private String couponUrl;
+    /**
+     * 团购卷到期日期
+     */
+    private Date expDate;
+    /**
+     * 支付方式
+     */
+    private String orderType;
+    /**
+     * 订单金额
+     */
+    private Double orderAmount;
+    /**
+     * 优惠金额
+     */
+    private Double saveAmount;
+    /**
+     * 实付金额
+     */
+    private Double payAmount;
+    /**
+     * 数量
+     */
+    private Integer number;
+    /**
+     * 订单状态
+     */
+    private String status;
+    /**
+     * 备注
+     */
+    private String remark;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 付款时间
+     */
+    private Date payTime;
+    /**
+     * 是否支持退款 0：不支持
+     */
+    private Integer refundAble;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 支付订单号
+     */
+    private String payOrderNo;
+    /**
+     * 交易日期
+     */
+    private Date tradeDay;
+    /**
+     * 原订单id 退单
+     */
+    private Integer source;
+
+}
+

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

@@ -129,6 +129,8 @@ public class TbProduct implements Serializable {
     private String specTableHeaders;
 
     private String cartNumber="0";
+    private String groupCategoryId;
+
 
     public String getImages() {
         return images;
@@ -636,6 +638,15 @@ public class TbProduct implements Serializable {
         return specTableHeaders;
     }
 
+    public String getGroupCategoryId() {
+        return groupCategoryId;
+    }
+
+    public void setGroupCategoryId(String groupCategoryId) {
+        this.groupCategoryId = groupCategoryId;
+    }
+
+
     public void setSpecTableHeaders(String specTableHeaders) {
         this.specTableHeaders = specTableHeaders == null ? null : specTableHeaders.trim();
     }

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

@@ -5,7 +5,6 @@ import java.math.BigDecimal;
 
 public class TbUserInfo implements Serializable {
     private Integer id;
-    private Integer userId;
 
     private BigDecimal amount;
 
@@ -478,14 +477,6 @@ public class TbUserInfo implements Serializable {
         this.grandParentId = grandParentId == null ? null : grandParentId.trim();
     }
 
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
     public String getPassword() {
         return password;
     }

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

@@ -0,0 +1,10 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class BasePageDto {
+    private Integer page = 1;
+
+    private Integer size = 10;
+}

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

@@ -0,0 +1,13 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+@Data
+public class GroupOrderDto extends BasePageDto {
+    //用户Id 必填
+    private String userId;
+    //状态: unpaid-待付款;unused-待使用;closed-已完成;refunding-退款中;refund-已退款;cancelled-已取消;
+    private String status;
+    //商品名称 模糊查询
+    private String proName;
+}

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * 分页数据
  */
 @Data
-public class HomeBaseDto {
+public class HomeBaseDto extends BasePageDto{
     /**
      * 经度
      */
@@ -27,8 +27,4 @@ public class HomeBaseDto {
 
     //是否分页 1分页
     private Integer isPage = 1;
-
-    private Integer page = 1;
-
-    private Integer size = 10;
 }

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

@@ -1,23 +0,0 @@
-package com.chaozhanggui.system.cashierservice.entity.vo;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class CommonListVo extends CommonVo{
-    private Map<String,Object> result=new HashMap<>();
-
-    public Map<String, Object> getResult() {
-        return result;
-    }
-
-    public void setResult(List list) {
-        this.result.put("list",list);
-    }
-
-    public void setResult(Map<String, Object> result) {
-        this.result = result;
-    }
-
-
-}

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

@@ -1,10 +0,0 @@
-package com.chaozhanggui.system.cashierservice.entity.vo;
-
-import com.github.pagehelper.PageInfo;
-import lombok.Data;
-
-
-@Data
-public class CommonPageVo extends CommonVo{
-    private PageInfo result;
-}

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

@@ -1,41 +0,0 @@
-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/GroupOrderDetailsVo.java

@@ -0,0 +1,121 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import com.chaozhanggui.system.cashierservice.entity.TbPurchaseNotice;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GroupOrderDetailsVo {
+    /**
+     * 商品名称
+     */
+    private String proName;
+    /**
+     * 商品卷图片
+     */
+    private String proImg;
+    /**
+     * 可用时间说明
+     * 周一至周日
+     */
+    private String avaTime;
+    /**
+     * 商品描述
+     * 随时退·过期自动退·到店
+     */
+    private String proDetail="随时退·过期自动退·到店";
+    /**
+     * 订单金额
+     */
+    private Double orderAmount;
+    /**
+     * number 张可用 | 2024-04-11 23:59:59 到期
+     */
+    private String expDate;
+    /**
+     * 订单状态
+     */
+    private String status;
+    /**
+     * 是否支持退款
+     */
+    private Integer refundAble;
+    /**
+     * 卷码
+     */
+    private List<String> couponNo;
+    /**
+     * 卷码图
+     */
+    private List<String> couponUrl;
+    /**
+     * 商家名称
+     */
+    private String shopName;
+    /**
+     * 商家电话
+     */
+    private String shopPhone;
+    /**
+     * 距离 单位km
+     */
+    private String distances;
+    /**
+     * 地址
+     */
+    private String address;
+    /**
+     * 商品细节
+     */
+    List<ProductVo> tagVos;
+    /**
+     * 购买须知
+     */
+    private TbPurchaseNotice notice;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 手机号
+     */
+    private String phone;
+    /**
+     * 付款时间
+     */
+    private String payTime;
+    /**
+     * 数量
+     */
+    private Integer number;
+    /**
+     * 实付金额
+     */
+    private Double payAmount;
+
+    public void setStatus(String status) {
+        switch (status) {
+            case "unpaid":
+                this.status = "待付款";
+                break;
+            case "unused":
+                this.status = "待使用";
+                break;
+            case "closed":
+                this.status = "已完成";
+                break;
+            case "refunding":
+                this.status = "退款中";
+                break;
+            case "refund":
+                this.status = "已退款";
+                break;
+            case "cancelled":
+                this.status = "已取消";
+                break;
+            default:
+                this.status = status;
+        }
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class GroupOrderListVo {
+    /**
+     * id
+     */
+    private Integer id;
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+    /**
+     * 商品名称
+     */
+    private String proName;
+    /**
+     * 商品图
+     */
+    private String proImg;
+    /**
+     * 团购卷图片
+     */
+    private String couponUrl;
+    /**
+     * 订单金额
+     */
+    private Double orderAmount;
+    /**
+     * 实付金额
+     */
+    private Double payAmount;
+    /**
+     * 数量
+     */
+    private Integer number;
+    /**
+     * 订单状态
+     */
+    private String status;
+}

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

@@ -47,7 +47,6 @@ public class HomeVO {
      */
     private BigDecimal realSalesNumber;
 
-    private Integer productId;
     /**
      * 店铺标签
      */
@@ -115,14 +114,6 @@ public class HomeVO {
         this.proTag = proTag;
     }
 
-    public Integer getProductId() {
-        return productId;
-    }
-
-    public void setProductId(Integer productId) {
-        this.productId = productId;
-    }
-
     public String getShopName() {
         return shopName;
     }

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

@@ -0,0 +1,48 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+import java.math.BigDecimal;
+
+@Data
+public class OrderConfirmVo {
+    /**
+     * 商品图片
+     */
+    private String proImg;
+    /**
+     * 商品名称
+     */
+    private String proName;
+    /**
+     * 可用时间说明
+     * 周一至周日
+     */
+    private String avaTime;
+    /**
+     * 商品描述
+     * 随时退·过期自动退·到店
+     */
+    private String proDetail="随时退·过期自动退·到店";
+    /**
+     * 商品原价/划线价
+     */
+    private BigDecimal originPrice;
+    /**
+     * 商品现价
+     */
+    private BigDecimal salePrice;
+    /**
+     * 优惠金额
+     */
+    private BigDecimal save;
+    /**
+     * 优惠劵
+     * 暂无可用/有多少张可选择
+     * 字体颜色
+     * 背景色
+     */
+    private TagVo couponDetail;
+
+
+
+}

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

@@ -25,7 +25,7 @@ public class ProductInfoVo {
     /**
      * 折扣
      */
-    private Float discount;
+    private BigDecimal discount;
     /**
      * 原价
      */

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

@@ -1,5 +1,6 @@
 package com.chaozhanggui.system.cashierservice.entity.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -7,6 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class ProductVo {
     //选几个
     private Integer number;
@@ -15,13 +17,14 @@ public class ProductVo {
     private String title;
 
     //食物
-    private List<Food> foods=new ArrayList<>(); // 食品列表
+    private List<Food> goods=new ArrayList<>(); // 食品列表
 
     @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
     public static class Food {
         private String name; // 商品名称
-        private BigDecimal price; // 售价
-        private String unit; // 单位
+        private BigDecimal lowPrice; // 售价
+        private String unitName; // 单位
         /**
          * 商品标签
          */

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

@@ -0,0 +1,31 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @author ww
+ * 店铺团购卷vo
+ */
+@Data
+public class ShopGroupInfoVo {
+    private Integer shopId;
+
+    private String shopName;
+
+    private String shopImg;
+
+    private String shopTag;
+    private String lat;
+    private String lng;
+
+
+
+    private Integer proId;
+
+    private String proName;
+
+    private String proImg;
+    //销量
+    private Integer number;
+
+}

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

@@ -16,6 +16,10 @@ public class SubShopVo{
      * 连锁店扩展名
      */
     private String chainName;
+    /**
+     * 手机号
+     */
+    private String phone;
     /**
      * Logo图
      */

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

@@ -0,0 +1,17 @@
+package com.chaozhanggui.system.cashierservice.entity.vo;
+
+import lombok.Data;
+
+/**
+ * 修改密码的 Vo 类
+ */
+@Data
+public class UserPassVo {
+    private String phone;
+
+    private String code;
+
+    private String oldPass;
+
+    private String newPass;
+}