feat(init): 实体类

common/common-util/src/test/java/com/atguigu/AppTest.java

@@ -1,38 +0,0 @@
-package com.atguigu;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

common/service-util/src/main/java/com/atguigu/App.java

@@ -1,13 +0,0 @@
-package com.atguigu;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

common/service-util/src/test/java/com/atguigu/AppTest.java

@@ -1,38 +0,0 @@
-package com.atguigu;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public AppTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( AppTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
-    public void testApp()
-    {
-        assertTrue( true );
-    }
-}

model/src/main/java/com/atguigu/App.java

@@ -1,13 +0,0 @@
-package com.atguigu;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

model/src/main/java/com/atguigu/ssyx/enums/ActivityType.java

@@ -0,0 +1,19 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum ActivityType {
+    FULL_REDUCTION(1,"满减"),
+    FULL_DISCOUNT(2,"满量打折" );
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    ActivityType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/BillType.java

@@ -0,0 +1,24 @@
+package com.atguigu.ssyx.enums;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.alibaba.fastjson.parser.deserializer.EnumDeserializer;
+import com.alibaba.fastjson.serializer.EnumSerializer;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@JSONType(serializer = EnumSerializer.class, deserializer = EnumDeserializer.class, serializeEnumAsJavaBean = true)
+@Getter
+public enum BillType {
+    ORDER(0,"订单佣金"),
+    WITHDRAW(1,"提现" ),
+    REFUND(1,"订单退款" );
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    BillType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/CouponRangeType.java

@@ -0,0 +1,21 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum CouponRangeType {
+    ALL(1,"通用"),
+    SKU(2,"SKU" ),
+    CATEGORY(3,"分类");
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    CouponRangeType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+
+}

model/src/main/java/com/atguigu/ssyx/enums/CouponStatus.java

@@ -0,0 +1,19 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum CouponStatus {
+    NOT_USED(1,"未使用"),
+    USED(2,"已使用");
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    CouponStatus(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/CouponType.java

@@ -0,0 +1,19 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum CouponType {
+    FULL_REDUCTION(1,"满减"),
+    CASH(2,"现金卷");
+
+    @EnumValue
+    private Integer code;
+    private String comment ;
+
+    CouponType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/OrderStatus.java

@@ -0,0 +1,24 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum OrderStatus {
+    //订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】
+    UNPAID(0,"待支付"),
+    WAITING_DELEVER(1,"待发货"),
+    WAITING_TAKE(2,"待提货"),
+    WAITING_COMMON(3,"待评论"),
+    FINISHED(4,"已完结"),
+    CANCEL(-1,"已取消");
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    OrderStatus(Integer code, String comment ){
+        this.code = code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/PaymentStatus.java

@@ -0,0 +1,21 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum PaymentStatus {
+    UNPAID(1,"支付中"),
+    PAID(2,"已支付");
+    //REFUND(-1,"已退款");
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    PaymentStatus(Integer code, String comment) {
+        this.code = code;
+        this.comment = comment;
+    }
+
+}

model/src/main/java/com/atguigu/ssyx/enums/PaymentType.java

@@ -0,0 +1,20 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum PaymentType {
+    ALIPAY(1,"支付宝"),
+    WEIXIN(2,"微信" );
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    PaymentType(Integer code, String comment ){
+        this.code = code;
+        this.comment=comment;
+    }
+
+}

model/src/main/java/com/atguigu/ssyx/enums/ProcessStatus.java

@@ -0,0 +1,26 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum ProcessStatus {
+    UNPAID(1, OrderStatus.UNPAID),
+    WAITING_DELEVER(2, OrderStatus.WAITING_DELEVER),
+    WAITING_LEADER_TAKE(3, OrderStatus.WAITING_TAKE),
+    WAITING_USER_TAKE(4, OrderStatus.WAITING_TAKE),
+    WAITING_COMMON(5, OrderStatus.WAITING_COMMON),
+    FINISHED(6, OrderStatus.FINISHED),
+    CANCEL(-1, OrderStatus.CANCEL),
+    PAY_FAIL(-2, OrderStatus.UNPAID);
+
+     @EnumValue
+    private Integer code ;
+    private OrderStatus orderStatus;
+
+    ProcessStatus(Integer code, OrderStatus orderStatus){
+        this.code=code;
+        this.orderStatus=orderStatus;
+    }
+
+}

model/src/main/java/com/atguigu/ssyx/enums/SkuType.java

@@ -0,0 +1,19 @@
+package com.atguigu.ssyx.enums;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@Getter
+public enum SkuType {
+    COMMON(0,"普通"),
+    SECKILL(1,"秒杀" );
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    SkuType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/enums/UserType.java

@@ -0,0 +1,23 @@
+package com.atguigu.ssyx.enums;
+
+import com.alibaba.fastjson.annotation.JSONType;
+import com.alibaba.fastjson.parser.deserializer.EnumDeserializer;
+import com.alibaba.fastjson.serializer.EnumSerializer;
+import com.baomidou.mybatisplus.annotation.EnumValue;
+import lombok.Getter;
+
+@JSONType(serializer = EnumSerializer.class, deserializer = EnumDeserializer.class, serializeEnumAsJavaBean = true)
+@Getter
+public enum UserType {
+    USER(0,"会员"),
+    LEADER(1,"团长" );
+
+    @EnumValue
+    private Integer code ;
+    private String comment ;
+
+    UserType(Integer code, String comment ){
+        this.code=code;
+        this.comment=comment;
+    }
+}

model/src/main/java/com/atguigu/ssyx/model/acl/Admin.java

@@ -0,0 +1,51 @@
+package com.atguigu.ssyx.model.acl;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 用户
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "用户")
+@TableName("admin")
+public class Admin extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户名")
+	@TableField("username")
+	private String username;
+
+	@ApiModelProperty(value = "密码")
+	@TableField("password")
+	private String password;
+
+	@ApiModelProperty(value = "昵称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "手机")
+	@TableField("phone")
+	private String phone;
+
+	@ApiModelProperty(value = "仓库id")
+	@TableField("ware_id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "角色名称")
+	@TableField(exist = false)
+	private String roleName;
+}
+
+
+

model/src/main/java/com/atguigu/ssyx/model/acl/AdminRole.java

@@ -0,0 +1,34 @@
+package com.atguigu.ssyx.model.acl;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 用户角色
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "用户角色")
+@TableName("admin_role")
+public class AdminRole extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "角色id")
+	@TableField("role_id")
+	private Long roleId;
+
+	@ApiModelProperty(value = "用户id")
+	@TableField("admin_id")
+	private Long adminId;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/acl/Permission.java

@@ -0,0 +1,66 @@
+//
+//
+package com.atguigu.ssyx.model.acl;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 权限
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "权限")
+@TableName("permission")
+public class Permission extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "所属上级")
+	@TableField("pid")
+	private Long pid;
+
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "名称编码")
+	@TableField("code")
+	private String code;
+
+	@ApiModelProperty(value = "跳转页面code")
+	@TableField("to_code")
+	private String toCode;
+
+	@ApiModelProperty(value = "类型(1:菜单,2:按钮)")
+	@TableField("type")
+	private Integer type;
+
+	@ApiModelProperty(value = "状态(0:禁止,1:正常)")
+	@TableField("status")
+	private Integer status;
+
+	@ApiModelProperty(value = "层级")
+	@TableField(exist = false)
+	private Integer level;
+
+	@ApiModelProperty(value = "下级")
+	@TableField(exist = false)
+	private List<Permission> children;
+
+	@ApiModelProperty(value = "是否选中")
+	@TableField(exist = false)
+	private boolean isSelect;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/acl/Role.java

@@ -0,0 +1,36 @@
+//
+//
+package com.atguigu.ssyx.model.acl;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 角色
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "角色")
+@TableName("role")
+public class Role extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "角色名称")
+	@TableField("role_name")
+	private String roleName;
+
+	@ApiModelProperty(value = "备注")
+	@TableField("remark")
+	private String remark;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/acl/RolePermission.java

@@ -0,0 +1,36 @@
+//
+//
+package com.atguigu.ssyx.model.acl;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 角色权限
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "角色权限")
+@TableName("role_permission")
+public class RolePermission extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "roleid")
+	@TableField("role_id")
+	private Long roleId;
+
+	@ApiModelProperty(value = "permissionId")
+	@TableField("permission_id")
+	private Long permissionId;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/ActivityInfo.java

@@ -0,0 +1,58 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.enums.ActivityType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * ActivityInfo
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "ActivityInfo")
+@TableName("activity_info")
+public class ActivityInfo extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "活动名称")
+	@TableField("activity_name")
+	private String activityName;
+
+	@ApiModelProperty(value = "活动类型（满减、折扣）")
+	@TableField("activity_type")
+	private ActivityType activityType;
+
+	@ApiModelProperty(value = "活动描述")
+	@TableField("activity_desc")
+	private String activityDesc;
+
+	@ApiModelProperty(value = "开始时间")
+	@TableField("start_time")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date startTime;
+
+	@ApiModelProperty(value = "结束时间")
+	@TableField("end_time")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date endTime;
+
+	@ApiModelProperty(value = "创建时间")
+	@TableField("create_time")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private Date createTime;
+
+	@TableField(exist = false)
+	private String activityTypeString;
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/ActivityRule.java

