购物车 多规格商品返回规格信息

团购卷列表
团购卷退款
员工登录管理
This commit is contained in:
2024-05-24 15:56:41 +08:00
parent c5e337bef3
commit 3e6cb81b46
26 changed files with 1247 additions and 36 deletions

View File

@@ -58,6 +58,7 @@ public class TbCashierCart implements Serializable {
private Integer userId;
private String tableId;
private TbProductSpec tbProductSpec;
private String selectSpec="";
private static final long serialVersionUID = 1L;
}

View File

@@ -0,0 +1,49 @@
package com.chaozhanggui.system.cashierservice.entity;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 团购卷 卷码表(TbGroupOrderCoupon)实体类
*
* @author ww
* @since 2024-05-20 10:42:18
*/
@Data
public class TbGroupOrderCoupon implements Serializable {
private static final long serialVersionUID = -79087167053650793L;
private Integer id;
/**
* 团购订单id
*/
private Integer orderId;
/**
* 团购卷码
*/
private String couponNo;
/**
* 是否已退款
* 0
* 1
*/
private Integer isRefund;
/**
* 退款金额
*/
private BigDecimal refundAmount;
/**
* 退款原因
*/
private String refundReason;
/**
* 退款说明
*/
private String refundDesc;
}

View File

@@ -0,0 +1,132 @@
package com.chaozhanggui.system.cashierservice.entity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.io.Serializable;
/**
* 团购卷订单(TbGroupOrderInfo)实体类
*
* @author ww
* @since 2024-05-20 10:04:50
*/
@Data
public class TbGroupOrderInfo implements Serializable {
private static final long serialVersionUID = -54354891204103762L;
/**
* id
*/
private Integer id;
/**
* 订单编号
*/
private String orderNo;
private Integer merchantId;
/**
* 商户Id
*/
private Integer shopId;
/**
* 用户id
*/
private Integer userId;
/**
* 商品id
*/
private Integer proId;
/**
* 商品图
*/
private String proImg;
/**
* 商品名称
*/
private String proName;
/**
* 团购卷到期日期
*/
private Date expDate;
/**
* 订单类型 预留字段
*/
private String orderType;
/**
* 支付方式 wechatPay微信支付aliPay支付宝支付
*/
private String payType;
/**
* 订单金额
*/
private BigDecimal orderAmount;
/**
* 优惠金额
*/
private BigDecimal saveAmount;
/**
* 实付金额
*/
private BigDecimal payAmount;
/**
* 退单金额
*/
private BigDecimal refundAmount;
/**
* 退单数量
*/
private Integer refundNumber;
/**
* 数量
*/
private Integer number;
/**
* 订单状态
* 状态: unpaid-待付款;unused-待使用;closed-已完成;refunding-退款中;refund-已退款;cancelled-已取消;
*/
private String status;
/**
* 备注
*/
private String remark;
/**
* 手机号
*/
private String phone;
/**
* 付款时间
*/
private Date payTime;
/**
* 是否支持退款 0不支持 1支持
*/
private Integer refundAble;
/**
* 创建时间
*/
private Date createTime;
/**
* 卷码核销员
*/
private String verifier;
/**
* 更新时间
*/
private Date updateTime;
/**
* 支付订单号
*/
private String payOrderNo;
/**
* 交易日期
*/
private Date tradeDay;
/**
* 原订单id 退单
*/
private Integer source;
}

View File

@@ -27,6 +27,8 @@ public class TbPlussShopStaff implements Serializable {
private Long updatedAt;
private String type;
private Integer isManage;
private Integer isPc;
private static final long serialVersionUID = 1L;
@@ -122,6 +124,22 @@ public class TbPlussShopStaff implements Serializable {
return type;
}
public Integer getIsManage() {
return isManage;
}
public void setIsManage(Integer isManage) {
this.isManage = isManage;
}
public Integer getIsPc() {
return isPc;
}
public void setIsPc(Integer isPc) {
this.isPc = isPc;
}
public void setType(String type) {
this.type = type == null ? null : type.trim();
}

View File

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

View File

@@ -0,0 +1,12 @@
package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
@Data
public class GroupOrderDto extends BasePageDto{
private String orderNo;
private String proName;
private String status;
}

View File

@@ -0,0 +1,29 @@
package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ReturnGroupOrderDto {
/**
* 退单数
*/
private Integer num;
/**
* 团购订单id
*/
private Integer orderId;
/**
* 退款金额
*/
private BigDecimal refundAmount;
/**
* 退款原因
*/
private String refundReason;
/**
* 退款说明
*/
private String refundDesc;
}

View File

@@ -0,0 +1,39 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.alibaba.fastjson.JSONArray;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
/**
* @author lyf
*/
@Data
public class GroupOrderInfoVo {
private Integer id;
/**
* 商品图片
*/
private JSONArray images;
/**
* 现价
*/
private BigDecimal salePrice;
/**
* 原价
*/
private BigDecimal originPrice;
/**
* 商品名称
*/
private String productName;
/**
* 套餐详情
*/
List<ProductVo> productList = new ArrayList<>();
}

View File

@@ -0,0 +1,31 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.Data;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class ProductVo {
//选几个
private Integer number;
//类别
private String title;
//食物
private List<Food> goods=new ArrayList<>(); // 食品列表
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Food {
private Integer id;
private String name; // 商品名称
private BigDecimal lowPrice; // 售价
private String groupNum; // 数量
private String unitName; // 单位
}
}