添加实体类

src/main/java/com/caimei/entity/CmLogisticsBatch.java

@@ -0,0 +1,123 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 发货物流批次Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class CmLogisticsBatch implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	private Integer id;
+	private Integer shopOrderID;		// 子订单ID
+	private Integer orderID;		// 主订单ID
+	private Integer outStoreTimes;		// 第几批发货
+	private String status;	//是否确认收货（0：否，1：是）
+	private String mailer;		// 邮寄者  0 采美   1 供应商
+	private Integer shopID;		// 供应商ID
+	private String updateDate;	//更新时间
+	private String deliveryTime;		// 发货时间
+	private String receiptTime;		// 收货时间
+	List<CmLogisticsRecord> cmLogisticsRecords;//该批次订单商品记录
+	List<LogisticsInfo> logisticsInfos;//该批次物流信息
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getShopOrderID() {
+		return shopOrderID;
+	}
+
+	public void setShopOrderID(Integer shopOrderID) {
+		this.shopOrderID = shopOrderID;
+	}
+	
+	public Integer getOrderID() {
+		return orderID;
+	}
+
+	public void setOrderID(Integer orderID) {
+		this.orderID = orderID;
+	}
+	
+	public Integer getOutStoreTimes() {
+		return outStoreTimes;
+	}
+
+	public void setOutStoreTimes(Integer outStoreTimes) {
+		this.outStoreTimes = outStoreTimes;
+	}
+	
+	public String getMailer() {
+		return mailer;
+	}
+
+	public void setMailer(String mailer) {
+		this.mailer = mailer;
+	}
+	
+	public Integer getShopID() {
+		return shopID;
+	}
+
+	public void setShopID(Integer shopID) {
+		this.shopID = shopID;
+	}
+	
+	public String getDeliveryTime() {
+		return deliveryTime;
+	}
+
+	public void setDeliveryTime(String deliveryTime) {
+		this.deliveryTime = deliveryTime;
+	}
+	
+	public String getReceiptTime() {
+		return receiptTime;
+	}
+
+	public void setReceiptTime(String receiptTime) {
+		this.receiptTime = receiptTime;
+	}
+
+	public List<CmLogisticsRecord> getCmLogisticsRecords() {
+		return cmLogisticsRecords;
+	}
+
+	public void setCmLogisticsRecords(List<CmLogisticsRecord> cmLogisticsRecords) {
+		this.cmLogisticsRecords = cmLogisticsRecords;
+	}
+
+	public List<LogisticsInfo> getLogisticsInfos() {
+		return logisticsInfos;
+	}
+
+	public void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
+		this.logisticsInfos = logisticsInfos;
+	}
+
+	public String getUpdateDate() {
+		return updateDate;
+	}
+
+	public void setUpdateDate(String updateDate) {
+		this.updateDate = updateDate;
+	}
+
+	public String getStatus() {
+		return status;
+	}
+
+	public void setStatus(String status) {
+		this.status = status;
+	}
+}

src/main/java/com/caimei/entity/CmLogisticsRecord.java