@@ -0,0 +1,68 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.enums.ActivityType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * ActivityRule
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "ActivityRule")
+@TableName("activity_rule")
+public class ActivityRule extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "类型")
+	@TableField("activity_id")
+	private Long activityId;
+
+	@ApiModelProperty(value = "活动类型（满减、折扣）")
+	@TableField("activity_type")
+	private ActivityType activityType;
+
+	@ApiModelProperty(value = "满减金额")
+	@TableField("condition_amount")
+	private BigDecimal conditionAmount;
+
+	@ApiModelProperty(value = "满减件数")
+	@TableField("condition_num")
+	private Long conditionNum;
+
+	@ApiModelProperty(value = "优惠金额")
+	@TableField("benefit_amount")
+	private BigDecimal benefitAmount;
+
+	@ApiModelProperty(value = "优惠折扣")
+	@TableField("benefit_discount")
+	private BigDecimal benefitDiscount;
+
+	@ApiModelProperty(value = "活动skuId")
+	@TableField(exist = false)
+	private Long skuId;
+
+	@ApiModelProperty(value = "优惠后减少金额")
+	@TableField(exist = false)
+	private BigDecimal reduceAmount;
+
+	@ApiModelProperty(value = "选中类型：1：去凑单 2：逛一逛")
+	@TableField(exist = false)
+	private Integer selectType;
+
+	@ApiModelProperty(value = "规则优惠描述")
+	@TableField(exist = false)
+	private String ruleDesc;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/ActivitySku.java

@@ -0,0 +1,36 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * ActivitySku
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "ActivitySku")
+@TableName("activity_sku")
+public class ActivitySku extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "活动id ")
+	@TableField("activity_id")
+	private Long activityId;
+
+	@ApiModelProperty(value = "sku_id")
+	@TableField("sku_id")
+	private Long skuId;
+
+//	@TableField(exist = false)
+//	private SkuInfo skuInfo;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/CouponInfo.java

@@ -0,0 +1,102 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.enums.CouponRangeType;
+import com.atguigu.ssyx.enums.CouponType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(description = "CouponInfo")
+@TableName("coupon_info")
+public class CouponInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "购物券类型 1 现金券 2 满减券")
+	@TableField("coupon_type")
+	private CouponType couponType;
+
+	@ApiModelProperty(value = "优惠卷名字")
+	@TableField("coupon_name")
+	private String couponName;
+
+	@ApiModelProperty(value = "金额")
+	@TableField("amount")
+	private BigDecimal amount;
+
+	@ApiModelProperty(value = "使用门槛 0->没门槛")
+	@TableField("condition_amount")
+	private BigDecimal conditionAmount;
+
+	@ApiModelProperty(value = "可以领取的开始日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("start_time")
+	private Date startTime;
+
+	@ApiModelProperty(value = "可以领取的结束日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("end_time")
+	private Date endTime;
+
+	@ApiModelProperty(value = "使用范围[0->全场通用；1->指定分类；2->指定商品]")
+	@TableField("range_type")
+	private CouponRangeType rangeType;
+
+	@ApiModelProperty(value = "使用范围描述")
+	@TableField("range_desc")
+	private String rangeDesc;
+
+	@ApiModelProperty(value = "发行数量")
+	@TableField("publish_count")
+	private Integer publishCount;
+
+	@ApiModelProperty(value = "每人限领张数")
+	@TableField("per_limit")
+	private Integer perLimit;
+
+	@ApiModelProperty(value = "已使用数量")
+	@TableField("use_count")
+	private Integer useCount;
+
+	@ApiModelProperty(value = "领取数量")
+	@TableField("receive_count")
+	private Integer receiveCount;
+
+	@ApiModelProperty(value = "过期时间")
+	@TableField("expire_time")
+	private Date expireTime;
+
+	@ApiModelProperty(value = "发布状态[0-未发布，1-已发布]")
+	@TableField("publish_status")
+	private Boolean publishStatus;
+
+	@TableField(exist = false)
+	private String couponTypeString;
+	@TableField(exist = false)
+	private String rangeTypeString;
+
+	@ApiModelProperty(value = "使用状态")
+	@TableField(exist = false)
+	private Integer couponStatus;
+
+	@ApiModelProperty(value = "是否可选")
+	@TableField(exist = false)
+	private Integer isSelect = 0;
+
+	@ApiModelProperty(value = "是否最优选项")
+	@TableField(exist = false)
+	private Integer isOptimal = 0;
+
+	@ApiModelProperty(value = "优惠券对应的skuId列表，提交订单使用")
+	@TableField(exist = false)
+	private List<Long> skuIdList;
+}

model/src/main/java/com/atguigu/ssyx/model/activity/CouponRange.java

@@ -0,0 +1,38 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.enums.CouponRangeType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * CouponRange
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "CouponRange")
+@TableName("coupon_range")
+public class CouponRange extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "优惠券id")
+	@TableField("coupon_id")
+	private Long couponId;
+
+	@ApiModelProperty(value = "范围类型 1、商品(spuid) 2、品类(三级分类id) 3、品牌")
+	@TableField("range_type")
+	private CouponRangeType rangeType;
+
+	@ApiModelProperty(value = "rangeId")
+	@TableField("range_id")
+	private Long rangeId;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/CouponUse.java

@@ -0,0 +1,60 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.enums.CouponStatus;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * CouponUse
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "优惠券领取记录表")
+@TableName("coupon_use")
+public class CouponUse extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "购物券ID")
+	@TableField("coupon_id")
+	private Long couponId;
+
+	@ApiModelProperty(value = "用户ID")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "订单ID")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "购物券状态")
+	@TableField("coupon_status")
+	private CouponStatus couponStatus;
+
+	@ApiModelProperty(value = "领券时间")
+	@TableField("get_time")
+	private Date getTime;
+
+	@ApiModelProperty(value = "使用时间")
+	@TableField("using_time")
+	private Date usingTime;
+
+	@ApiModelProperty(value = "支付时间")
+	@TableField("used_time")
+	private Date usedTime;
+
+	@ApiModelProperty(value = "过期时间")
+	@TableField("expire_time")
+	private Date expireTime;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/activity/Seckill.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "Seckill")
+@TableName("seckill")
+public class Seckill extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "活动标题")
+	@TableField("title")
+	private String title;
+
+	@ApiModelProperty(value = "开始时间")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("start_time")
+	private Date startTime;
+
+	@ApiModelProperty(value = "结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	@TableField("end_time")
+	private Date endTime;
+
+	@ApiModelProperty(value = "上下线状态")
+	@TableField("status")
+	private Integer status;
+
+}

model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSku.java

@@ -0,0 +1,64 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.atguigu.ssyx.model.product.SkuInfo;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(description = "SeckillSku")
+@TableName("seckill_sku")
+public class SeckillSku extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "秒杀活动id")
+	@TableField("seckill_id")
+	private Long seckillId;
+
+	@ApiModelProperty(value = "活动场次id")
+	@TableField("seckill_time_id")
+	private Long seckillTimeId;
+
+	@ApiModelProperty(value = "商品id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "spu名称")
+	@TableField("sku_name")
+	private String skuName;
+
+	@ApiModelProperty(value = "展示图片")
+	@TableField("img_url")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "秒杀价格")
+	@TableField("seckill_price")
+	private BigDecimal seckillPrice;
+
+	@ApiModelProperty(value = "秒杀总量")
+	@TableField("seckill_stock")
+	private Integer seckillStock;
+
+	@ApiModelProperty(value = "每人限购数量")
+	@TableField("seckill_limit")
+	private Integer seckillLimit;
+
+	@ApiModelProperty(value = "秒杀销量")
+	@TableField("seckill_sale")
+	private Integer seckillSale;
+
+	@ApiModelProperty(value = "排序")
+	@TableField("seckill_sort")
+	private Integer seckillSort;
+
+	@ApiModelProperty(value = "sku信息")
+	@TableField(exist = false)
+	private SkuInfo skuInfo;
+
+}

model/src/main/java/com/atguigu/ssyx/model/activity/SeckillSkuNotice.java

@@ -0,0 +1,42 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "SeckillSkuNotice")
+@TableName("seckill_sku_notice")
+public class SeckillSkuNotice extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "user_id")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "sku_id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "活动场次id")
+	@TableField("session_id")
+	private Long sessionId;
+
+	@ApiModelProperty(value = "订阅时间")
+	@TableField("subcribe_time")
+	private Date subcribeTime;
+
+	@ApiModelProperty(value = "发送时间")
+	@TableField("send_time")
+	private Date sendTime;
+
+	@ApiModelProperty(value = "通知方式[0-短信，1-邮件]")
+	@TableField("notice_type")
+	private Boolean noticeType;
+
+}

model/src/main/java/com/atguigu/ssyx/model/activity/SeckillTime.java

@@ -0,0 +1,40 @@
+package com.atguigu.ssyx.model.activity;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "SeckillTime")
+@TableName("seckill_time")
+public class SeckillTime extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "场次名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "每日开始时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	@TableField("start_time")
+	private Date startTime;
+
+	@ApiModelProperty(value = "每日结束时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private Date endTime;
+
+	@ApiModelProperty(value = "启用状态")
+	@TableField("status")
+	private Integer status;
+
+	@ApiModelProperty(value = "场次状态 1：已开抢 2：抢购中 3：即将开抢")
+	@TableField(exist = false)
+	private Integer timeStaus;
+
+}

