Bladeren bron

门店/订单结构

Veronique 2 jaren geleden
bovenliggende
commit
a9740c313c

+ 80 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/BusinessOrder.java

@@ -0,0 +1,80 @@
+package com.dderp.common.entity.order;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 订单
+ */
+public class BusinessOrder extends BaseEntity {
+    private long id;
+
+    @Comment("订单名称--一般是门店名称+订单渠道")
+    private String orderName;
+
+    @Comment("订单编号")
+    private String orderCode;
+
+    @Comment("订单状态")
+    private int orderStatus;
+
+    @Comment("订单来源平台id")
+    private long incomePlatformId;
+
+    @Comment("订单来源平台")
+    private String incomePlatformName;
+
+    @Comment("来源平台的订单编号")
+    private String incomePlatformOrderCode;
+
+    @Comment("来源平台的下单时间")
+    private Date incomePlatformOrderTime;
+
+    @Comment("来源平台的下单时间")
+    private long incomePlatformOrderTimeLong;
+
+    @Comment("建议送达时间")
+    private Date suggestDeliverTime;
+
+    @Comment("建议送达时间")
+    private long suggestDeliverTimeLong;
+
+    @Comment("门店id")
+    private long idStore;
+
+    @Comment("门店名称")
+    private String storeName;
+
+    @Comment("配送费")
+    private BigDecimal deliverFee;
+
+    @Comment("配送距离")
+    private double deliverDistance;
+
+    @Comment("配送地址,仅用于订单查询,实际定位地址在订单配送结构内")
+    private String deliverAddressAll;
+
+    @Comment("配送平台id")
+    private long outGoingPlatformId;
+
+    @Comment("配送平台名称")
+    private String outGoingPlatformName;
+
+    @Comment("订单金额信息")
+    private OrderFinances orderFinances;
+
+    @Comment("订单详情")
+    private List<OrderDetailItem> detailItemList;
+
+    @Comment("订单配送信息")
+    private OrderDeliveryInfo orderDeliveryInfo;
+
+
+
+
+
+}

+ 49 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderDeliveryInfo.java

@@ -0,0 +1,49 @@
+package com.dderp.common.entity.order;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.dderp.common.entity.geo.GeoPoiLocation;
+import com.sweetfish.util.Comment;
+
+import java.util.Date;
+
+/**
+ * 订单配送信息
+ */
+public class OrderDeliveryInfo extends BaseEntity {
+    private long id;
+
+    private long idOrder;
+
+    @Comment("配送地-省")
+    private String deliverProvince;
+
+    @Comment("配送地-市")
+    private String deliverCity;
+
+    @Comment("配送地-区")
+    private String deliverDistract;
+
+    @Comment("配送地址")
+    private String deliverAddress;
+
+    @Comment("配送地的geo信息")
+    private GeoPoiLocation geoPoiLocation;
+
+    @Comment("收货人")
+    private String receiveMan;
+
+    @Comment("收货人电话")
+    private String contractPhone;
+
+    @Comment("配送时效 0立即配送/1预约配送")
+    private int deliverTimeliness;
+
+    @Comment("预约送达时间")
+    private Date bookingDeliverTime;
+
+    @Comment("客户要求的发票信息")
+    private String customerInvoiceInfo;
+
+    @Comment("客户备注")
+    private String customerMemo;
+}

+ 27 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderDetailItem.java

@@ -0,0 +1,27 @@
+package com.dderp.common.entity.order;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单详情,主要是明细
+ */
+public class OrderDetailItem extends BaseEntity {
+    private long id;
+
+    private long idOrder;
+
+    @Comment("项目名")
+    private String itemName;
+
+    @Comment("项目单价")
+    private BigDecimal itemPrice;
+
+    @Comment("项目数量")
+    private int itemCount;
+
+    @Comment("项目总价")
+    private BigDecimal itemMoney;
+}

+ 37 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderFinances.java

@@ -0,0 +1,37 @@
+package com.dderp.common.entity.order;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单金额信息,所有的金额加算,折扣类的记为负数
+ */
+public class OrderFinances extends BaseEntity {
+    private long id;
+
+    private long idOrder;
+
+    @Comment("订单金额")
+    private BigDecimal orderMoney;
+
+    @Comment("配送费")
+    private BigDecimal deliverFee;
+
+    @Comment("订单平台补贴")
+    private BigDecimal orderPlatformSubsidy;
+
+    @Comment("门店优惠")
+    private BigDecimal storeDiscount;
+
+    @Comment("客户实付")
+    private BigDecimal customerPaid;
+
+    @Comment("平台收取服务费")
+    private BigDecimal platformServiceFee;
+
+    @Comment("店铺实收金额")
+    private BigDecimal storeRealCollection;
+
+}

+ 187 - 0
ddCommon/src/main/java/com/dderp/common/entity/order/OrderStep.java