@@ -0,0 +1,107 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+
+/**
+ * 发货物流记录Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class CmLogisticsRecord implements Serializable {
+	
+	private static final long serialVersionUID = 1L;
+	private Integer id;
+	private Integer logisticsBatchID;		// 发货物流批次ID
+	private Integer shopOrderID;		// 子订单ID
+	private Integer orderID;		// 主订单ID
+	private Integer orderProductID;		// 订单商品ID
+	private Integer buyNum;		// 商品购买数量
+	private Integer num;		// 此次发货数量
+	private Integer productID;		// 商品ID
+	private String productName;		// 商品名称
+	private String image;		// 商品图片
+
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getLogisticsBatchID() {
+		return logisticsBatchID;
+	}
+
+	public void setLogisticsBatchID(Integer logisticsBatchID) {
+		this.logisticsBatchID = logisticsBatchID;
+	}
+	
+	public Integer getShopOrderID() {
+		return shopOrderID;
+	}
+
+	public void setShopOrderID(Integer shopOrderID) {
+		this.shopOrderID = shopOrderID;
+	}
+	
+	public Integer getOrderID() {
+		return orderID;
+	}
+
+	public void setOrderID(Integer orderID) {
+		this.orderID = orderID;
+	}
+	
+	public Integer getOrderProductID() {
+		return orderProductID;
+	}
+
+	public void setOrderProductID(Integer orderProductID) {
+		this.orderProductID = orderProductID;
+	}
+	
+	public Integer getBuyNum() {
+		return buyNum;
+	}
+
+	public void setBuyNum(Integer buyNum) {
+		this.buyNum = buyNum;
+	}
+	
+	public Integer getNum() {
+		return num;
+	}
+
+	public void setNum(Integer num) {
+		this.num = num;
+	}
+	
+	public Integer getProductID() {
+		return productID;
+	}
+
+	public void setProductID(Integer productID) {
+		this.productID = productID;
+	}
+	
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+	
+	public String getImage() {
+		return image;
+	}
+
+	public void setImage(String image) {
+		this.image = image;
+	}
+
+	
+}

src/main/java/com/caimei/entity/CmOrderProduct.java

@@ -0,0 +1,82 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 订单商品Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class CmOrderProduct implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer orderProductID;        // orderProductID
+    private String orderNo;        // 主订单编号
+    private Integer orderID;        // 主订单ID
+    private Integer shopOrderID;        // 订单Id
+    private String shopOrderNo;        // 子订单编号
+    private Integer shopID;        // 供应商ID
+    private Integer productID;        // 商品Id
+    private Integer num;        // 购买数量
+    private Integer presentNum;        // 赠送数量
+    private String outStoreType;        // 出库类型 0 采美出库  1 供应商出库
+    private Integer skuID;        // skuId
+    private String props;        // sku属性
+    private String propName;        // 属性名
+    private String productNo;        // 商品编号
+    private Double price;        // 商品价格(协销 市场价 普通 购买价)
+    private Double normalPrice;        // 市场价 = 商品表市场价
+    private Double shopProductAmount;        // 商品费  =  成本价快照  *  (购买数量  + 赠品数量)
+    private Double costPrice;        // 快照商品成本价格
+    private Double price0;        // 记录普通用户购买时价格  活动价优先
+    private Double price1;        // 记录会员用户购买时价格  活动价优先
+    private Double totalAmount;        // 商品总价  = 价格X数量
+    private Double discount;        // 折扣比例
+    private Double discountPrice;        // 折后单价
+    private Double taxRate;        // 后台设置该商品税率
+    private Double addedValueTax;        // 单个税费=税率X折后单价
+    private Double totalAddedValueTax;        // 总税费=单个税费X购买数量
+    private Double shopFee;        // 该商品总的应付供应商金额
+    private Double otherFee;        // 该商品总的应付第三方金额
+    private Double cmFee;        // 该商品总的应付采美金额 (受赠品影响)
+    private Double singleShopFee;        // 后台设置的单个应付供应商金额
+    private Double singleOtherFee;        // 后台设置单个应付第三方金额
+    private Double singleCmFee;        // 后台计算的单个应付采美金额
+    private Double shouldPayFee;        // 总的应付金额
+    private Double totalFee;        // 订单总价  = 价格X数量 + 税费
+    private Double totalBeans;        // 获取到的总采美豆值
+    private Double useBalanceAmount;        // 使用余额金额
+    private Double preferential;        //优惠金额
+    private String commentFlag;        // 是否已评论：1是，空或0未评论
+    private Integer useBeanAmount;        // 使用采美豆数量
+    private Integer notOutStore;        // 未出库数量
+    private Integer cmbeanPrice;        // 当前采美豆专区价格(采美豆)
+    private String isGiftProduct;        // 是否是赠品：0:不是，1：是
+    private String productActInfo;        // 活动信息 已享受满XX减XX 之类
+    private String buyAgainFlag;        // 订单商品再次购买标识 0否 1是
+    private String confirmProductFlag;        // 订单商品供应商确认标志 0否 1是
+    private String payStatus;        // 支付状态 0 未付款 1 已付款
+    private Integer status;           //订单商品状态
+    private String shopName;        // 供应商名称
+    private String name;        // 商品名称
+    private Double discountFee; //经理折扣平分
+    private String isActProduct;//是否活动商品 0不是 1是
+    private String actType;//活动类型
+    private Double actPreferential;//活动优惠金额
+    private String productImage; //商品图片
+    private String productUnit;  //商品规格
+    private List<NewCmFinanceReceipts> newCmFinanceReceiptsList; //订单商品id对应一个进账记录  订单id对应多个
+    private Integer deliveryNum; // 发货数量
+    private String logisticsBatchID; // 发货批次ID
+    private Integer outStoreTimes;  // 发货批次
+    private String delFlag;
+    private String needSnCode;//是否需要Sn码： 0不需要  1需要填写sn码
+    private String productSnCode;//商品sn编码，一个订单商品存在多个编码用，隔开
+    private Integer receivedNum;    //已收数量
+    private Integer returningNum;   //退货退款中数量
+    private Integer returnedNum;   //已退数量
+    private Double shouldPayTotalTax;//  decimal(20,6) comment '总增值税（应付税费）',
+    private Integer cancelNum;  //退货退款取消数量
+}

src/main/java/com/caimei/entity/CmShopOrder.java

@@ -0,0 +1,503 @@
+package com.caimei.entity;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 子订单Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class CmShopOrder implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Integer shopOrderID;        // 子订单ID
+    private String shopOrderNo;        // 子订单编号
+    private String orderNo;        // 订单编号
+    private Integer orderID;        // 主订单ID
+    private Integer userID;        // 用户Id
+    private Integer shopID;        // 供应商Id
+    private String shopName;//供应商名称
+    private Integer orderSubmitType;        // 订单提交类型  星范订单暂时无数据
+    private Integer orderType;// 订单类型 1 自主  0 协销
+    private Integer itemCount;        // 购买数量
+    private Integer presentNum;     //赠品数
+    private Integer productNum;     //订单商品数
+    private Double productAmount;  // 商品总金额
+    private Double preferential;    //优惠金额
+    private Double totalAddedValueTax;    //总税费
+    private Double discountFee;        // 折扣金额
+    private Double accountAmount;        // 余额支付时使用的金额
+    private Double totalAmount;        // 订单总额
+    private String payFlag;        // 是否已支付：1是，0否
+    private String orderTime;        // 提交时间
+    private String payTime;        // 支付时间
+    private String deliveryTimeMills;        // 全部发货时间
+    private String receiveGoodsTime;        // 收货时间
+    private String finishTime;        // 订单完成时间
+    private Double discountAmount;//     float,
+    private Integer refundStatus;        // refundStatus
+    private Double needPayAmount;        // 需要支付金额 = 总金额 - 采美豆 - 余额 - 折扣-其它
+    private Double canRefundAmount;        // 可退款金额 = 余额抵扣金额
+    private Double refundAmount;        // 退款金额
+    private Integer canRefundFlag;        // 是否可以退货 1可以退款/退货 0不可退款/退货
+    private Integer useBalanceFlag;        // 是否使用余额
+    private Integer orderDeliveryID;        // 运费订单ID
+    private Double refundsAmount;        // 订单退款金额
+    private String orderStatusFlag;        // 订单状态标识，1:非退货退款订单、2：退货退款中、3退货退款完成
+    private String delFlag;
+    private String note;            //订单提交时备注
+    private String splitFlag;       //是否可以拆单
+    private long autoReceiveTimeMills;//订单自动收货时间
+    private long autoOverTimeMills;//订单完成无售后时间
+    private Integer outStoreNum;//已经发货的商品数量
+    private Integer outStoreTimes;//第几批发货  default 0
+    private Integer returnGoodsStatus;
+    private List<CmOrderProduct> cmOrderProducts; //订单商品信息
+    private UserInvoiceInfo orderInvoice;//订单发票信息
+    private List<LogisticsInfo> logisticsInfos;//订单快递信息
+    private List<CmLogisticsBatch> cmLogisticsBatches;//物流批次信息
+    private String payStatus;   //(付款供应商)付款状态：1待付款、2部分付款、3已付款'
+    private String sendOutStatus;   //发货状态：1待发货、2部分发货、3已发货
+    private Double shopProductAmount; //商品费
+    private Double shopPostFee; //付给供应商运费
+    private Double shopTaxFee; //付给供应商税费
+    private Double shouldPayShopAmount;//付供应商 = 商品费 + 运费 + 税费
+    private Double payedShopAmount; //已付款金额
+    private Double shopOtherFee; //付第三方
+
+
+    public Integer getShopOrderID() {
+        return shopOrderID;
+    }
+
+    public void setShopOrderID(Integer shopOrderID) {
+        this.shopOrderID = shopOrderID;
+    }
+
+    public String getShopOrderNo() {
+        return shopOrderNo;
+    }
+
+    public void setShopOrderNo(String shopOrderNo) {
+        this.shopOrderNo = shopOrderNo;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getOrderID() {
+        return orderID;
+    }
+
+    public void setOrderID(Integer orderID) {
+        this.orderID = orderID;
+    }
+
+    public Integer getUserID() {
+        return userID;
+    }
+
+    public void setUserID(Integer userID) {
+        this.userID = userID;
+    }
+
+    public Integer getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Integer shopID) {
+        this.shopID = shopID;
+    }
+
+    public Integer getOrderSubmitType() {
+        return orderSubmitType;
+    }
+
+    public void setOrderSubmitType(Integer orderSubmitType) {
+        this.orderSubmitType = orderSubmitType;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Integer getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(Integer itemCount) {
+        this.itemCount = itemCount;
+    }
+
+    public Integer getPresentNum() {
+        return presentNum;
+    }
+
+    public void setPresentNum(Integer presentNum) {
+        this.presentNum = presentNum;
+    }
+
+    public Integer getProductNum() {
+        return productNum;
+    }
+
+    public void setProductNum(Integer productNum) {
+        this.productNum = productNum;
+    }
+
+    public Double getProductAmount() {
+        return productAmount;
+    }
+
+    public void setProductAmount(Double productAmount) {
+        this.productAmount = productAmount;
+    }
+
+    public Double getPreferential() {
+        return preferential;
+    }
+
+    public void setPreferential(Double preferential) {
+        this.preferential = preferential;
+    }
+
+    public Double getTotalAddedValueTax() {
+        return totalAddedValueTax;
+    }
+
+    public void setTotalAddedValueTax(Double totalAddedValueTax) {
+        this.totalAddedValueTax = totalAddedValueTax;
+    }
+
+    public Double getDiscountFee() {
+        return discountFee;
+    }
+
+    public void setDiscountFee(Double discountFee) {
+        this.discountFee = discountFee;
+    }
+
+    public Double getAccountAmount() {
+        return accountAmount;
+    }
+
+    public void setAccountAmount(Double accountAmount) {
+        this.accountAmount = accountAmount;
+    }
+
+    public Double getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(Double totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public String getPayFlag() {
+        return payFlag;
+    }
+
+    public void setPayFlag(String payFlag) {
+        this.payFlag = payFlag;
+    }
+
+    public String getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(String orderTime) {
+        this.orderTime = orderTime;
+    }
+
+    public String getPayTime() {
+        return payTime;
+    }
+
+    public void setPayTime(String payTime) {
+        this.payTime = payTime;
+    }
+
+    public String getDeliveryTimeMills() {
+        return deliveryTimeMills;
+    }
+
+    public void setDeliveryTimeMills(String deliveryTimeMills) {
+        this.deliveryTimeMills = deliveryTimeMills;
+    }
+
+    public String getReceiveGoodsTime() {
+        return receiveGoodsTime;
+    }
+
+    public void setReceiveGoodsTime(String receiveGoodsTime) {
+        this.receiveGoodsTime = receiveGoodsTime;
+    }
+
+    public String getFinishTime() {
+        return finishTime;
+    }
+
+    public void setFinishTime(String finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public Double getDiscountAmount() {
+        return discountAmount;
+    }
+
+    public void setDiscountAmount(Double discountAmount) {
+        this.discountAmount = discountAmount;
+    }
+
+    public Integer getRefundStatus() {
+        return refundStatus;
+    }
+
+    public void setRefundStatus(Integer refundStatus) {
+        this.refundStatus = refundStatus;
+    }
+
+    public Double getNeedPayAmount() {
+        return needPayAmount;
+    }
+
+    public void setNeedPayAmount(Double needPayAmount) {
+        this.needPayAmount = needPayAmount;
+    }
+
+    public Double getCanRefundAmount() {
+        return canRefundAmount;
+    }
+
+    public void setCanRefundAmount(Double canRefundAmount) {
+        this.canRefundAmount = canRefundAmount;
+    }
+
+    public Double getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(Double refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public Integer getCanRefundFlag() {
+        return canRefundFlag;
+    }
+
+    public void setCanRefundFlag(Integer canRefundFlag) {
+        this.canRefundFlag = canRefundFlag;
+    }
+
+    public Integer getUseBalanceFlag() {
+        return useBalanceFlag;
+    }
+
+    public void setUseBalanceFlag(Integer useBalanceFlag) {
+        this.useBalanceFlag = useBalanceFlag;
+    }
+
+    public Integer getOrderDeliveryID() {
+        return orderDeliveryID;
+    }
+
+    public void setOrderDeliveryID(Integer orderDeliveryID) {
+        this.orderDeliveryID = orderDeliveryID;
+    }
+
+    public Double getRefundsAmount() {
+        return refundsAmount;
+    }
+
+    public void setRefundsAmount(Double refundsAmount) {
+        this.refundsAmount = refundsAmount;
+    }
+
+    public String getOrderStatusFlag() {
+        return orderStatusFlag;
+    }
+
+    public void setOrderStatusFlag(String orderStatusFlag) {
+        this.orderStatusFlag = orderStatusFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public String getSplitFlag() {
+        return splitFlag;
+    }
+
+    public void setSplitFlag(String splitFlag) {
+        this.splitFlag = splitFlag;
+    }
+
+    public long getAutoReceiveTimeMills() {
+        return autoReceiveTimeMills;
+    }
+
+    public void setAutoReceiveTimeMills(long autoReceiveTimeMills) {
+        this.autoReceiveTimeMills = autoReceiveTimeMills;
+    }
+
+    public long getAutoOverTimeMills() {
+        return autoOverTimeMills;
+    }
+
+    public void setAutoOverTimeMills(long autoOverTimeMills) {
+        this.autoOverTimeMills = autoOverTimeMills;
+    }
+
+    public Integer getOutStoreNum() {
+        return outStoreNum;
+    }
+
+    public void setOutStoreNum(Integer outStoreNum) {
+        this.outStoreNum = outStoreNum;
+    }
+
+    public Integer getOutStoreTimes() {
+        return outStoreTimes;
+    }
+
+    public void setOutStoreTimes(Integer outStoreTimes) {
+        this.outStoreTimes = outStoreTimes;
+    }
+
+    public Integer getReturnGoodsStatus() {
+        return returnGoodsStatus;
+    }
+
+    public void setReturnGoodsStatus(Integer returnGoodsStatus) {
+        this.returnGoodsStatus = returnGoodsStatus;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public List<CmOrderProduct> getCmOrderProducts() {
+        return cmOrderProducts;
+    }
+
+    public void setCmOrderProducts(List<CmOrderProduct> cmOrderProducts) {
+        this.cmOrderProducts = cmOrderProducts;
+    }
+
+    public UserInvoiceInfo getOrderInvoice() {
+        return orderInvoice;
+    }
+
+    public void setOrderInvoice(UserInvoiceInfo orderInvoice) {
+        this.orderInvoice = orderInvoice;
+    }
+
+    public List<LogisticsInfo> getLogisticsInfos() {
+        return logisticsInfos;
+    }
+
+    public void setLogisticsInfos(List<LogisticsInfo> logisticsInfos) {
+        this.logisticsInfos = logisticsInfos;
+    }
+
+    public List<CmLogisticsBatch> getCmLogisticsBatches() {
+        return cmLogisticsBatches;
+    }
+
+    public void setCmLogisticsBatches(List<CmLogisticsBatch> cmLogisticsBatches) {
+        this.cmLogisticsBatches = cmLogisticsBatches;
+    }
+
+    public String getPayStatus() {
+        return payStatus;
+    }
+
+    public void setPayStatus(String payStatus) {
+        this.payStatus = payStatus;
+    }
+
+    public String getSendOutStatus() {
+        return sendOutStatus;
+    }
+
+    public void setSendOutStatus(String sendOutStatus) {
+        this.sendOutStatus = sendOutStatus;
+    }
+
+    public Double getShopProductAmount() {
+        return shopProductAmount;
+    }
+
+    public void setShopProductAmount(Double shopProductAmount) {
+        this.shopProductAmount = shopProductAmount;
+    }
+
+    public Double getShopPostFee() {
+        return shopPostFee;
+    }
+
+    public void setShopPostFee(Double shopPostFee) {
+        this.shopPostFee = shopPostFee;
+    }
+
+    public Double getShopTaxFee() {
+        return shopTaxFee;
+    }
+
+    public void setShopTaxFee(Double shopTaxFee) {
+        this.shopTaxFee = shopTaxFee;
+    }
+
+    public Double getShouldPayShopAmount() {
+        return shouldPayShopAmount;
+    }
+
+    public void setShouldPayShopAmount(Double shouldPayShopAmount) {
+        this.shouldPayShopAmount = shouldPayShopAmount;
+    }
+
+    public Double getPayedShopAmount() {
+        return payedShopAmount;
+    }
+
+    public void setPayedShopAmount(Double payedShopAmount) {
+        this.payedShopAmount = payedShopAmount;
+    }
+
+    public Double getShopOtherFee() {
+        return shopOtherFee;
+    }
+
+    public void setShopOtherFee(Double shopOtherFee) {
+        this.shopOtherFee = shopOtherFee;
+    }
+}

src/main/java/com/caimei/entity/LogisticsInfo.java

@@ -0,0 +1,162 @@
+package com.caimei.entity;
+
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 物流跟踪信息Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class LogisticsInfo implements Serializable{
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    private Integer type;//类型：1 采美365  2 呵呵商城
+    private Long orderID;//订单ID
+    private Integer logisticsBatchID;//发货批次表ID
+    private Integer shopOrderID;//子订单ID
+    private Integer orderProductID;//订单商品ID
+    private String nu;//快递单号
+    private Integer state;//快递单当前的状态0：在途 1：揽件 2：疑难3：签收4：退签5：派件6：退回
+    private String info;//物流跟踪信息
+    private String logisticsCompanyName;//物流公司名称
+    private String logisticsCompanyCode;//物流公司代码
+    private Long shopID;//供应商ID
+    private Date updateDate;//最后更新时间
+    private String remarks;//备注
+
+    private List<Router> routers= new ArrayList<>();//此对象使用在转换info格式提供前端使用。JSONArray.parseArray(info, Router.class)
+
+
+    public LogisticsInfo() {
+    }
+
+    public LogisticsInfo(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Long getOrderID() {
+        return orderID;
+    }
+
+    public void setOrderID(Long orderID) {
+        this.orderID = orderID;
+    }
+
+    public Integer getLogisticsBatchID() {
+        return logisticsBatchID;
+    }
+
+    public void setLogisticsBatchID(Integer logisticsBatchID) {
+        this.logisticsBatchID = logisticsBatchID;
+    }
+
+    public Integer getShopOrderID() {
+        return shopOrderID;
+    }
+
+    public void setShopOrderID(Integer shopOrderID) {
+        this.shopOrderID = shopOrderID;
+    }
+
+    public Integer getOrderProductID() {
+        return orderProductID;
+    }
+
+    public void setOrderProductID(Integer orderProductID) {
+        this.orderProductID = orderProductID;
+    }
+
+    public String getNu() {
+        return nu;
+    }
+
+    public void setNu(String nu) {
+        this.nu = nu;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+    public void setInfo(String info) {
+        this.info = info;
+    }
+
+    public String getLogisticsCompanyName() {
+        return logisticsCompanyName;
+    }
+
+    public void setLogisticsCompanyName(String logisticsCompanyName) {
+        this.logisticsCompanyName = logisticsCompanyName;
+    }
+
+    public String getLogisticsCompanyCode() {
+        return logisticsCompanyCode;
+    }
+
+    public void setLogisticsCompanyCode(String logisticsCompanyCode) {
+        this.logisticsCompanyCode = logisticsCompanyCode;
+    }
+
+    public Long getShopID() {
+        return shopID;
+    }
+
+    public void setShopID(Long shopID) {
+        this.shopID = shopID;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public List<Router> getRouters() {
+        return routers;
+    }
+
+    public void setRouters(List<Router> routers) {
+        this.routers = routers;
+    }
+}

src/main/java/com/caimei/entity/NewCmFinanceReceipts.java

@@ -0,0 +1,305 @@
+package com.caimei.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 进账信息Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class NewCmFinanceReceipts implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    private Integer id;
+    private String status;        // 状态 1待支付 2待财务确认 3已收到款 4未收到款 9交易关闭
+    private Integer orderId;        // 订单ID
+    private Integer userId;        // 用户ID
+    private Integer clubId;        // 机构ID
+    private String orderSequence;        //订单序列号-- 订单编号(主订单)+序列ID
+    private Integer orderSubmitType;        // :个人自己下单 1:企业自己下单 2:员工帮机构下单 3:协销帮机构下单  4:后台下单 5:采美豆订单
+    private Integer orderType;        // 订单类型 协销订单 0 普通订单 1
+    private String transactionNum;        // 交易号
+    private String orderProductIds;        // 订单商品ID，多个用逗号隔开
+    private String payWay;          // 支付方式
+    private Double totalAmount;        // 总金额/总价
+    private Double deductionAmount;        // 抵扣总额
+    private Double shouldPayAmount;        // 应付总额
+    private Integer bankID;             //银行卡ID
+    private String bankCode;            //银行卡号
+    private Integer kuaiQianPayTypeID;      //快钱支付类型ID
+    private Integer kuaiQianPayerID;        //块钱支付ID
+    private String rePayFlag;               //支付状态 1支付成功
+    private String delFlag;
+    private Date receiptsDate;        // 进账时间
+    private Date auditDate;        // 审核时间
+    private Double actualAmount;    //支付金额
+    private Double useBalanceAmount;//余额支付金额
+    private Double refundAmount;    //可退金额
+    private Double preferential;    //优惠金额
+    private String formData;        //支付返回数据
+    private String proberlem;       //支付问题
+
+    private String createBy;
+    private String createDate;
+    private String updateBy;
+    private String updateDate;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getOrderSequence() {
+        return orderSequence;
+    }
+
+    public void setOrderSequence(String orderSequence) {
+        this.orderSequence = orderSequence;
+    }
+
+
+    public String getTransactionNum() {
+        return transactionNum;
+    }
+
+    public void setTransactionNum(String transactionNum) {
+        this.transactionNum = transactionNum;
+    }
+
+    public String getOrderProductIds() {
+        return orderProductIds;
+    }
+
+    public void setOrderProductIds(String orderProductIds) {
+        this.orderProductIds = orderProductIds;
+    }
+
+    public String getPayWay() {
+        return payWay;
+    }
+
+    public void setPayWay(String payWay) {
+        this.payWay = payWay;
+    }
+
+    public Date getReceiptsDate() {
+        return receiptsDate;
+    }
+
+    public void setReceiptsDate(Date receiptsDate) {
+        this.receiptsDate = receiptsDate;
+    }
+
+    public Date getAuditDate() {
+        return auditDate;
+    }
+
+    public void setAuditDate(Date auditDate) {
+        this.auditDate = auditDate;
+    }
+
+    public Integer getBankID() {
+        return bankID;
+    }
+
+    public void setBankID(Integer bankID) {
+        this.bankID = bankID;
+    }
+
+    public String getBankCode() {
+        return bankCode;
+    }
+
+    public void setBankCode(String bankCode) {
+        this.bankCode = bankCode;
+    }
+
+    public Integer getKuaiQianPayTypeID() {
+        return kuaiQianPayTypeID;
+    }
+
+    public void setKuaiQianPayTypeID(Integer kuaiQianPayTypeID) {
+        this.kuaiQianPayTypeID = kuaiQianPayTypeID;
+    }
+
+    public Integer getKuaiQianPayerID() {
+        return kuaiQianPayerID;
+    }
+
+    public void setKuaiQianPayerID(Integer kuaiQianPayerID) {
+        this.kuaiQianPayerID = kuaiQianPayerID;
+    }
+
+    public String getRePayFlag() {
+        return rePayFlag;
+    }
+
+    public void setRePayFlag(String rePayFlag) {
+        this.rePayFlag = rePayFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(Integer orderId) {
+        this.orderId = orderId;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
+
+    public Integer getClubId() {
+        return clubId;
+    }
+
+    public void setClubId(Integer clubId) {
+        this.clubId = clubId;
+    }
+
+    public Integer getOrderSubmitType() {
+        return orderSubmitType;
+    }
+
+    public void setOrderSubmitType(Integer orderSubmitType) {
+        this.orderSubmitType = orderSubmitType;
+    }
+
+    public Integer getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(Integer orderType) {
+        this.orderType = orderType;
+    }
+
+    public Double getTotalAmount() {
+        return totalAmount;
+    }
+
+    public void setTotalAmount(Double totalAmount) {
+        this.totalAmount = totalAmount;
+    }
+
+    public Double getDeductionAmount() {
+        return deductionAmount;
+    }
+
+    public void setDeductionAmount(Double deductionAmount) {
+        this.deductionAmount = deductionAmount;
+    }
+
+    public Double getShouldPayAmount() {
+        return shouldPayAmount;
+    }
+
+    public void setShouldPayAmount(Double shouldPayAmount) {
+        this.shouldPayAmount = shouldPayAmount;
+    }
+
+    public Double getActualAmount() {
+        return actualAmount;
+    }
+
+    public void setActualAmount(Double actualAmount) {
+        this.actualAmount = actualAmount;
+    }
+
+    public Double getRefundAmount() {
+        return refundAmount;
+    }
+
+    public void setRefundAmount(Double refundAmount) {
+        this.refundAmount = refundAmount;
+    }
+
+    public Double getPreferential() {
+        return preferential;
+    }
+
+    public void setPreferential(Double preferential) {
+        this.preferential = preferential;
+    }
+
+    public String getFormData() {
+        return formData;
+    }
+
+    public void setFormData(String formData) {
+        this.formData = formData;
+    }
+
+    public String getProberlem() {
+        return proberlem;
+    }
+
+    public void setProberlem(String proberlem) {
+        this.proberlem = proberlem;
+    }
+
+    public Double getUseBalanceAmount() {
+        return useBalanceAmount;
+    }
+
+    public void setUseBalanceAmount(Double useBalanceAmount) {
+        this.useBalanceAmount = useBalanceAmount;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public String getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(String createDate) {
+        this.createDate = createDate;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public String getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(String updateDate) {
+        this.updateDate = updateDate;
+    }
+}

src/main/java/com/caimei/entity/Router.java

@@ -0,0 +1,38 @@
+package com.caimei.entity;
+
+
+/**
+ * 物流跟踪信息描述Entity
+ *
+ * @author 李俊
+ * @version 2019-12-17
+ */
+public class Router {
+
+    private  String desc;//描述
+    private  String time;//时间
+
+    public Router() {
+    }
+
+    public Router(String desc, String time) {
+        this.desc = desc;
+        this.time = time;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}