model/src/main/java/com/atguigu/ssyx/model/base/BaseEntity.java

@@ -0,0 +1,43 @@
+package com.atguigu.ssyx.model.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class BaseEntity implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("create_time")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @TableField("update_time")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "逻辑删除(1:已删除，0:未删除)")
+    @JsonIgnore
+    @TableLogic
+    @TableField("is_deleted")
+    private Integer isDeleted;
+
+    @ApiModelProperty(value = "其他参数")
+    @TableField(exist = false)
+    private Map<String,Object> param = new HashMap<>();
+}

model/src/main/java/com/atguigu/ssyx/model/base/BaseMongoEntity.java

@@ -0,0 +1,39 @@
+package com.atguigu.ssyx.model.base;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
+import org.bson.types.ObjectId;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.annotation.Id;
+import lombok.Data;
+import org.springframework.data.annotation.LastModifiedDate;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.mongodb.core.index.Indexed;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@Data
+public class BaseMongoEntity implements Serializable {
+
+    @ApiModelProperty(value = "id")
+    @Id
+    private String id;
+
+    @ApiModelProperty(value = "创建时间")
+    @CreatedDate
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @LastModifiedDate
+    private Date updateTime;
+
+    @ApiModelProperty(value = "其他参数")
+    @Transient //被该注解标注的，将不会被录入到数据库中。只作为普通的javaBean属性
+    private Map<String,Object> param = new HashMap<>();
+}

model/src/main/java/com/atguigu/ssyx/model/base/MqRepeatRecord.java

@@ -0,0 +1,20 @@
+package com.atguigu.ssyx.model.base;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "MqRepeatRecord")
+@TableName("mq_repeat_record")
+public class MqRepeatRecord extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "业务编号")
+	@TableField("business_no")
+	private String businessNo;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/CartInfo.java

@@ -0,0 +1,68 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "CartInfo")
+public class CartInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	@ApiModelProperty(value = "分类id")
+	private Long categoryId;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	private Integer skuType;
+
+	@ApiModelProperty(value = "是否新人专享：0->否；1->是")
+	private Integer isNewPerson;
+
+	@ApiModelProperty(value = "sku名称 (冗余)")
+	private String skuName;
+
+	@ApiModelProperty(value = "skuid")
+	private Long skuId;
+
+	@ApiModelProperty(value = "放入购物车时价格")
+	private BigDecimal cartPrice;
+
+	@ApiModelProperty(value = "数量")
+	private Integer skuNum;
+
+	@ApiModelProperty(value = "限购个数")
+	private Integer perLimit;
+
+	@ApiModelProperty(value = "图片文件")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "isChecked")
+	private Integer isChecked;
+
+	@ApiModelProperty(value = "状态")
+	private Integer status;
+
+	@ApiModelProperty(value = "秒杀开始时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private Date startTime;
+
+	@ApiModelProperty(value = "秒杀结束时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private Date endTime;
+
+	@ApiModelProperty(value = "仓库")
+	private Long wareId;
+
+	@ApiModelProperty(value = "当天已购买个数")
+	private Integer currentBuyNum = 0;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderDeliver.java

@@ -0,0 +1,42 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "OrderDeliver")
+@TableName("order_deliver")
+public class OrderDeliver extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "配送日期")
+	@TableField("deliver_date")
+	private Date deliverDate;
+
+	@ApiModelProperty(value = "团长id")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "司机id")
+	@TableField("driver_id")
+	private Long driverId;
+
+	@ApiModelProperty(value = "司机名称")
+	@TableField("driver_name")
+	private String driverName;
+
+	@ApiModelProperty(value = "司机电话")
+	@TableField("driver_phone")
+	private String driverPhone;
+
+	@ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）")
+	@TableField("status")
+	private Integer status;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderInfo.java

@@ -0,0 +1,173 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.enums.OrderStatus;
+import com.atguigu.ssyx.enums.ProcessStatus;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(description = "OrderInfo")
+@TableName("order_info")
+public class OrderInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "会员_id")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "昵称")
+	@TableField("nick_name")
+	private String nickName;
+
+	@ApiModelProperty(value = "订单号")
+	@TableField("order_no")
+	private String orderNo;
+
+	@ApiModelProperty(value = "使用的优惠券")
+	@TableField("coupon_id")
+	private Long couponId;
+
+	@ApiModelProperty(value = "订单总额")
+	@TableField("total_amount")
+	private BigDecimal totalAmount;
+
+	@ApiModelProperty(value = "促销活动金额")
+	@TableField("activity_amount")
+	private BigDecimal activityAmount;
+
+	@ApiModelProperty(value = "优惠券")
+	@TableField("coupon_amount")
+	private BigDecimal couponAmount;
+
+	@ApiModelProperty(value = "原价金额")
+	@TableField("original_total_amount")
+	private BigDecimal originalTotalAmount;
+
+	@ApiModelProperty(value = "运费")
+	@TableField("feight_fee")
+	private BigDecimal feightFee;
+
+	@ApiModelProperty(value = "减免运费")
+	@TableField("feight_fee_reduce")
+	private BigDecimal feightFeeReduce;
+
+	@ApiModelProperty(value = "可退款日期（签收后1天）")
+	@TableField("refundable_time")
+	private Date refundableTime;
+
+	@ApiModelProperty(value = "支付方式【1->微信】")
+	@TableField("pay_type")
+	private Integer payType;
+
+	@ApiModelProperty(value = "订单来源[0->小程序；1->H5]")
+	@TableField("source_type")
+	private Integer sourceType;
+
+	@ApiModelProperty(value = "订单状态【0->待付款；1->待发货；2->待团长收货；3->待用户收货，已完成；-1->已取消】")
+	@TableField("order_status")
+	private OrderStatus orderStatus;
+
+	@ApiModelProperty(value = "进度状态")
+	@TableField("process_status")
+	private ProcessStatus processStatus;
+
+	@ApiModelProperty(value = "团长id")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "团长名称")
+	@TableField("leader_name")
+	private String leaderName;
+
+	@ApiModelProperty(value = "团长手机")
+	@TableField("leader_phone")
+	private String leaderPhone;
+
+	@ApiModelProperty(value = "提货点名称")
+	@TableField("take_name")
+	private String takeName;
+
+	@ApiModelProperty(value = "收货人姓名")
+	@TableField("receiver_name")
+	private String receiverName;
+
+	@ApiModelProperty(value = "收货人电话")
+	@TableField("receiver_phone")
+	private String receiverPhone;
+
+	@ApiModelProperty(value = "收货人邮编")
+	@TableField("receiver_post_code")
+	private String receiverPostCode;
+
+	@ApiModelProperty(value = "省份/直辖市")
+	@TableField("receiver_province")
+	private String receiverProvince;
+
+	@ApiModelProperty(value = "城市")
+	@TableField("receiver_city")
+	private String receiverCity;
+
+	@ApiModelProperty(value = "区")
+	@TableField("receiver_district")
+	private String receiverDistrict;
+
+	@ApiModelProperty(value = "详细地址")
+	@TableField("receiver_address")
+	private String receiverAddress;
+
+	@ApiModelProperty(value = "支付时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("payment_time")
+	private Date paymentTime;
+
+	@ApiModelProperty(value = "发货时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("delivery_time")
+	private Date deliveryTime;
+
+	@ApiModelProperty(value = "提货时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("take_time")
+	private Date takeTime;
+
+	@ApiModelProperty(value = "确认收货时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("receive_time")
+	private Date receiveTime;
+
+	@ApiModelProperty(value = "订单备注")
+	@TableField("remark")
+	private String remark;
+
+	@ApiModelProperty(value = "取消订单时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("cancel_time")
+	private Date cancelTime;
+
+	@ApiModelProperty(value = "取消订单原因")
+	@TableField("cancel_reason")
+	private String cancelReason;
+
+	@ApiModelProperty(value = "仓库id")
+	@TableField("ware_id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "团长佣金")
+	@TableField("commission_amount")
+	private BigDecimal commissionAmount;
+
+	@ApiModelProperty(value = "订单项列表")
+	@TableField(exist = false)
+	private List<OrderItem> orderItemList;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderItem.java

@@ -0,0 +1,68 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.enums.SkuType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(description = "OrderItem")
+@TableName("order_item")
+public class OrderItem extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "order_id")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "商品分类id")
+	@TableField("category_id")
+	private Long categoryId;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	@TableField("sku_type")
+	private SkuType skuType;
+
+	@ApiModelProperty(value = "商品sku编号")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "商品sku名字")
+	@TableField("sku_name")
+	private String skuName;
+
+	@ApiModelProperty(value = "商品sku图片")
+	@TableField("img_url")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "商品sku价格")
+	@TableField("sku_price")
+	private BigDecimal skuPrice;
+
+	@ApiModelProperty(value = "商品购买的数量")
+	@TableField("sku_num")
+	private Integer skuNum;
+
+	@ApiModelProperty(value = "商品促销活动分解金额")
+	@TableField("split_activity_amount")
+	private BigDecimal splitActivityAmount;
+
+	@ApiModelProperty(value = "优惠券优惠分解金额")
+	@TableField("split_coupon_amount")
+	private BigDecimal splitCouponAmount;
+
+	@ApiModelProperty(value = "该商品经过优惠后的分解金额")
+	@TableField("split_total_amount")
+	private BigDecimal splitTotalAmount;
+
+	@ApiModelProperty(value = "团长id（冗余）")
+	@TableField("leader_id")
+	private Long leaderId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderLog.java

@@ -0,0 +1,34 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.enums.ProcessStatus;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "OrderLog")
+@TableName("order_log")
+public class OrderLog extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "订单id")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "操作人：用户；系统；后台管理员")
+	@TableField("operate_user")
+	private String operateUser;
+
+	@ApiModelProperty(value = "操作状态")
+	@TableField("process_status")
+	private ProcessStatus processStatus;
+
+	@ApiModelProperty(value = "备注")
+	@TableField("note")
+	private String note;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnApply.java

