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

团购卷卷码表

Browse Source 
原订单列表逻辑
店铺营业时间
团购卷订单
团购卷卷码表
资源管理 字典管理
通用门店
个人中心
支付
This commit is contained in:
wangw
2024-05-13 17:51:30 +08:00
parent d391f136bf
commit 6f6d1c3a7b
69 changed files with 1533 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/com/chaozhanggui/system/cashierservice/entity/SysDict.java
View File

@@ -3,17 +3,28 @@ package com.chaozhanggui.system.cashierservice.entity;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@Data
public class SysDict implements Serializable {
private Long dictId;
private String dictName;
private String name;
private String description;
/**
* 是否有子类0否1是
*/
private Integer isChild;
private Integer isChild;
/**
* 值
*/
private String value;
private List<SysDict> detail=new ArrayList<>();
}

101
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbGroupOrderCoupon.java Normal file
View File

@@ -0,0 +1,101 @@
package com.chaozhanggui.system.cashierservice.entity;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 团购卷 卷码表(TbGroupOrderCoupon)实体类
*
* @author ww
* @since 2024-05-06 14:39:59
*/
public class TbGroupOrderCoupon implements Serializable {
private static final long serialVersionUID = -35424376349743542L;
private Integer id;
/**
* 团购订单id
*/
private Integer orderId;
/**
* 团购卷码
*/
private String couponNo;
/**
* 是否已退款
* 0：否
* 1：是
*/
private Integer isRefund;
/**
* 退款金额
*/
private BigDecimal refundAmount;
/**
* 退款原因
*/
private String refundReason;
/**
* 退款说明
*/
private String refundDesc;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public Integer getOrderId() {
return orderId;
}
public void setOrderId(Integer orderId) {
this.orderId = orderId;
}
public String getCouponNo() {
return couponNo;
}
public void setCouponNo(String couponNo) {
this.couponNo = couponNo;
}
public Integer getIsRefund() {
return isRefund;
}
public void setIsRefund(Integer isRefund) {
this.isRefund = isRefund;
}
public BigDecimal getRefundAmount() {
return refundAmount;
}
public void setRefundAmount(BigDecimal refundAmount) {
this.refundAmount = refundAmount;
}
public String getRefundReason() {
return refundReason;
}
public void setRefundReason(String refundReason) {
this.refundReason = refundReason;
}
public String getRefundDesc() {
return refundDesc;
}
public void setRefundDesc(String refundDesc) {
this.refundDesc = refundDesc;
}
}

49
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbGroupOrderInfo.java
View File