@@ -0,0 +1,187 @@
+package com.dderp.common.entity.order;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+import org.rex.db.RColumn;
+
+import java.util.Date;
+
+/**
+ * Created by jlutt on 2018-10-19.
+ * 订单脚印
+ *
+ * @author jlutt
+ */
+public class OrderStep extends BaseEntity {
+
+    @Comment("自增id")
+    private long id;
+
+    @Comment("订单id")
+    @RColumn("idorder")
+    private long idOrder;
+
+    @Comment("操作人")
+    @RColumn("idworkman")
+    private long idWorkMan;
+
+    @Comment("操作人")
+    @RColumn("workman")
+    private String workMan;
+
+    @Comment("操作时间")
+    @RColumn("worktime")
+    private Date workTime;
+
+    @Comment("操作时间")
+    private long workTimeLong;
+
+    @Comment("工作内容")
+    @RColumn("workmemo")
+    private String workMemo;
+
+    @Comment("工作说明")
+    @RColumn("workexplain")
+    private String workExplain;
+
+
+    public OrderStep() {
+
+    }
+
+    private OrderStep(Builder builder) {
+        setIdOrder(builder.idOrder);
+        setIdWorkMan(builder.idWorkMan);
+        setWorkMan(builder.workMan);
+        setWorkTime(builder.workTime);
+        setWorkTimeLong(builder.workTimeLong);
+        setWorkMemo(builder.workMemo);
+        setWorkExplain(builder.workExplain);
+    }
+
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public long getIdOrder() {
+        return idOrder;
+    }
+
+    public void setIdOrder(long idOrder) {
+        this.idOrder = idOrder;
+    }
+
+    public long getIdWorkMan() {
+        return idWorkMan;
+    }
+
+    public void setIdWorkMan(long idWorkMan) {
+        this.idWorkMan = idWorkMan;
+    }
+
+    public String getWorkMan() {
+        return workMan;
+    }
+
+    public void setWorkMan(String workMan) {
+        this.workMan = workMan;
+    }
+
+    public Date getWorkTime() {
+        return workTime;
+    }
+
+    public void setWorkTime(Date workTime) {
+        this.workTime = workTime;
+    }
+
+    public long getWorkTimeLong() {
+        return workTimeLong;
+    }
+
+    public void setWorkTimeLong(long workTimeLong) {
+        this.workTimeLong = workTimeLong;
+    }
+
+    public String getWorkMemo() {
+        return workMemo;
+    }
+
+    public void setWorkMemo(String workMemo) {
+        this.workMemo = workMemo;
+    }
+
+    public String getWorkExplain() {
+        return workExplain;
+    }
+
+    public void setWorkExplain(String workExplain) {
+        this.workExplain = workExplain;
+    }
+
+    public static final class Builder {
+        private long idOrder;
+        private long idWorkMan;
+        private String workMan;
+        private Date workTime;
+        private long workTimeLong;
+        private String workMemo;
+        private String workExplain;
+        private int orderYear;
+
+        private Builder() {
+        }
+
+        public Builder idOrder(long val) {
+            idOrder = val;
+            return this;
+        }
+
+        public Builder idWorkMan(long val) {
+            idWorkMan = val;
+            return this;
+        }
+
+        public Builder workMan(String val) {
+            workMan = val;
+            return this;
+        }
+
+        public Builder workTime(Date val) {
+            workTime = val;
+            return this;
+        }
+
+        public Builder workTimeLong(long val) {
+            workTimeLong = val;
+            return this;
+        }
+
+        public Builder workMemo(String val) {
+            workMemo = val;
+            return this;
+        }
+
+        public Builder workExplain(String val) {
+            workExplain = val;
+            return this;
+        }
+
+        public Builder orderYear(int val) {
+            orderYear = val;
+            return this;
+        }
+
+        public OrderStep build() {
+            return new OrderStep(this);
+        }
+    }
+}

+ 24 - 0
ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformInfo.java

@@ -0,0 +1,24 @@
+package com.dderp.common.entity.platform;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 平台档案
+ */
+public class PlatformInfo extends BaseEntity {
+    @Comment("")
+    private long id;
+
+    @Comment("平台名称")
+    private String platformName;
+
+    @Comment("平台类别 0订单平台/1配送平台")
+    private int platformType;
+
+    @Comment("平台接入需求")
+    private List<PlatformRequire> requireList = new ArrayList<>();
+}

+ 20 - 0
ddCommon/src/main/java/com/dderp/common/entity/platform/PlatformRequire.java

@@ -0,0 +1,20 @@
+package com.dderp.common.entity.platform;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+/**
+ * 平台接入需求档案
+ */
+public class PlatformRequire extends BaseEntity {
+    private long id;
+
+    @Comment("接入需求的显示名称")
+    private String requireName;
+
+    @Comment("接入需求唯一code")
+    private String requireCode;
+
+    @Comment("取值的选择类型")
+    private int valueType;
+}