@@ -0,0 +1,110 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "OrderReturnApply")
+@TableName("order_return_apply")
+public class OrderReturnApply extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "订单id")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "团长门店id")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "退货商品id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "订单编号")
+	@TableField("order_sn")
+	private String orderSn;
+
+	@ApiModelProperty(value = "会员用户名")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "退款金额")
+	@TableField("return_amount")
+	private String returnAmount;
+
+	@ApiModelProperty(value = "退货人姓名")
+	@TableField("return_name")
+	private String returnName;
+
+	@ApiModelProperty(value = "退货人电话")
+	@TableField("return_phone")
+	private String returnPhone;
+
+	@ApiModelProperty(value = "申请状态：0->待处理；1->退货中；2->已完成；3->已拒绝")
+	@TableField("status")
+	private Integer status;
+
+	@ApiModelProperty(value = "处理时间")
+	@TableField("handle_time")
+	private Date handleTime;
+
+	@ApiModelProperty(value = "商品图片")
+	@TableField("sku_pic")
+	private String skuPic;
+
+	@ApiModelProperty(value = "商品名称")
+	@TableField("spu_name")
+	private String spuName;
+
+	@ApiModelProperty(value = "退货数量")
+	@TableField("sku_num")
+	private Integer skuNum;
+
+	@ApiModelProperty(value = "商品单价")
+	@TableField("sku_price")
+	private String skuPrice;
+
+	@ApiModelProperty(value = "商品实际支付单价")
+	@TableField("sku_real_price")
+	private String skuRealPrice;
+
+	@ApiModelProperty(value = "原因")
+	@TableField("reason")
+	private String reason;
+
+	@ApiModelProperty(value = "描述")
+	@TableField("description")
+	private String description;
+
+	@ApiModelProperty(value = "凭证图片，以逗号隔开")
+	@TableField("proof_pics")
+	private String proofPics;
+
+	@ApiModelProperty(value = "处理备注")
+	@TableField("handle_note")
+	private String handleNote;
+
+	@ApiModelProperty(value = "处理人员")
+	@TableField("handle_man")
+	private String handleMan;
+
+	@ApiModelProperty(value = "收货人")
+	@TableField("receive_man")
+	private String receiveMan;
+
+	@ApiModelProperty(value = "收货时间")
+	@TableField("receive_time")
+	private Date receiveTime;
+
+	@ApiModelProperty(value = "收货备注")
+	@TableField("receive_note")
+	private String receiveNote;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderReturnReason.java

@@ -0,0 +1,29 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "OrderReturnReason")
+@TableName("order_return_reason")
+public class OrderReturnReason extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "退货类型")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "sort")
+	@TableField("sort")
+	private Integer sort;
+
+	@ApiModelProperty(value = "状态：0->不启用；1->启用")
+	@TableField("status")
+	private Integer status;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/OrderSet.java

@@ -0,0 +1,40 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(description = "OrderSet")
+@TableName("order_set")
+public class OrderSet extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "秒杀订单超时关闭时间(分)")
+	@TableField("seckill_order_overtime")
+	private Integer seckillOrderOvertime;
+
+	@ApiModelProperty(value = "正常订单超时时间(分)")
+	@TableField("normal_order_overtime")
+	private Integer normalOrderOvertime;
+
+	@ApiModelProperty(value = "发货后自动确认收货时间（天）")
+	@TableField("confirm_overtime")
+	private Integer confirmOvertime;
+
+	@ApiModelProperty(value = "自动完成交易时间，不能申请售后（天）")
+	@TableField("finish_overtime")
+	private Integer finishOvertime;
+
+	@ApiModelProperty(value = "佣金分成比例")
+	@TableField("profit_rate")
+	private BigDecimal profitRate;
+
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/PaymentInfo.java

@@ -0,0 +1,62 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.enums.PaymentStatus;
+import com.atguigu.ssyx.enums.PaymentType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "PaymentInfo")
+@TableName("payment_info")
+public class PaymentInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "对外业务编号")
+	@TableField("order_no")
+	private String orderNo;
+
+	@ApiModelProperty(value = "订单编号")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "用户id")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "支付类型（微信 支付宝）")
+	@TableField("payment_type")
+	private PaymentType paymentType;
+
+	@ApiModelProperty(value = "交易编号")
+	@TableField("trade_no")
+	private String tradeNo;
+
+	@ApiModelProperty(value = "支付金额")
+	@TableField("total_amount")
+	private BigDecimal totalAmount;
+
+	@ApiModelProperty(value = "交易内容")
+	@TableField("subject")
+	private String subject;
+
+	@ApiModelProperty(value = "支付状态")
+	@TableField("payment_status")
+	private PaymentStatus paymentStatus;
+
+	@ApiModelProperty(value = "回调时间")
+	@TableField("callback_time")
+	private Date callbackTime;
+
+	@ApiModelProperty(value = "回调信息")
+	@TableField("callback_content")
+	private String callbackContent;
+
+}

model/src/main/java/com/atguigu/ssyx/model/order/RefundInfo.java

@@ -0,0 +1,58 @@
+package com.atguigu.ssyx.model.order;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "RefundInfo")
+@TableName("refund_info")
+public class RefundInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "对外业务编号")
+	@TableField("out_trade_no")
+	private String outTradeNo;
+
+	@ApiModelProperty(value = "订单编号")
+	@TableField("order_id")
+	private Long orderId;
+
+	@ApiModelProperty(value = "skuId")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "支付类型（微信 支付宝）")
+	@TableField("payment_type")
+	private String paymentType;
+
+	@ApiModelProperty(value = "交易编号")
+	@TableField("trade_no")
+	private String tradeNo;
+
+	@ApiModelProperty(value = "退款金额")
+	@TableField("total_amount")
+	private String totalAmount;
+
+	@ApiModelProperty(value = "交易内容")
+	@TableField("subject")
+	private String subject;
+
+	@ApiModelProperty(value = "退款状态")
+	@TableField("refund_status")
+	private String refundStatus;
+
+	@ApiModelProperty(value = "回调时间")
+	@TableField("callback_time")
+	private Date callbackTime;
+
+	@ApiModelProperty(value = "回调信息")
+	@TableField("callback_content")
+	private String callbackContent;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/Attr.java

@@ -0,0 +1,33 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Attr")
+@TableName("attr")
+public class Attr extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "属性名")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "属性录入方式：0->手工录入；1->从列表中选取")
+	@TableField("input_type")
+	private Integer inputType;
+
+	@ApiModelProperty(value = "可选值列表[用逗号分隔]")
+	@TableField("select_list")
+	private String selectList;
+
+	@ApiModelProperty(value = "属性分组id")
+	@TableField("attr_group_id")
+	private Long attrGroupId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/AttrGroup.java

@@ -0,0 +1,29 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "AttrGroup")
+@TableName("attr_group")
+public class AttrGroup extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "组名")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "排序")
+	@TableField("sort")
+	private Integer sort;
+
+	@ApiModelProperty(value = "备注")
+	@TableField("remark")
+	private String remark;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/Category.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Category")
+@TableName("category")
+public class Category extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "分类名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "图标")
+	@TableField("img_url")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "父分类id")
+	@TableField("parent_id")
+	private Long parentId;
+
+	@ApiModelProperty(value = "是否显示[0-不显示，1显示]")
+	@TableField("status")
+	private Integer status;
+
+	@ApiModelProperty(value = "排序")
+	@TableField("sort")
+	private Integer sort;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/Comment.java

@@ -0,0 +1,65 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Comment")
+@TableName("comment")
+public class Comment extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "sku_id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "商品名字")
+	@TableField("sku_name")
+	private String skuName;
+
+	@ApiModelProperty(value = "会员昵称")
+	@TableField("nick_name")
+	private String nickName;
+
+	@ApiModelProperty(value = "用户头像")
+	@TableField("icon")
+	private String icon;
+
+	@ApiModelProperty(value = "星级")
+	@TableField("star")
+	private Boolean star;
+
+	@ApiModelProperty(value = "会员ip")
+	@TableField("ip")
+	private String ip;
+
+	@ApiModelProperty(value = "显示状态[0-不显示，1-显示]")
+	@TableField("status")
+	private Boolean status;
+
+	@ApiModelProperty(value = "点赞数")
+	@TableField("follow_count")
+	private Integer followCount;
+
+	@ApiModelProperty(value = "回复数")
+	@TableField("reply_count")
+	private Integer replyCount;
+
+	@ApiModelProperty(value = "评论图片/视频[json数据；[{type:文件类型,url:资源路径}]]")
+	@TableField("resources")
+	private String resources;
+
+	@ApiModelProperty(value = "内容")
+	@TableField("content")
+	private String content;
+
+	@ApiModelProperty(value = "评论类型[0 - 对商品的直接评论，1 - 对评论的回复]")
+	@TableField("type")
+	private Integer type;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/CommentReplay.java

