czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

字典管理

Browse Source 
资源管理
资源类型管理
团购卷订单管理
团购卷订单退款
团购卷商品(套餐商品修改与保存)
This commit is contained in:
wangw
2024-05-15 16:32:34 +08:00
parent a4cbb3798e
commit 6ba4aadccb
49 changed files with 1778 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictDto.java
View File

@@ -7,9 +7,6 @@ public class TbPlatformDictDto implements Serializable {
private Integer id;
/** 标签前小图标 */
private String shareImg;
/** 描述 */
private String name;
@@ -22,21 +19,34 @@ public class TbPlatformDictDto implements Serializable {
/** 类型: scan：拉起相机；relative：内部页面；absolute：外链url */
private String jumpType;
/** 绝对跳转地址 */
private String absUrl;
/** 值 */
private String value;
/** 轮播图；首页小菜单； */
/** homeDistrict--金刚区（首页）
carousel--轮播图
proTag--商品标签
shopTag--店铺标签
icon--小图标
subShop--预约到店顶部图
数字--数字为团购卷分类id
ownMenu--个人中心菜单 */
private String type;
/** 封面图 */
/** 展示图 */
private String coverImg;
/** 标签前小图标 */
private String shareImg;
/** 视频URL地址 */
private String video;
/** 视频封面图 */
private String videoCoverImg;
/** 绝对跳转地址 */
private String absUrl;
/** 创建时间 */
private Long createdAt;

4
eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictQueryCriteria.java
View File

@@ -35,9 +35,9 @@ public class TbPlatformDictQueryCriteria{
@Query
private Integer isShowApp;
private Integer pageSize;
private Integer pageSize = 10;
private Integer page;
private Integer page = 0;
private String sort;

21
eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictTypeDto.java Normal file
View File

@@ -0,0 +1,21 @@
package cn.ysk.cashier.dto;
import lombok.Data;
import java.io.Serializable;
@Data
public class TbPlatformDictTypeDto implements Serializable {
/** id */
private Integer id;
/** 类型名称 */
private String name;
/** 类型标识 */
private String key;
/** 排序 */
private Integer sort;
}

12
eladmin-system/src/main/java/cn/ysk/cashier/dto/TbPlatformDictTypeQueryCriteria.java Normal file
View File

@@ -0,0 +1,12 @@
package cn.ysk.cashier.dto;
import lombok.Data;
import cn.ysk.cashier.annotation.Query;
@Data
public class TbPlatformDictTypeQueryCriteria{
/** 模糊 */
@Query(type = Query.Type.INNER_LIKE)
private String name;
}

29
eladmin-system/src/main/java/cn/ysk/cashier/dto/order/ReturnGroupOrderDto.java Normal file
View File

@@ -0,0 +1,29 @@
package cn.ysk.cashier.dto.order;
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;
}

129
eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbGroupOrderInfoDto.java Normal file
View File

@@ -0,0 +1,129 @@
package cn.ysk.cashier.dto.order;
import cn.ysk.cashier.pojo.order.TbGroupOrderCoupon;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.sql.Date;
import java.sql.Timestamp;
import java.math.BigDecimal;
import java.io.Serializable;
import java.util.List;
@Data
public class TbGroupOrderInfoDto implements Serializable {
/** 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 Timestamp 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 Timestamp payTime;
/** 是否支持退款 0：不支持 1：支持 */
private Integer refundAble;
/** 创建时间 */
private Timestamp createTime;
/** 卷码核销员 */
private String verifier;
/** 更新时间 */
private Timestamp updateTime;
/** 支付订单号 */
private String payOrderNo;
/** 交易日期 */
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date tradeDay;
/** 原订单id 退单 */
private Integer source;
/**
* 卷码
*/
private List<TbGroupOrderCoupon> coupons;
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;
}
}
}

45
eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbGroupOrderInfoQueryCriteria.java Normal file
View File

@@ -0,0 +1,45 @@
package cn.ysk.cashier.dto.order;
import cn.ysk.cashier.annotation.Query;
import lombok.Data;
import java.sql.Timestamp;
import java.util.List;
@Data
public class TbGroupOrderInfoQueryCriteria {
/** 精确 */
@Query
private String orderNo;
/** 精确 */
@Query
private Integer shopId;
/** 模糊 */
@Query(type = Query.Type.INNER_LIKE)
private String proName;
/** 精确 */
@Query
private String payType;
/** 精确 */
@Query
private String status;
/** 精确 */
@Query
private String phone;
/** BETWEEN */
@Query(type = Query.Type.BETWEEN)
private List<Timestamp> createTime;
private Integer page;
private Integer size;
private String sort = "id";
}

4
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoDto.java
View File

@@ -121,7 +121,9 @@ public class TbShopInfoDto implements Serializable {
private String industryName;
/** 营业时间 */
private String businessTime;
private String businessStartDay;//周
private String businessEndDay;//周
private String businessTime;//09:00-20:00
/** 配送时间 */
private String postTime;