字典管理

资源管理
资源类型管理
团购卷订单管理
团购卷订单退款
团购卷商品(套餐商品修改与保存)

eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDict.java

@@ -12,21 +12,22 @@ import java.io.Serializable;
 @Data
 @Table(name="tb_platform_dict")
 public class TbPlatformDict implements Serializable {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "`id`")
     @ApiModelProperty(value = "id")
     private Integer id;
 
-    @Column(name = "`share_img`")
-    @ApiModelProperty(value = "标签前 小图标")
-    private String shareImg;
-
     @Column(name = "`name`",nullable = false)
     @NotBlank
     @ApiModelProperty(value = "描述")
     private String name;
 
+    @Column(name = "`value`")
+    @ApiModelProperty(value = "值")
+    private String value;
+
     @Column(name = "`font_color`")
     @ApiModelProperty(value = "字体色")
     private String fontColor;
@@ -39,20 +40,25 @@ public class TbPlatformDict implements Serializable {
     @ApiModelProperty(value = "类型: scan：拉起相机；relative：内部页面；absolute：外链url  ")
     private String jumpType;
 
-    @Column(name = "`abs_url`")
-    @ApiModelProperty(value = "绝对跳转地址")
-    private String absUrl;
-
-    @Column(name = "`cover_img`")
-    @ApiModelProperty(value = "封面图")
-    private String coverImg;
-
-    @Column(name = "`type`",nullable = false)
     @NotBlank
-    @ApiModelProperty(value = "homeDistrict--金刚区（首页） carousel--轮播图  proTag--商品标签  shopTag店铺标签")
+    @ApiModelProperty(value = "homeDistrict--金刚区（首页） \n" +
+            "carousel--轮播图  \n" +
+            "proTag--商品标签  \n" +
+            "shopTag--店铺标签\n" +
+            "icon--小图标\n" +
+            "subShop--预约到店顶部图\n" +
+            "数字--数字为团购卷分类id\n" +
+            "ownMenu--个人中心菜单")
     private String type;
 
-    @Column(name = "`video`")
+    @Column(name = "`cover_img`")
+    @ApiModelProperty(value = "展示图")
+    private String coverImg;
+
+    @Column(name = "`share_img`")
+    @ApiModelProperty(value = "标签前小图标")
+    private String shareImg;
+
     @ApiModelProperty(value = "视频URL地址")
     private String video;
 
@@ -60,6 +66,9 @@ public class TbPlatformDict implements Serializable {
     @ApiModelProperty(value = "视频封面图")
     private String videoCoverImg;
 
+    @Column(name = "`abs_url`")
+    @ApiModelProperty(value = "绝对跳转地址")
+    private String absUrl;
 
     @Column(name = "`created_at`")
     @ApiModelProperty(value = "创建时间")
@@ -81,11 +90,10 @@ public class TbPlatformDict implements Serializable {
     @ApiModelProperty(value = "APP端展示 0:不展示 1:展示")
     private Integer isShowApp;
 
-    @Column(name = "`sort`")
     @ApiModelProperty(value = "排序")
     private Integer sort;
 
     public void copy(TbPlatformDict source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
-}
+}

eladmin-system/src/main/java/cn/ysk/cashier/pojo/TbPlatformDictType.java

@@ -0,0 +1,36 @@
+package cn.ysk.cashier.pojo;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Data
+@Table(name="tb_platform_dict_type")
+public class TbPlatformDictType implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "`id`")
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @Column(name = "`name`")
+    @ApiModelProperty(value = "类型名称")
+    private String name;
+
+    @Column(name = "`key`")
+    @ApiModelProperty(value = "类型标识")
+    private String key;
+
+    @Column(name = "`sort`")
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    public void copy(TbPlatformDictType source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbGroupOrderCoupon.java

@@ -0,0 +1,49 @@
+package cn.ysk.cashier.pojo.order;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.io.Serializable;
+
+@Entity
+@Data
+@Table(name = "tb_group_order_coupon")
+public class TbGroupOrderCoupon implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "`id`")
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @Column(name = "`order_id`", nullable = false)
+    @ApiModelProperty(value = "团购订单id")
+    private Integer orderId;
+
+    @Column(name = "`coupon_no`", nullable = false)
+    @ApiModelProperty(value = "团购卷码")
+    private String couponNo;
+
+    @Column(name = "`is_refund`", nullable = false)
+    @ApiModelProperty(value = "是否已退款 0：否 1：是")
+    private Integer isRefund;
+
+    @Column(name = "`refund_amount`")
+    @ApiModelProperty(value = "退款金额")
+    private BigDecimal refundAmount;
+
+    @Column(name = "`refund_reason`")
+    @ApiModelProperty(value = "退款原因")
+    private String refundReason;
+
+    @Column(name = "`refund_desc`")
+    @ApiModelProperty(value = "退款说明")
+    private String refundDesc;
+
+    public void copy(TbGroupOrderCoupon source) {
+        BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbGroupOrderInfo.java

@@ -0,0 +1,136 @@
+package cn.ysk.cashier.pojo.order;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.persistence.*;
+import java.sql.Date;
+import java.sql.Timestamp;
+import java.math.BigDecimal;
+import java.io.Serializable;
+
+@Entity
+@Data
+@Table(name = "tb_group_order_info")
+public class TbGroupOrderInfo implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "`id`")
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @Column(name = "`order_no`")
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+    @Column(name = "`merchant_id`")
+    @ApiModelProperty(value = "merchantId")
+    private Integer merchantId;
+
+    @Column(name = "`shop_id`")
+    @ApiModelProperty(value = "商户Id")
+    private Integer shopId;
+
+    @Column(name = "`user_id`")
+    @ApiModelProperty(value = "用户id")
+    private Integer userId;
+
+    @Column(name = "`pro_id`")
+    @ApiModelProperty(value = "商品id")
+    private Integer proId;
+
+    @Column(name = "`pro_img`")
+    @ApiModelProperty(value = "商品图")
+    private String proImg;
+
+    @Column(name = "`pro_name`")
+    @ApiModelProperty(value = "商品名称")
+    private String proName;
+
+    @Column(name = "`exp_date`")
+    @ApiModelProperty(value = "团购卷到期日期")
+    private Timestamp  expDate;
+
+    @Column(name = "`order_type`")
+    @ApiModelProperty(value = "订单类型 预留字段")
+    private String orderType;
+
+    @Column(name = "`pay_type`")
+    @ApiModelProperty(value = "支付方式 wechatPay微信支付，aliPay支付宝支付")
+    private String payType;
+
+    @Column(name = "`order_amount`")
+    @ApiModelProperty(value = "订单金额")
+    private BigDecimal orderAmount;
+
+    @Column(name = "`save_amount`")
+    @ApiModelProperty(value = "优惠金额")
+    private BigDecimal saveAmount;
+
+    @Column(name = "`pay_amount`")
+    @ApiModelProperty(value = "实付金额")
+    private BigDecimal payAmount;
+
+    @Column(name = "`refund_amount`")
+    @ApiModelProperty(value = "退单金额")
+    private BigDecimal refundAmount;
+
+    @Column(name = "`refund_number`")
+    @ApiModelProperty(value = "退单数量")
+    private Integer refundNumber;
+
+    @Column(name = "`number`")
+    @ApiModelProperty(value = "数量")
+    private Integer number;
+
+    @Column(name = "`status`")
+    @ApiModelProperty(value = "订单状态 状态: unpaid-待付款;unused-待使用;closed-已完成;refunding-退款中;refund-已退款;cancelled-已取消;")
+    private String status;
+
+    @Column(name = "`remark`")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @Column(name = "`phone`")
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @Column(name = "`pay_time`")
+    @ApiModelProperty(value = "付款时间")
+    private Timestamp payTime;
+
+    @Column(name = "`refund_able`")
+    @ApiModelProperty(value = "是否支持退款 0：不支持 1：支持")
+    private Integer refundAble;
+
+    @Column(name = "`create_time`")
+    @ApiModelProperty(value = "创建时间")
+    private Timestamp createTime;
+
+    @Column(name = "`verifier`")
+    @ApiModelProperty(value = "卷码核销员")
+    private String verifier;
+
+    @Column(name = "`update_time`")
+    private Timestamp updateTime;
+
+    @Column(name = "`pay_order_no`")
+    @ApiModelProperty(value = "支付订单号")
+    private String payOrderNo;
+
+    @Column(name = "`trade_day`")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date tradeDay;
+
+    @Column(name = "`source`")
+    @ApiModelProperty(value = "原订单id 退单")
+    private Integer source;
+
+    public void copy(TbGroupOrderInfo source) {
+        BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java

@@ -150,6 +150,14 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "行业名称")
     private String industryName;
 
+    @Column(name = "`business_start_day`")
+    @ApiModelProperty(value = "营业时间")
+    private String businessStartDay;
+
+    @Column(name = "`business_end_day`")
+    @ApiModelProperty(value = "营业时间")
+    private String businessEndDay;
+
     @Column(name = "`business_time`")
     @ApiModelProperty(value = "营业时间")
     private String businessTime;
@@ -227,12 +235,12 @@ public class TbShopInfo implements Serializable {
     @Column(name = "provinces")
     @ApiModelProperty(value = "省")
     private String provinces;
-    @Column(name = "districts")
-    @ApiModelProperty(value = "市")
-    private String districts;
     @Column(name = "cities")
-    @ApiModelProperty(value = "区")
+    @ApiModelProperty(value = "市")
     private String cities;
+    @Column(name = "districts")
+    @ApiModelProperty(value = "区")
+    private String districts;
 
     public void copy(TbShopInfo source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(false));