@@ -0,0 +1,33 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "CommentReplay")
+@TableName("comment_replay")
+public class CommentReplay extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "commentId")
+	@TableField("comment_id")
+	private Long commentId;
+
+	@ApiModelProperty(value = "nickName")
+	@TableField("nick_name")
+	private String nickName;
+
+	@ApiModelProperty(value = "icon")
+	@TableField("icon")
+	private String icon;
+
+	@ApiModelProperty(value = "content")
+	@TableField("content")
+	private String content;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/SkuAttrValue.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "SkuAttrValue")
+@TableName("sku_attr_value")
+public class SkuAttrValue extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "属性id")
+	@TableField("attr_id")
+	private Long attrId;
+
+	@ApiModelProperty(value = "属性名")
+	@TableField("attr_name")
+	private String attrName;
+
+	@ApiModelProperty(value = "属性值")
+	@TableField("attr_value")
+	private String attrValue;
+
+	@ApiModelProperty(value = "顺序")
+	@TableField("sort")
+	private Integer sort;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/SkuImage.java

@@ -0,0 +1,33 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "SkuImages")
+@TableName("sku_image")
+public class SkuImage extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "sku_id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "图片名称")
+	@TableField("img_name")
+	private String imgName;
+
+	@ApiModelProperty(value = "图片地址")
+	@TableField("img_url")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "排序")
+	@TableField("sort")
+	private Integer sort;
+
+}

model/src/main/java/com/atguigu/ssyx/model/product/SkuInfo.java

@@ -0,0 +1,90 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(description = "SkuInfo")
+@TableName("sku_info")
+public class SkuInfo extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "分类id")
+	@TableField("category_id")
+	private Long categoryId;
+
+	@ApiModelProperty(value = "平台属性分组id")
+	@TableField("attr_group_id")
+	private Long attrGroupId;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	@TableField("sku_type")
+	private Integer skuType;
+
+	@ApiModelProperty(value = "spu名称")
+	@TableField("sku_name")
+	private String skuName;
+
+	@ApiModelProperty(value = "展示图片")
+	@TableField("img_url")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "限购个数/每天（0：不限购）")
+	@TableField("per_limit")
+	private Integer perLimit;
+
+	@ApiModelProperty(value = "上架状态：0->下架；1->上架")
+	@TableField("publish_status")
+	private Integer publishStatus;
+
+	@ApiModelProperty(value = "审核状态：0->未审核；1->审核通过")
+	@TableField("check_status")
+	private Integer checkStatus;
+
+	@ApiModelProperty(value = "是否新人专享：0->否；1->是")
+	@TableField("is_new_person")
+	private Integer isNewPerson;
+
+	@ApiModelProperty(value = "排序")
+	@TableField("sort")
+	private Integer sort;
+
+	@ApiModelProperty(value = "sku编码")
+	@TableField("sku_code")
+	private String skuCode;
+
+	@ApiModelProperty(value = "价格")
+	@TableField("price")
+	private BigDecimal price;
+
+	@ApiModelProperty(value = "市场价")
+	@TableField("market_price")
+	private BigDecimal marketPrice;
+
+	@ApiModelProperty(value = "库存")
+	@TableField("stock")
+	private Integer stock;
+
+	@ApiModelProperty(value = "锁定库存")
+	@TableField("lock_stock")
+	private Integer lockStock;
+
+	@ApiModelProperty(value = "预警库存")
+	@TableField("low_stock")
+	private Integer lowStock;
+
+	@ApiModelProperty(value = "销量")
+	@TableField("sale")
+	private Integer sale;
+
+	@ApiModelProperty(value = "仓库")
+	@TableField("ware_id")
+	private Long wareId;
+}

model/src/main/java/com/atguigu/ssyx/model/product/SkuPoster.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * SpuPoster
+ * </p>
+ *
+
+ */
+@Data
+@ApiModel(description = "SkuPoster")
+@TableName("sku_poster")
+public class SkuPoster extends BaseEntity {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "商品id")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "文件名称")
+	@TableField("img_name")
+	private String imgName;
+
+	@ApiModelProperty(value = "文件路径")
+	@TableField("img_url")
+	private String imgUrl;
+
+}
+

model/src/main/java/com/atguigu/ssyx/model/product/SkuStockHistory.java

@@ -0,0 +1,42 @@
+package com.atguigu.ssyx.model.product;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "SkuStockHistory")
+@TableName("sku_stock_history")
+public class SkuStockHistory extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "skuId")
+	@TableField("sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "销售价格")
+	@TableField("price")
+	private String price;
+
+	@ApiModelProperty(value = "库存")
+	@TableField("stock")
+	private Integer stock;
+
+	@ApiModelProperty(value = "销量")
+	@TableField("sale")
+	private Integer sale;
+
+	@ApiModelProperty(value = "销售日期")
+	@TableField("sale_date")
+	private Date saleDate;
+
+	@ApiModelProperty(value = "仓库")
+	@TableField("ware_id")
+	private Long wareId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/search/LeaderEs.java

@@ -0,0 +1,35 @@
+package com.atguigu.ssyx.model.search;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.elasticsearch.common.geo.GeoPoint;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.*;
+
+import java.util.Date;
+
+@Data
+@Document(indexName = "leaderes" ,shards = 3,replicas = 1)
+public class LeaderEs {
+
+    @Id
+    private Long id;
+
+    @Field(type = FieldType.Keyword, index = false)
+    private String takeName;
+
+    //https://blog.csdn.net/zaishijizhidian/article/details/81015988
+    @GeoPointField
+    private GeoPoint location; //x:经度 y:纬度
+
+    @Field(type = FieldType.Keyword, index = false)
+    private String storePath;
+
+    @Field(type = FieldType.Keyword, index = false)
+    private String detailAddress;
+
+    @Field(type = FieldType.Double, index = false)
+    private Double distance;
+}

model/src/main/java/com/atguigu/ssyx/model/search/SkuEs.java

@@ -0,0 +1,68 @@
+package com.atguigu.ssyx.model.search;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@Document(indexName = "skues" ,shards = 3,replicas = 1)
+public class SkuEs {
+
+    // 商品Id= skuId
+    @Id
+    private Long id;
+
+    @Field(type = FieldType.Text, analyzer = "ik_max_word")
+    private String keyword;
+
+    @Field(type = FieldType.Integer, index = false)
+    private Integer skuType;
+
+    @Field(type = FieldType.Integer, index = false)
+    private Integer isNewPerson;
+
+    @Field(type = FieldType.Long)
+    private Long categoryId;
+
+    @Field(type = FieldType.Text)
+    private String categoryName;
+
+    @Field(type = FieldType.Keyword, index = false)
+    private String imgUrl;
+
+    //  es 中能分词的字段，这个字段数据类型必须是 text！keyword 不分词！
+    @Field(type = FieldType.Text)
+    private String title;
+
+    @Field(type = FieldType.Double)
+    private Double price;
+
+    @Field(type = FieldType.Integer, index = false)
+    private Integer stock;
+
+    @Field(type = FieldType.Integer, index = false)
+    private Integer perLimit;
+
+    @Field(type = FieldType.Integer, index = false)
+    private Integer sale;
+
+    @Field(type = FieldType.Long)
+    private Long wareId;
+
+    //  商品的热度！
+    @Field(type = FieldType.Long)
+    private Long hotScore = 0L;
+
+    @Field(type = FieldType.Object, index = false)
+    private List<String> ruleList;
+
+}

model/src/main/java/com/atguigu/ssyx/model/sys/Region.java

@@ -0,0 +1,29 @@
+package com.atguigu.ssyx.model.sys;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Region")
+@TableName("region")
+public class Region extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "上级id")
+	@TableField("parent_id")
+	private Long parentId;
+
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "是否包含子节点")
+	@TableField(exist = false)
+	private boolean hasChildren;
+
+}

model/src/main/java/com/atguigu/ssyx/model/sys/RegionWare.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.model.sys;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "RegionWare")
+@TableName("region_ware")
+public class RegionWare extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "开通区域")
+	@TableField("region_id")
+	private Long regionId;
+
+	@ApiModelProperty(value = "区域名称")
+	@TableField("region_name")
+	private String regionName;
+
+	@ApiModelProperty(value = "仓库")
+	@TableField("ware_id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "仓库名称")
+	@TableField("ware_name")
+	private String wareName;
+
+	@ApiModelProperty(value = "状态（0：未开通 1：已开通）")
+	@TableField("status")
+	private Integer status;
+
+}

model/src/main/java/com/atguigu/ssyx/model/sys/Ware.java

@@ -0,0 +1,45 @@
+package com.atguigu.ssyx.model.sys;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Ware")
+@TableName("ware")
+public class Ware extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "省code")
+	@TableField("province")
+	private String province;
+
+	@ApiModelProperty(value = "城市code")
+	@TableField("city")
+	private String city;
+
+	@ApiModelProperty(value = "区域code")
+	@TableField("district")
+	private String district;
+
+	@ApiModelProperty(value = "详细地址")
+	@TableField("detail_address")
+	private String detailAddress;
+
+	@ApiModelProperty(value = "经度")
+	@TableField("longitude")
+	private String longitude;
+
+	@ApiModelProperty(value = "纬度")
+	@TableField("latitude")
+	private String latitude;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/Driver.java