@@ -2,17 +2,13 @@ package com.chaozhanggui.system.cashierservice.entity;
import lombok.Data;
import java.math.BigDecimal;
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;
private static final long serialVersionUID = -11810357048433715L;
/**
* id
*/
@@ -21,6 +17,7 @@ public class TbGroupOrderInfo implements Serializable {
* 订单编号
*/
private String orderNo;
private Integer merchantId;
/**
* 商户Id
*/
@@ -33,48 +30,51 @@ public class TbGroupOrderInfo implements Serializable {
* 商品id
*/
private Integer proId;
/**
* 商品名称
*/
private String proName;
/**
* 商品图
*/
private String proImg;
/**
* 团购卷编号
* 商品名称
*/
private String couponNo;
/**
* 团购卷图片
*/
private String couponUrl;
private String proName;
/**
* 团购卷到期日期
*/
private Date expDate;
/**
* 支付方式
* 订单类型 预留字段
*/
private String orderType;
/**
* 支付方式 wechatPay微信支付，aliPay支付宝支付
*/
private String payType;
/**
* 订单金额
*/
private Double orderAmount;
private BigDecimal orderAmount;
/**
* 优惠金额
*/
private Double saveAmount;
private BigDecimal saveAmount;
/**
* 实付金额
*/
private Double payAmount;
private BigDecimal payAmount;
/**
* 退单金额
*/
private BigDecimal refundAmount;
/**
* 数量
*/
private Integer number;
private Integer refundNumber;
/**
* 订单状态
* 状态: unpaid-待付款;unused-待使用;closed-已完成;refunding-退款中;refund-已退款;cancelled-已取消;
*/
private String status;
/**
@@ -90,13 +90,17 @@ public class TbGroupOrderInfo implements Serializable {
*/
private Date payTime;
/**
* 是否支持退款 0：不支持
* 是否支持退款 0：不支持 1：支持
*/
private Integer refundAble;
/**
* 创建时间
*/
private Date createTime;
/**
* 卷码核销员
*/
private String verifier;
/**
* 更新时间
*/
@@ -114,5 +118,6 @@ public class TbGroupOrderInfo implements Serializable {
*/
private Integer source;
}

9
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbPlatformDict.java
View File

@@ -20,6 +20,7 @@ public class TbPlatformDict implements Serializable {
* 描述 同类型下 name唯一
*/
private String name;
private String value;
private String fontColor;
private String backColor;
/**
@@ -102,6 +103,14 @@ public class TbPlatformDict implements Serializable {
this.name = name;
}
public String getValue() {
return value;
}
public void setValue(String value) {
this.value = value;
}
public String getType() {
return type;
}

2
src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
View File

@@ -62,6 +62,8 @@ public class TbShopInfo implements Serializable {
private String industryName;
private String businessStartDay;
private String businessEndDay;
private String businessTime;
private String postTime;

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

@@ -2,6 +2,9 @@ package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
/**
* 分页数据
*/
@Data
public class BasePageDto {
private Integer page = 1;

15
src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ComShopDto.java Normal file
View File

@@ -0,0 +1,15 @@
package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
/**
* 通用门店查询类
*/
@Data
public class ComShopDto extends HomeBaseDto{
/**
* 连锁店名
*/
private String shopName;
}

18
src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/CreateGroupOrderDto.java Normal file
View File

@@ -0,0 +1,18 @@
package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class CreateGroupOrderDto {
private Integer proId;
private Integer shopId;
private Integer num;
private Integer userId;
private String phone;
private BigDecimal orderAmount;
private BigDecimal payAmount;
private String remark;
}

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

@@ -2,11 +2,12 @@ package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
/**
* 查询通用核心类
* 经纬度
* 城市信息
* 分页数据
*/
@Data
public class HomeBaseDto extends BasePageDto{
@@ -23,8 +24,7 @@ public class HomeBaseDto extends BasePageDto{
*/
private String address;
private double distanceInKm = 10;
private String distanceInKm;
//是否分页 1分页
private Integer isPage = 1;
}

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

@@ -15,9 +15,17 @@ public class HomeDto extends HomeBaseDto {
/**
* 0.今日上新
* 1.离我最近
* 2.销量优先/热榜推荐
* 2.销量优先
* 3.价格优先
* 4.热榜推荐
* 5.精选推荐
*/
private Integer orderBy = 0;
/**
* 0:今天
* 1:两小时内
*/
private Integer dateType = 1;
}

29
src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ReturnGroupOrderDto.java Normal file
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;
}

4
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/UserPassVo.java → src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/UserPassDto.java
View File

@@ -1,4 +1,4 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
package com.chaozhanggui.system.cashierservice.entity.dto;
import lombok.Data;
@@ -6,7 +6,7 @@ import lombok.Data;
* 修改密码的 Vo 类
*/
@Data
public class UserPassVo {
public class UserPassDto {
private String phone;
private String code;

3
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/CommonVo.java
View File

@@ -1,5 +1,6 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.chaozhanggui.system.cashierservice.entity.SysDict;
import lombok.Data;
import java.util.List;
@@ -20,5 +21,5 @@ public class CommonVo {
/**
* 菜单列表 不一定有
*/
private List<DicDetailVO> menu;
private List<SysDict> menu;
}

52
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/GroupOrderDetailsVo.java
View File

@@ -1,12 +1,19 @@
package com.chaozhanggui.system.cashierservice.entity.vo;
import com.chaozhanggui.system.cashierservice.entity.TbGroupOrderCoupon;
import com.chaozhanggui.system.cashierservice.entity.TbPurchaseNotice;
import lombok.Data;
import java.math.BigDecimal;
import java.util.List;
@Data
public class GroupOrderDetailsVo {
private Integer id;
/**
* 商品id
*/
private Integer proId;
/**
* 商品名称
*/
@@ -19,7 +26,7 @@ public class GroupOrderDetailsVo {
* 可用时间说明
* 周一至周日
*/
private String avaTime;
private String avaTime="";
/**
* 商品描述
* 随时退·过期自动退·到店
@@ -28,7 +35,7 @@ public class GroupOrderDetailsVo {
/**
* 订单金额
*/
private Double orderAmount;
private BigDecimal orderAmount;
/**
* number 张可用 | 2024-04-11 23:59:59 到期
*/
@@ -41,14 +48,9 @@ public class GroupOrderDetailsVo {
* 是否支持退款
*/
private Integer refundAble;
/**
* 卷码
*/
private List<String> couponNo;
/**
* 卷码图
*/
private List<String> couponUrl;
List<TbGroupOrderCoupon> coupons;
/**
* 商家名称
*/
@@ -72,7 +74,7 @@ public class GroupOrderDetailsVo {
/**
* 购买须知
*/
private TbPurchaseNotice notice;
private TbPurchaseNotice notice=new TbPurchaseNotice();
/**
* 订单编号
*/
@@ -92,30 +94,6 @@ public class GroupOrderDetailsVo {
/**
* 实付金额
*/
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;
}
}
private BigDecimal payAmount;
private BigDecimal saveAmount;
}

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

@@ -20,10 +20,6 @@ public class GroupOrderListVo {
* 商品图
*/
private String proImg;
/**
* 团购卷图片
*/
private String couponUrl;
/**
* 订单金额
*/

4
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/HomeDistrictVo.java
View File

@@ -17,6 +17,8 @@ public class HomeDistrictVo{
* 描述 同类型下 name唯一
*/
private String name;
private String value;
/**
* 字体颜色
*/
@@ -29,5 +31,7 @@ public class HomeDistrictVo{
* 绝对跳转地址
*/
private String absUrl;
}

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

@@ -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 java.util.List;
@@ -20,7 +21,7 @@ public class HomeUpVO {
/**
* 条件查询
*/
List<DicDetailVO> menu;
List<SysDict> menu;
/**
* 今日上新
*/
@@ -74,11 +75,11 @@ public class HomeUpVO {
this.district = district;
}
public List<DicDetailVO> getMenu() {
public List<SysDict> getMenu() {
return menu;
}
public void setMenu(List<DicDetailVO> menu) {
public void setMenu(List<SysDict> menu) {
this.menu = menu;
}
}

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

@@ -5,6 +5,8 @@ import java.math.BigDecimal;
@Data
public class OrderConfirmVo {
private String proId;
private String shopId;
/**
* 商品图片
*/

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

@@ -50,6 +50,14 @@ public class ProductInfoVo {
* 店铺名称
*/
private String shopName;
/**
* 多少家店可用
*/
private Integer shopNum;
/**
* 连锁店扩展店名
*/
private String chainName;
/**
* 联系方式
*/
@@ -75,5 +83,5 @@ public class ProductInfoVo {
/**
* 购买须知/价格说明
*/
private TbPurchaseNotice purchaseNotice;
private TbPurchaseNotice purchaseNotice=new TbPurchaseNotice();
}

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

@@ -22,6 +22,7 @@ public class ProductVo {
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public static class Food {
private Integer id;
private String name; // 商品名称
private BigDecimal lowPrice; // 售价
private String unitName; // 单位

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

@@ -28,4 +28,7 @@ public class ShopGroupInfoVo {
//销量
private Integer number;
private String address;
}

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

@@ -20,6 +20,12 @@ public class SubShopVo{
* 手机号
*/
private String phone;
/**
* 营业时间
*/
private String businessStartDay;
private String businessEndDay;
private String businessTime;
/**
* Logo图
*/