+ 29 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreBrand.java

@@ -0,0 +1,29 @@
+package com.dderp.common.entity.store;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.math.BigDecimal;
+
+/**
+ * 门店品牌档案
+ */
+public class StoreBrand extends BaseEntity {
+    @Comment("")
+    private long id;
+
+    @Comment("品牌名称")
+    private String brandName;
+
+    @Comment("品牌logo")
+    private String brandLogoUrl;
+
+    @Comment("起送费")
+    private BigDecimal startingPrice;
+
+    @Comment("包装成本")
+    private BigDecimal packagingFee;
+
+    @Comment("品牌介绍")
+    private String brandMemo;
+}

+ 75 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreInfo.java

@@ -0,0 +1,75 @@
+package com.dderp.common.entity.store;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.dderp.common.entity.geo.GeoPoiLocation;
+import com.dderp.common.entity.site.ERPTokenUser;
+import com.sweetfish.util.Comment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 门店档案
+ */
+public class StoreInfo extends BaseEntity {
+    private long id;
+
+    @Comment("门店名称")
+    private String storeName;
+
+    @Comment("品牌id")
+    private long idBrand;
+
+    @Comment("品牌名称")
+    private String brandName;
+
+    @Comment("门店类型--此处取字典值即可")
+    private long idStoreType;
+
+    @Comment("门店编号-输入")
+    private String storeCodeInput;
+
+    @Comment("门店所在省")
+    private String storeProvince;
+
+    @Comment("门店所在市")
+    private String storeCity;
+
+    @Comment("门店所在区")
+    private String storeDistrict;
+
+    @Comment("门店地址")
+    private String storeAddress;
+
+    @Comment("门店geo信息")
+    private GeoPoiLocation location;
+
+    @Comment("门店联系电话")
+    private String contractPhone;
+
+    @Comment("门店老板的系统id")
+    private long storeBossId;
+
+    @Comment("门店营业执照编号")
+    private String companyLicenseNo;
+
+    @Comment("门店营业执照照片")
+    private String companyLicensePicUrl;
+
+    @Comment("法人身份证号")
+    private String legalPersonIdNo;
+
+    @Comment("法人姓名")
+    private String legalPersonName;
+
+    @Comment("门店开票信息")
+    private StoreInvoiceInfo invoiceInfo;
+
+    @Comment("员工")
+    private List<ERPTokenUser> employeeList = new ArrayList<>();
+
+    @Comment("门店已开通的平台,包含订单平台和配送平台")
+    private List<StorePlatform> platformList = new ArrayList<>();
+
+
+}

+ 28 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StoreInvoiceInfo.java

@@ -0,0 +1,28 @@
+package com.dderp.common.entity.store;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.math.BigDecimal;
+
+/**
+ * 门店发票档案
+ */
+public class StoreInvoiceInfo extends BaseEntity {
+    private long id;
+
+    @Comment("纳税人识别号")
+    private String taxIdNo;
+
+    @Comment("企业名称")
+    private String companyName;
+
+    @Comment("默认的开票项目")
+    private String defaultTaxItemName;
+
+    @Comment("默认税收分类编号")
+    private String defaultTaxItemCode;
+
+    @Comment("税率")
+    private BigDecimal taxRate;
+}

+ 29 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatform.java

@@ -0,0 +1,29 @@
+package com.dderp.common.entity.store;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 门店已开通的平台,包含订单和配送平台
+ */
+public class StorePlatform extends BaseEntity {
+    private long id;
+
+    @Comment("平台档案id")
+    private long idPlatformInfo;
+
+    @Comment("平台名称")
+    private String platformName;
+
+    @Comment("平台类别 0订单平台/1配送平台")
+    private int platformType;
+
+    @Comment("是否开通")
+    private int enableStatue;
+
+    @Comment("已填写的开通各平台需求的信息")
+    private List<StorePlatformRequire> requireList = new ArrayList<>();
+}

+ 24 - 0
ddCommon/src/main/java/com/dderp/common/entity/store/StorePlatformRequire.java

@@ -0,0 +1,24 @@
+package com.dderp.common.entity.store;
+
+import com.dderp.common.entity.base.BaseEntity;
+import com.sweetfish.util.Comment;
+
+/**
+ * 已填写的平台开通需求的信息
+ */
+public class StorePlatformRequire extends BaseEntity {
+    private long id;
+
+    @Comment("平台接入需求档案id")
+    private long idPlatformRequire;
+
+    @Comment("平台接入需求唯一code")
+    private String platformRequireCode;
+
+    @Comment("平台接入需求显示名称")
+    private String platformRequireName;
+
+    @Comment("项目值")
+    private String itemValue;
+
+}