@@ -0,0 +1,29 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "Driver")
+@TableName("driver")
+public class Driver extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "手机")
+	@TableField("phone")
+	private String phone;
+
+	@ApiModelProperty(value = "仓库id")
+	@TableField("ware_id")
+	private Long wareId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/Leader.java

@@ -0,0 +1,112 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "Leader")
+@TableName("leader")
+public class Leader extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户id")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "区域id")
+	@TableField("region_id")
+	private Long regionId;
+
+	@ApiModelProperty(value = "名称")
+	@TableField("name")
+	private String name;
+
+	@ApiModelProperty(value = "手机号码")
+	@TableField("phone")
+	private String phone;
+
+	@ApiModelProperty(value = "身份证")
+	@TableField("id_no")
+	private String idNo;
+
+	@ApiModelProperty(value = "身份证图片路径")
+	@TableField("id_no_url1")
+	private String idNoUrl1;
+
+	@ApiModelProperty(value = "身份证图片路径")
+	@TableField("id_no_url2")
+	private String idNoUrl2;
+
+	@ApiModelProperty(value = "提货点名称")
+	@TableField("take_name")
+	private String takeName;
+
+	@ApiModelProperty(value = "提货点类型；1->宝妈；2->便利店店主；3->快递站点；4->物业中心")
+	@TableField("take_type")
+	private String takeType;
+
+	@ApiModelProperty(value = "省c")
+	@TableField("province")
+	private Long province;
+
+	@ApiModelProperty(value = "城市")
+	@TableField("city")
+	private Long city;
+
+	@ApiModelProperty(value = "区域")
+	@TableField("district")
+	private Long district;
+
+	@ApiModelProperty(value = "详细地址")
+	@TableField("detail_address")
+	private String detailAddress;
+
+	@ApiModelProperty(value = "经度")
+	@TableField("longitude")
+	private Double longitude;
+
+	@ApiModelProperty(value = "纬度")
+	@TableField("latitude")
+	private Double latitude;
+
+	@ApiModelProperty(value = "有无门店")
+	@TableField("have_store")
+	private Integer haveStore;
+
+	@ApiModelProperty(value = "门店照片")
+	@TableField("store_path")
+	private String storePath;
+
+	@ApiModelProperty(value = "营业时间")
+	@TableField("work_time")
+	private String workTime;
+
+	@ApiModelProperty(value = "营业状态")
+	@TableField("work_status")
+	private Integer workStatus;
+
+	@ApiModelProperty(value = "审核状态")
+	@TableField("check_status")
+	private Integer checkStatus;
+
+	@ApiModelProperty(value = "审核时间")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@TableField("check_time")
+	private Date checkTime;
+
+	@ApiModelProperty(value = "审核用户")
+	@TableField("check_user")
+	private String checkUser;
+
+	@ApiModelProperty(value = "审核内容")
+	@TableField("check_content")
+	private String checkContent;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/LeaderAccount.java

@@ -0,0 +1,35 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+@ApiModel(description = "LeaderAccount")
+@TableName("leader_account")
+public class LeaderAccount extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "团长ID")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "总收益, 可能有部分余额因为订单未结束而不能提现")
+	@TableField("total_amount")
+	private BigDecimal totalAmount;
+
+	@ApiModelProperty(value = "可提现余额")
+	@TableField("available_amount")
+	private BigDecimal availableAmount;
+
+	@ApiModelProperty(value = "冻结余额")
+	@TableField("frozen_amount")
+	private BigDecimal frozenAmount;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/LeaderBank.java

@@ -0,0 +1,41 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "LeaderBank")
+@TableName("leader_bank")
+public class LeaderBank extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "团长ID")
+	@TableField("leader_id")
+	private String leaderId;
+
+	@ApiModelProperty(value = "账户类型(微信,银行)")
+	@TableField("account_type")
+	private String accountType;
+
+	@ApiModelProperty(value = "银行名称")
+	@TableField("bank_name")
+	private String bankName;
+
+	@ApiModelProperty(value = "银行账号")
+	@TableField("bank_account_no")
+	private String bankAccountNo;
+
+	@ApiModelProperty(value = "银行账户名")
+	@TableField("bank_account_name")
+	private String bankAccountName;
+
+	@ApiModelProperty(value = "微信ID")
+	@TableField("wechat_id")
+	private String wechatId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/LeaderBill.java

@@ -0,0 +1,61 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.enums.BillType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "LeaderBill")
+@TableName("leader_bill")
+public class LeaderBill extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "团长ID")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "账单类型")
+	@TableField("bill_type")
+	private BillType billType;
+
+	@ApiModelProperty(value = "业务编号")
+	@TableField("business_no")
+	private String businessNo;
+
+	@ApiModelProperty(value = "交易时间")
+	@TableField("bill_time")
+	private Date billTime;
+
+	@ApiModelProperty(value = "账单金额")
+	@TableField("bill_amount")
+	private BigDecimal billAmount;
+
+	@ApiModelProperty(value = "账单编号")
+	@TableField("bill_no")
+	private String billNo;
+
+	@ApiModelProperty(value = "账单描述")
+	@TableField("bill_desc")
+	private String billDesc;
+
+	@ApiModelProperty(value = "交易前资金余额")
+	@TableField("balance_before")
+	private BigDecimal balanceBefore;
+
+	@ApiModelProperty(value = "交易后资金余额")
+	@TableField("balance_after")
+	private BigDecimal balanceAfter;
+
+	@ApiModelProperty(value = "账单状态")
+	@TableField("bill_status")
+	private Integer billStatus;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/LeaderUser.java

@@ -0,0 +1,25 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "LeaderUser")
+@TableName("leader_user")
+public class LeaderUser extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "团长ID")
+	@TableField("leader_id")
+	private String leaderId;
+
+	@ApiModelProperty(value = "userId")
+	@TableField("user_id")
+	private Long userId;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/LeaderWithdraw.java

@@ -0,0 +1,90 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "LeaderWithdraw")
+@TableName("leader_withdraw")
+public class LeaderWithdraw extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "团长ID")
+	@TableField("leader_id")
+	private String leaderId;
+
+	@ApiModelProperty(value = "提现金额")
+	@TableField("merchant_amount")
+	private String merchantAmount;
+
+	@ApiModelProperty(value = "提现状态")
+	@TableField("merchant_status")
+	private String merchantStatus;
+
+	@ApiModelProperty(value = "提现失败原因")
+	@TableField("fail_reason")
+	private String failReason;
+
+	@ApiModelProperty(value = "提现支付方式")
+	@TableField("payment_method")
+	private String paymentMethod;
+
+	@ApiModelProperty(value = "银行名称")
+	@TableField("bank_name")
+	private String bankName;
+
+	@ApiModelProperty(value = "银行账号")
+	@TableField("bank_account_no")
+	private String bankAccountNo;
+
+	@ApiModelProperty(value = "银行账户名")
+	@TableField("bank_account_name")
+	private String bankAccountName;
+
+	@ApiModelProperty(value = "微信ID")
+	@TableField("wechat_id")
+	private String wechatId;
+
+	@ApiModelProperty(value = "提现时间")
+	@TableField("withdraw_time")
+	private Date withdrawTime;
+
+	@ApiModelProperty(value = "审核时间")
+	@TableField("verify_time")
+	private Date verifyTime;
+
+	@ApiModelProperty(value = "打款时间")
+	@TableField("transfer_time")
+	private Date transferTime;
+
+	@ApiModelProperty(value = "提现交易编号")
+	@TableField("withdraw_no")
+	private String withdrawNo;
+
+	@ApiModelProperty(value = "审核拒绝理由")
+	@TableField("reject_reason")
+	private String rejectReason;
+
+	@ApiModelProperty(value = "提现成功时间")
+	@TableField("complete_time")
+	private Date completeTime;
+
+	@ApiModelProperty(value = "提现金额")
+	@TableField("payment_amount")
+	private String paymentAmount;
+
+	@ApiModelProperty(value = "手续费")
+	@TableField("tax_amount")
+	private String taxAmount;
+
+	@ApiModelProperty(value = "备注")
+	@TableField("memo")
+	private String memo;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/User.java

@@ -0,0 +1,57 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.enums.UserType;
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "User")
+@TableName("user")
+public class User extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@TableField("user_type")
+	private UserType userType;
+
+	@ApiModelProperty(value = "会员头像")
+	@TableField("photo_url")
+	private String photoUrl;
+
+	@ApiModelProperty(value = "昵称")
+	@TableField("nick_name")
+	private String nickName;
+
+	@ApiModelProperty(value = "身份证号码")
+	@TableField("id_no")
+	private String idNo;
+
+	@ApiModelProperty(value = "性别")
+	@TableField("sex")
+	private String sex;
+
+	@ApiModelProperty(value = "电话号码")
+	@TableField("phone")
+	private String phone;
+
+	@ApiModelProperty(value = "备注")
+	@TableField("memo")
+	private String memo;
+
+	@ApiModelProperty(value = "小程序open id")
+	@TableField("open_id")
+	private String openId;
+
+	@ApiModelProperty(value = "微信开放平台unionID")
+	@TableField("union_id")
+	private String unionId;
+
+	@ApiModelProperty(value = "是否新用户")
+	@TableField("is_new")
+	private Integer isNew;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/UserDelivery.java

@@ -0,0 +1,33 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "UserDelivery")
+@TableName("user_delivery")
+public class UserDelivery extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "会员ID")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "团长id")
+	@TableField("leader_id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "仓库id")
+	@TableField("ware_id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "是否默认")
+	@TableField("is_default")
+	private Integer isDefault;
+
+}

model/src/main/java/com/atguigu/ssyx/model/user/UserLoginLog.java

@@ -0,0 +1,33 @@
+package com.atguigu.ssyx.model.user;
+
+import com.atguigu.ssyx.model.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(description = "UserLoginLog")
+@TableName("user_login_log")
+public class UserLoginLog extends BaseEntity {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "用户id")
+	@TableField("user_id")
+	private Long userId;
+
+	@ApiModelProperty(value = "登录ip")
+	@TableField("ip")
+	private String ip;
+
+	@ApiModelProperty(value = "登录城市")
+	@TableField("city")
+	private String city;
+
+	@ApiModelProperty(value = "登录类型【0-web，1-移动】")
+	@TableField("type")
+	private Boolean type;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/acl/AdminLoginVo.java

@@ -0,0 +1,24 @@
+package com.atguigu.ssyx.vo.acl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(description = "管理员登录信息")
+public class AdminLoginVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "管理员id")
+	private Long adminId;
+
+	@ApiModelProperty(value = "姓名")
+	private String name;
+
+	@ApiModelProperty(value = "仓库id")
+	private Long wareId;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/acl/AdminQueryVo.java

@@ -0,0 +1,32 @@
+//
+//
+package com.atguigu.ssyx.vo.acl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户查询实体
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "用户查询实体")
+public class AdminQueryVo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "用户名")
+	private String username;
+
+	@ApiModelProperty(value = "昵称")
+	private String name;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/acl/RoleQueryVo.java

@@ -0,0 +1,29 @@
+//
+//
+package com.atguigu.ssyx.vo.acl;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 角色查询实体
+ * </p>
+ *
+ * @author qy
+ * @since 2019-11-08
+ */
+@Data
+@ApiModel(description = "角色查询实体")
+public class RoleQueryVo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	
+	@ApiModelProperty(value = "角色名称")
+	private String roleName;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/activity/ActivityRuleVo.java

@@ -0,0 +1,30 @@
+package com.atguigu.ssyx.vo.activity;
+
+import com.atguigu.ssyx.model.activity.ActivityRule;
+import com.atguigu.ssyx.model.activity.ActivitySku;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+@ApiModel(description = "活动规则")
+public class ActivityRuleVo implements Serializable {
+   
+   private static final long serialVersionUID = 1L;
+
+   @ApiModelProperty(value = "活动id")
+   private Long activityId;
+   
+   @ApiModelProperty(value = "活动规则list")
+   private List<ActivityRule> activityRuleList;
+
+   @ApiModelProperty(value = "活动参与商品list")
+   private List<ActivitySku> activitySkuList;
+
+   @ApiModelProperty(value = "优惠券id列表")
+   private List<Long> couponIdList;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/activity/CouponRuleVo.java

@@ -0,0 +1,37 @@
+package com.atguigu.ssyx.vo.activity;
+
+import com.atguigu.ssyx.enums.CouponRangeType;
+import com.atguigu.ssyx.model.activity.CouponRange;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+@ApiModel(description = "优惠券规则")
+public class CouponRuleVo implements Serializable {
+   
+   private static final long serialVersionUID = 1L;
+
+   @ApiModelProperty(value = "优惠券id")
+   private Long couponId;
+
+   @ApiModelProperty(value = "范围类型")
+   private CouponRangeType rangeType;
+
+   @ApiModelProperty(value = "金额")
+   private BigDecimal amount;
+
+   @ApiModelProperty(value = "使用门槛 0->没门槛")
+   private BigDecimal conditionAmount;
+
+   @ApiModelProperty(value = "优惠券参与的商品list")
+   private List<CouponRange> couponRangeList;
+
+   @ApiModelProperty(value = "优惠券范围描述")
+   private String rangeDesc;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillQueryVo.java

@@ -0,0 +1,18 @@
+package com.atguigu.ssyx.vo.activity;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class SeckillQueryVo {
+	
+	@ApiModelProperty(value = "活动标题")
+	private String title;
+
+	@ApiModelProperty(value = "上下线状态")
+	private Integer status;
+
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuNoticeVo.java

@@ -0,0 +1,39 @@
+package com.atguigu.ssyx.vo.activity;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class SeckillSkuNoticeVo {
+	
+	@ApiModelProperty(value = "member_id")
+	private Long memberId;
+
+	@ApiModelProperty(value = "sku_id")
+	private Long skuId;
+
+	@ApiModelProperty(value = "活动场次id")
+	private Long sessionId;
+
+	@ApiModelProperty(value = "订阅时间")
+	private Date subcribeTime;
+
+	@ApiModelProperty(value = "发送时间")
+	private Date sendTime;
+
+	@ApiModelProperty(value = "通知方式[0-短信，1-邮件]")
+	private Boolean noticeType;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "删除标记（0:不可用 1:可用）")
+	private Integer isDeleted;
+
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuQueryVo.java

@@ -0,0 +1,17 @@
+package com.atguigu.ssyx.vo.activity;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class SeckillSkuQueryVo {
+	
+	@ApiModelProperty(value = "秒杀活动id")
+	private Long seckillId;
+
+	@ApiModelProperty(value = "活动场次id")
+	private Long seckillTimeId;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/activity/SeckillSkuVo.java

@@ -0,0 +1,58 @@
+package com.atguigu.ssyx.vo.activity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "秒杀商品信息")
+public class SeckillSkuVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "秒杀商品主键id")
+	private Long seckillSkuId;
+
+	@ApiModelProperty(value = "skuId")
+	private Long skuId;
+
+	@ApiModelProperty(value = "spu名称")
+	private String skuName;
+
+	@ApiModelProperty(value = "展示图片")
+	private String imgUrl;
+
+	@ApiModelProperty(value = "秒杀价格")
+	private BigDecimal seckillPrice;
+
+	@ApiModelProperty(value = "秒杀总量")
+	private Integer seckillStock;
+
+	@ApiModelProperty(value = "每人限购数量")
+	private Integer seckillLimit;
+
+	@ApiModelProperty(value = "秒杀销量")
+	private Integer seckillSale;
+
+	@ApiModelProperty(value = "场次名称")
+	private String timeName;
+
+	@ApiModelProperty(value = "每日开始时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private Date startTime;
+
+	@ApiModelProperty(value = "每日结束时间")
+	@JsonFormat(pattern = "HH:mm:ss")
+	private Date endTime;
+
+	@ApiModelProperty(value = "场次状态 1：已开抢 2：抢购中 3：即将开抢")
+	@TableField(exist = false)
+	private Integer timeStaus;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/order/CartInfoVo.java

@@ -0,0 +1,34 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.model.activity.ActivityRule;
+import com.atguigu.ssyx.model.order.CartInfo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * OrderDetailActivity
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+public class CartInfoVo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 购物项凑单，同一活动对应的最优活动规则
+	 */
+	@ApiModelProperty(value = "cartInfoList")
+	private List<CartInfo> cartInfoList;
+
+	@ApiModelProperty(value = "活动规则")
+	private ActivityRule activityRule;
+
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/OrderConfirmVo.java

@@ -0,0 +1,49 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.model.activity.CouponInfo;
+import com.atguigu.ssyx.vo.user.LeaderAddressVo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * OrderDetailActivity
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+public class OrderConfirmVo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "预生产订单号")
+	private String orderNo;
+
+	@ApiModelProperty(value = "用户对应的团长地址")
+	private LeaderAddressVo leaderAddressVo;
+	
+	@ApiModelProperty(value = "购物项列表")
+	private List<CartInfoVo> carInfoVoList;
+
+	@ApiModelProperty(value = "订单优惠券列表")
+    private List<CouponInfo> couponInfoList;
+
+	@ApiModelProperty(value = "促销优惠金额")
+	private BigDecimal activityReduceAmount;
+
+	@ApiModelProperty(value = "优惠券优惠金额")
+	private BigDecimal couponReduceAmount;
+
+	@ApiModelProperty(value = "购物车原始总金额")
+	private BigDecimal originalTotalAmount;
+
+	@ApiModelProperty(value = "最终总金额")
+	private BigDecimal totalAmount;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/OrderDeliverVo.java

@@ -0,0 +1,36 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@ApiModel(description = "OrderDeliver")
+public class OrderDeliverVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "配送日期")
+	@JsonFormat(pattern = "yyyy-MM-dd")
+	private Date deliverDate;
+
+	@ApiModelProperty(value = "团长id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "司机id")
+	private Long driverId;
+
+	@ApiModelProperty(value = "司机名称")
+	private String driverName;
+
+	@ApiModelProperty(value = "司机电话")
+	private String driverPhone;
+
+	@ApiModelProperty(value = "状态（0：默认，1：已发货，2：团长收货）")
+	private Integer status;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemMqVo.java

@@ -0,0 +1,25 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.enums.SkuType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(description = "OrderItem")
+public class OrderItemMqVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	private SkuType skuType;
+
+	@ApiModelProperty(value = "商品sku编号")
+	private Long skuId;
+
+	@ApiModelProperty(value = "商品购买的数量")
+	private Integer skuNum;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/order/OrderItemParamVo.java

@@ -0,0 +1,25 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.enums.SkuType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(description = "OrderItem")
+public class OrderItemParamVo implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	private SkuType skuType;
+
+	@ApiModelProperty(value = "商品sku编号")
+	private Long skuId;
+
+	@ApiModelProperty(value = "商品购买的数量")
+	private Integer skuNum;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/order/OrderMqVo.java

@@ -0,0 +1,36 @@
+package com.atguigu.ssyx.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <p>
+ * OrderDetailActivity
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+public class OrderMqVo implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
+	@ApiModelProperty(value = "团长id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "团长佣金")
+	private BigDecimal commissionAmount;
+
+	@ApiModelProperty(value = "订单项列表")
+	private List<OrderItemMqVo> orderItemMqVoList;
+
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/OrderQueryVo.java

@@ -0,0 +1,31 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.enums.OrderStatus;
+import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class OrderQueryVo {
+	
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
+	@ApiModelProperty(value = "收货人信息")
+	private String receiver;
+
+	@ApiModelProperty(value = "订单状态")
+	private OrderStatus orderStatus;
+
+	@ApiModelProperty(value = "团长id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "仓库id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "创建时间")
+	private String createTimeBegin;
+	private String createTimeEnd;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/OrderSubmitVo.java

@@ -0,0 +1,30 @@
+package com.atguigu.ssyx.vo.order;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderSubmitVo {
+
+	@ApiModelProperty(value = "使用预生产订单号防重")
+	private String orderNo;
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	@ApiModelProperty(value = "团长id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "收货人姓名")
+	private String receiverName;
+
+	@ApiModelProperty(value = "收货人电话")
+	private String receiverPhone;
+
+	@ApiModelProperty(value = "下单选中的优惠券id")
+	private Long couponId;
+
+//	@ApiModelProperty("购买的sku信息")
+//	private List<Long> skuIdList;
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/OrderUserQueryVo.java

@@ -0,0 +1,16 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.atguigu.ssyx.enums.OrderStatus;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OrderUserQueryVo {
+
+	private Long userId;
+
+	@ApiModelProperty(value = "订单状态")
+	private OrderStatus orderStatus;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/order/StockStatisticsVo.java

@@ -0,0 +1,21 @@
+package com.atguigu.ssyx.vo.order;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class StockStatisticsVo implements Serializable {
+
+    @ApiModelProperty(value = "skuId")
+    private Long skuId;
+
+    @ApiModelProperty(value = "销售价格")
+    private String price;
+
+    @ApiModelProperty(value = "销量")
+    @TableField("sale")
+    private Integer sale;
+}

model/src/main/java/com/atguigu/ssyx/vo/product/AttrGroupQueryVo.java

@@ -0,0 +1,14 @@
+package com.atguigu.ssyx.vo.product;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class AttrGroupQueryVo {
+	
+	@ApiModelProperty(value = "组名")
+	private String name;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/CategoryQueryVo.java

@@ -0,0 +1,14 @@
+package com.atguigu.ssyx.vo.product;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class CategoryQueryVo {
+	
+	@ApiModelProperty(value = "分类名称")
+	private java.lang.String name;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/CategoryVo.java

@@ -0,0 +1,20 @@
+package com.atguigu.ssyx.vo.product;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@ApiModel(description = "分类")
+public class CategoryVo  implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty(value = "分类id")
+	private Long id;
+
+	@ApiModelProperty(value = "分类名称")
+	private String name;
+}

model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoQueryVo.java

@@ -0,0 +1,20 @@
+package com.atguigu.ssyx.vo.product;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class SkuInfoQueryVo {
+	
+	@ApiModelProperty(value = "分类id")
+	private Long categoryId;
+
+	@ApiModelProperty(value = "商品类型：0->普通商品 1->秒杀商品")
+	private String skuType;
+
+	@ApiModelProperty(value = "spu名称")
+	private String keyword;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/SkuInfoVo.java

@@ -0,0 +1,26 @@
+package com.atguigu.ssyx.vo.product;
+
+import com.atguigu.ssyx.model.product.*;
+import com.atguigu.ssyx.model.product.SkuAttrValue;
+import com.atguigu.ssyx.model.product.SkuImage;
+import com.atguigu.ssyx.model.product.SkuInfo;
+import com.atguigu.ssyx.model.product.SkuPoster;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SkuInfoVo extends SkuInfo {
+
+	@ApiModelProperty(value = "海报列表")
+	private List<SkuPoster> skuPosterList;
+
+	@ApiModelProperty(value = "属性值")
+	private List<SkuAttrValue> skuAttrValueList;
+
+	@ApiModelProperty(value = "图片")
+	private List<SkuImage> skuImagesList;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockLockVo.java

@@ -0,0 +1,20 @@
+package com.atguigu.ssyx.vo.product;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SkuStockLockVo implements Serializable {
+
+	@ApiModelProperty(value = "skuId")
+	private Long skuId;
+
+	@ApiModelProperty(value = "sku个数")
+	private Integer skuNum;
+
+	@ApiModelProperty(value = "是否锁定")
+	private Boolean isLock = false;
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/SkuStockVo.java

@@ -0,0 +1,21 @@
+package com.atguigu.ssyx.vo.product;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class SkuStockVo implements Serializable {
+
+	@ApiModelProperty(value = "skuId")
+	private Long skuId;
+
+	@ApiModelProperty(value = "sku类型")
+	private Integer skuType;
+
+	@ApiModelProperty(value = "更新的库存数量")
+	private Integer stockNum;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/product/WareQueryVo.java

@@ -0,0 +1,42 @@
+package com.atguigu.ssyx.vo.product;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class WareQueryVo {
+	
+	@ApiModelProperty(value = "名称")
+	private String name;
+
+	@ApiModelProperty(value = "省code")
+	private String province;
+
+	@ApiModelProperty(value = "城市code")
+	private String city;
+
+	@ApiModelProperty(value = "区域code")
+	private String district;
+
+	@ApiModelProperty(value = "详细地址")
+	private String detailAddress;
+
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
+
+	@ApiModelProperty(value = "创建时间")
+	private Date createTime;
+
+	@ApiModelProperty(value = "更新时间")
+	private Date updateTime;
+
+	@ApiModelProperty(value = "删除标记（0:不可用 1:可用）")
+	private Integer isDeleted;
+
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/search/LeaderEsQueryVo.java

@@ -0,0 +1,13 @@
+package com.atguigu.ssyx.vo.search;
+
+import lombok.Data;
+
+// 封装查询条件
+@Data
+public class LeaderEsQueryVo {
+
+    double latitude = 39.9504550;
+    double longitude = 116.3512330;
+    double distance = 100;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/search/SkuEsQueryVo.java

@@ -0,0 +1,17 @@
+package com.atguigu.ssyx.vo.search;
+
+import lombok.Data;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+
+// 封装查询条件
+@Data
+public class SkuEsQueryVo {
+
+    private Long categoryId;;//三级分类id
+
+    private String keyword;//检索的关键字
+
+    private Long wareId;
+
+}

model/src/main/java/com/atguigu/ssyx/vo/sys/RegionVo.java

@@ -0,0 +1,17 @@
+package com.atguigu.ssyx.vo.sys;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RegionVo {
+
+	@ApiModelProperty(value = "开通区域")
+	private Long regionId;
+
+	@ApiModelProperty(value = "区域名称")
+	private String regionName;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/sys/RegionWareQueryVo.java

@@ -0,0 +1,14 @@
+package com.atguigu.ssyx.vo.sys;
+
+import lombok.Data;
+import java.util.Date;
+import io.swagger.annotations.ApiModelProperty;
+
+@Data
+public class RegionWareQueryVo {
+	
+	@ApiModelProperty(value = "关键字")
+	private String keyword;
+
+}
+

model/src/main/java/com/atguigu/ssyx/vo/user/LeaderAddressVo.java

@@ -0,0 +1,59 @@
+package com.atguigu.ssyx.vo.user;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * UserAddress
+ * </p>
+ *
+ * @author qy
+ */
+@Data
+@ApiModel(description = "用户地址")
+public class LeaderAddressVo {
+
+	@ApiModelProperty(value = "用户id")
+	private Long userId;
+
+	@ApiModelProperty(value = "团长id")
+	private Long leaderId;
+
+	@ApiModelProperty(value = "团长名称")
+	private String leaderName;
+
+	@ApiModelProperty(value = "团长电话")
+	private String leaderPhone;
+
+	@ApiModelProperty(value = "仓库id")
+	private Long wareId;
+
+	@ApiModelProperty(value = "提货点名称")
+	private String takeName;
+
+	@ApiModelProperty(value = "省")
+	private String province;
+
+	@ApiModelProperty(value = "城市")
+	private String city;
+
+	@ApiModelProperty(value = "区域")
+	private String district;
+
+	@ApiModelProperty(value = "详细地址")
+	private String detailAddress;
+
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+
+	@ApiModelProperty(value = "纬度")
+	private String latitude;
+
+	@ApiModelProperty(value = "门店照片")
+	private String storePath;
+
+}
+