From 6e0aab290d838001f45360f9604d3f90384bad16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= Date: Sat, 16 Mar 2024 18:02:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96tao=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/qihang/oms/domain/TaoGoodsSku.java | 462 +++++ .../java/com/qihang/oms/domain/TaoOrder.java | 1783 +++++++++++++++++ .../com/qihang/oms/domain/TaoOrderItem.java | 930 +++++++++ .../qihang/oms/mapper/TaoGoodsSkuMapper.java | 18 + .../qihang/oms/mapper/TaoOrderItemMapper.java | 18 + .../com/qihang/oms/mapper/TaoOrderMapper.java | 18 + .../oms/service/TaoGoodsSkuService.java | 13 + .../oms/service/TaoOrderItemService.java | 13 + .../qihang/oms/service/TaoOrderService.java | 13 + .../oms/service/impl/OOrderServiceImpl.java | 47 +- .../service/impl/TaoGoodsSkuServiceImpl.java | 22 + .../service/impl/TaoOrderItemServiceImpl.java | 22 + .../oms/service/impl/TaoOrderServiceImpl.java | 22 + .../resources/mapper/TaoGoodsSkuMapper.xml | 38 + .../resources/mapper/TaoOrderItemMapper.xml | 64 + .../main/resources/mapper/TaoOrderMapper.xml | 118 ++ .../tao/controller/OrderApiController.java | 4 +- .../tao/service/impl/TaoOrderServiceImpl.java | 1 + vue/package.json | 2 +- vue/src/api/login.js | 24 +- vue/src/components/ZhiJian/Doc/index.vue | 21 - vue/src/components/ZhiJian/Git/index.vue | 21 - vue/src/layout/components/Navbar.vue | 6 +- vue/src/router/index.js | 5 - vue/src/views/login.vue | 20 +- vue/src/views/register.vue | 209 -- 26 files changed, 3606 insertions(+), 308 deletions(-) create mode 100644 oms-api/src/main/java/com/qihang/oms/domain/TaoGoodsSku.java create mode 100644 oms-api/src/main/java/com/qihang/oms/domain/TaoOrder.java create mode 100644 oms-api/src/main/java/com/qihang/oms/domain/TaoOrderItem.java create mode 100644 oms-api/src/main/java/com/qihang/oms/mapper/TaoGoodsSkuMapper.java create mode 100644 oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderItemMapper.java create mode 100644 oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderMapper.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/TaoGoodsSkuService.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/TaoOrderItemService.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/TaoOrderService.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/TaoGoodsSkuServiceImpl.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderItemServiceImpl.java create mode 100644 oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderServiceImpl.java create mode 100644 oms-api/src/main/resources/mapper/TaoGoodsSkuMapper.xml create mode 100644 oms-api/src/main/resources/mapper/TaoOrderItemMapper.xml create mode 100644 oms-api/src/main/resources/mapper/TaoOrderMapper.xml delete mode 100644 vue/src/components/ZhiJian/Doc/index.vue delete mode 100644 vue/src/components/ZhiJian/Git/index.vue delete mode 100644 vue/src/views/register.vue diff --git a/oms-api/src/main/java/com/qihang/oms/domain/TaoGoodsSku.java b/oms-api/src/main/java/com/qihang/oms/domain/TaoGoodsSku.java new file mode 100644 index 00000000..1db5a106 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/domain/TaoGoodsSku.java @@ -0,0 +1,462 @@ +package com.qihang.oms.domain; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @TableName tao_goods_sku + */ +public class TaoGoodsSku implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 外键id + */ + private Long taoGoodsId; + + /** + * sku所属商品数字id + */ + private Long numIid; + + /** + * sku所属商品id(注意：iid近期即将废弃，请用num_iid参数) + */ + private String iid; + + /** + * 商品skuid，阿里 + */ + private Long skuId; + + /** + * sku的销售属性组合字符串（颜色，大小，等等，可通过类目API获取某类目下的销售属性）,格式是p1:v1;p2:v2 + */ + private String properties; + + /** + * sku所对应的销售属性的中文名字串，格式如：pid1:vid1:pid_name1:vid_name1;pid2:vid2:pid_name2:vid_name2…… + */ + private String propertiesName; + + /** + * 属于这个sku的商品的数量， + */ + private Long quantity; + + /** + * specId + */ + private String spec; + + /** + * 属于这个sku的商品的价格 取值范围:0-100000000;精确到2位小数;单位:元。如:200.07，表示:200元7分。 + */ + private Double price; + + /** + * 商家设置的外部id。 + */ + private String outerId; + + /** + * sku创建日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + private Date created; + + /** + * sku最后修改日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + private Date modified; + + /** + * sku状态。 normal + */ + private String status; + + /** + * 表示SKu上的产品规格信息 + */ + private String skuSpecId; + + /** + * 商品级别的条形码 + */ + private String barcode; + + /** + * erp商品SKUid + */ + private Long erpGoodsSkuId; + + /** + * erp商品id + */ + private Long erpGoodsId; + + /** + * 创建时间 + */ + private Date createTime; + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + public Long getId() { + return id; + } + + /** + * 主键id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 外键id + */ + public Long getTaoGoodsId() { + return taoGoodsId; + } + + /** + * 外键id + */ + public void setTaoGoodsId(Long taoGoodsId) { + this.taoGoodsId = taoGoodsId; + } + + /** + * sku所属商品数字id + */ + public Long getNumIid() { + return numIid; + } + + /** + * sku所属商品数字id + */ + public void setNumIid(Long numIid) { + this.numIid = numIid; + } + + /** + * sku所属商品id(注意：iid近期即将废弃，请用num_iid参数) + */ + public String getIid() { + return iid; + } + + /** + * sku所属商品id(注意：iid近期即将废弃，请用num_iid参数) + */ + public void setIid(String iid) { + this.iid = iid; + } + + /** + * 商品skuid，阿里 + */ + public Long getSkuId() { + return skuId; + } + + /** + * 商品skuid，阿里 + */ + public void setSkuId(Long skuId) { + this.skuId = skuId; + } + + /** + * sku的销售属性组合字符串（颜色，大小，等等，可通过类目API获取某类目下的销售属性）,格式是p1:v1;p2:v2 + */ + public String getProperties() { + return properties; + } + + /** + * sku的销售属性组合字符串（颜色，大小，等等，可通过类目API获取某类目下的销售属性）,格式是p1:v1;p2:v2 + */ + public void setProperties(String properties) { + this.properties = properties; + } + + /** + * sku所对应的销售属性的中文名字串，格式如：pid1:vid1:pid_name1:vid_name1;pid2:vid2:pid_name2:vid_name2…… + */ + public String getPropertiesName() { + return propertiesName; + } + + /** + * sku所对应的销售属性的中文名字串，格式如：pid1:vid1:pid_name1:vid_name1;pid2:vid2:pid_name2:vid_name2…… + */ + public void setPropertiesName(String propertiesName) { + this.propertiesName = propertiesName; + } + + /** + * 属于这个sku的商品的数量， + */ + public Long getQuantity() { + return quantity; + } + + /** + * 属于这个sku的商品的数量， + */ + public void setQuantity(Long quantity) { + this.quantity = quantity; + } + + /** + * specId + */ + public String getSpec() { + return spec; + } + + /** + * specId + */ + public void setSpec(String spec) { + this.spec = spec; + } + + /** + * 属于这个sku的商品的价格 取值范围:0-100000000;精确到2位小数;单位:元。如:200.07，表示:200元7分。 + */ + public Double getPrice() { + return price; + } + + /** + * 属于这个sku的商品的价格 取值范围:0-100000000;精确到2位小数;单位:元。如:200.07，表示:200元7分。 + */ + public void setPrice(Double price) { + this.price = price; + } + + /** + * 商家设置的外部id。 + */ + public String getOuterId() { + return outerId; + } + + /** + * 商家设置的外部id。 + */ + public void setOuterId(String outerId) { + this.outerId = outerId; + } + + /** + * sku创建日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + public Date getCreated() { + return created; + } + + /** + * sku创建日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + public void setCreated(Date created) { + this.created = created; + } + + /** + * sku最后修改日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + public Date getModified() { + return modified; + } + + /** + * sku最后修改日期 时间格式：yyyy-MM-dd HH:mm:ss + */ + public void setModified(Date modified) { + this.modified = modified; + } + + /** + * sku状态。 normal + */ + public String getStatus() { + return status; + } + + /** + * sku状态。 normal + */ + public void setStatus(String status) { + this.status = status; + } + + /** + * 表示SKu上的产品规格信息 + */ + public String getSkuSpecId() { + return skuSpecId; + } + + /** + * 表示SKu上的产品规格信息 + */ + public void setSkuSpecId(String skuSpecId) { + this.skuSpecId = skuSpecId; + } + + /** + * 商品级别的条形码 + */ + public String getBarcode() { + return barcode; + } + + /** + * 商品级别的条形码 + */ + public void setBarcode(String barcode) { + this.barcode = barcode; + } + + /** + * erp商品SKUid + */ + public Long getErpGoodsSkuId() { + return erpGoodsSkuId; + } + + /** + * erp商品SKUid + */ + public void setErpGoodsSkuId(Long erpGoodsSkuId) { + this.erpGoodsSkuId = erpGoodsSkuId; + } + + /** + * erp商品id + */ + public Long getErpGoodsId() { + return erpGoodsId; + } + + /** + * erp商品id + */ + public void setErpGoodsId(Long erpGoodsId) { + this.erpGoodsId = erpGoodsId; + } + + /** + * 创建时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + TaoGoodsSku other = (TaoGoodsSku) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getTaoGoodsId() == null ? other.getTaoGoodsId() == null : this.getTaoGoodsId().equals(other.getTaoGoodsId())) + && (this.getNumIid() == null ? other.getNumIid() == null : this.getNumIid().equals(other.getNumIid())) + && (this.getIid() == null ? other.getIid() == null : this.getIid().equals(other.getIid())) + && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) + && (this.getProperties() == null ? other.getProperties() == null : this.getProperties().equals(other.getProperties())) + && (this.getPropertiesName() == null ? other.getPropertiesName() == null : this.getPropertiesName().equals(other.getPropertiesName())) + && (this.getQuantity() == null ? other.getQuantity() == null : this.getQuantity().equals(other.getQuantity())) + && (this.getSpec() == null ? other.getSpec() == null : this.getSpec().equals(other.getSpec())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (this.getOuterId() == null ? other.getOuterId() == null : this.getOuterId().equals(other.getOuterId())) + && (this.getCreated() == null ? other.getCreated() == null : this.getCreated().equals(other.getCreated())) + && (this.getModified() == null ? other.getModified() == null : this.getModified().equals(other.getModified())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getSkuSpecId() == null ? other.getSkuSpecId() == null : this.getSkuSpecId().equals(other.getSkuSpecId())) + && (this.getBarcode() == null ? other.getBarcode() == null : this.getBarcode().equals(other.getBarcode())) + && (this.getErpGoodsSkuId() == null ? other.getErpGoodsSkuId() == null : this.getErpGoodsSkuId().equals(other.getErpGoodsSkuId())) + && (this.getErpGoodsId() == null ? other.getErpGoodsId() == null : this.getErpGoodsId().equals(other.getErpGoodsId())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getTaoGoodsId() == null) ? 0 : getTaoGoodsId().hashCode()); + result = prime * result + ((getNumIid() == null) ? 0 : getNumIid().hashCode()); + result = prime * result + ((getIid() == null) ? 0 : getIid().hashCode()); + result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); + result = prime * result + ((getProperties() == null) ? 0 : getProperties().hashCode()); + result = prime * result + ((getPropertiesName() == null) ? 0 : getPropertiesName().hashCode()); + result = prime * result + ((getQuantity() == null) ? 0 : getQuantity().hashCode()); + result = prime * result + ((getSpec() == null) ? 0 : getSpec().hashCode()); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + ((getOuterId() == null) ? 0 : getOuterId().hashCode()); + result = prime * result + ((getCreated() == null) ? 0 : getCreated().hashCode()); + result = prime * result + ((getModified() == null) ? 0 : getModified().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getSkuSpecId() == null) ? 0 : getSkuSpecId().hashCode()); + result = prime * result + ((getBarcode() == null) ? 0 : getBarcode().hashCode()); + result = prime * result + ((getErpGoodsSkuId() == null) ? 0 : getErpGoodsSkuId().hashCode()); + result = prime * result + ((getErpGoodsId() == null) ? 0 : getErpGoodsId().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", taoGoodsId=").append(taoGoodsId); + sb.append(", numIid=").append(numIid); + sb.append(", iid=").append(iid); + sb.append(", skuId=").append(skuId); + sb.append(", properties=").append(properties); + sb.append(", propertiesName=").append(propertiesName); + sb.append(", quantity=").append(quantity); + sb.append(", spec=").append(spec); + sb.append(", price=").append(price); + sb.append(", outerId=").append(outerId); + sb.append(", created=").append(created); + sb.append(", modified=").append(modified); + sb.append(", status=").append(status); + sb.append(", skuSpecId=").append(skuSpecId); + sb.append(", barcode=").append(barcode); + sb.append(", erpGoodsSkuId=").append(erpGoodsSkuId); + sb.append(", erpGoodsId=").append(erpGoodsId); + sb.append(", createTime=").append(createTime); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/TaoOrder.java b/oms-api/src/main/java/com/qihang/oms/domain/TaoOrder.java new file mode 100644 index 00000000..56010b93 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/domain/TaoOrder.java @@ -0,0 +1,1783 @@ +package com.qihang.oms.domain; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 淘宝订单表 + * @TableName tao_order + */ +public class TaoOrder implements Serializable { + /** + * 主键id + */ + private Long id; + + /** + * 店铺id + */ + private Integer shopId; + + /** + * 交易编号 (父订单的交易编号) + */ + private Long tid; + + /** + * 交易标题，以店铺名作为此标题的值。 + */ + private String title; + + /** + * 交易类型列表，同时查询多种交易类型可用逗号分隔。 + */ + private String type; + + /** + * 卖家备注旗帜（与淘宝网上订单的卖家备注旗帜对应，只有卖家才能查看该字段）红、黄、绿、蓝、紫 分别对应 1、2、3、4、5 + */ + private String sellerFlag; + + /** + * 判断订单是否有买家留言，有买家留言返回true，否则返回false + */ + private String hasBuyerMessage; + + /** + * 使用信用卡支付金额数 + */ + private String creditCardFee; + + /** + * 分阶段付款的订单状态（例如万人团订单等），目前有三返回状态FRONT_NOPAID_FINAL_NOPAID(定金未付尾款未付)，FRONT_PAID_FINAL_NOPAID(定金已付尾款未付)，FRONT_PAID_FINAL_PAID(定金和尾款都付) + */ + private String stepTradeStatus; + + /** + * 分阶段付款的已付金额（万人团订单已付金额） + */ + private String stepPaidFee; + + /** + * 买家OpenUid + */ + private String buyerOpenUid; + + /** + * 订单出现异常问题的时候，给予用户的描述,没有异常的时候，此值为空 + */ + private String markDesc; + + /** + * 买家昵称 + */ + private String buyerNick; + + /** + * 商品数字编号 + */ + private String numIid; + + /** + * 商品购买数量。取值范围：大于零的整数,对于一个trade对应多个order的时候（一笔主订单，对应多笔子订单），num=0，num是一个跟商品关联的属性，一笔订单对应多比子订单的时候，主订单上的num无意义。 + */ + private Integer num; + + /** + * 商品价格。精确到2位小数；单位：元。如：200.07，表示：200元7分 + */ + private Double price; + + /** + * 商品金额（商品价格乘以数量的总金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + private Double totalFee; + + /** + * 卖家手工调整金额，精确到2位小数，单位：元。如：200.07 + */ + private Double adjustFee; + + /** + * 邮费 + */ + private BigDecimal postFee; + + /** + * 优惠金额 + */ + private BigDecimal discountFee; + + /** + * 实付金额 + */ + private BigDecimal payment; + + /** + * 卖家实际收到的支付宝打款金额（由于子订单可以部分确认收货，这个金额会随着子订单的确认收货而不断增加，交易成功后等于买家实付款减去退款金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + private BigDecimal receivedPayment; + + /** + * 交易中剩余的确认收货金额（这个金额会随着子订单确认收货而不断减少，交易成功后会变为零）。精确到2位小数;单位:元。如:200.07，表示:200 元7分 + */ + private Double availableConfirmFee; + + /** + * 货到付款服务费。 + */ + private Double codFee; + + /** + * 货到付款物流状态。初始状态 NEW_CREATED,接单成功 ACCEPTED_BY_COMPANY,接单失败 REJECTED_BY_COMPANY,接单超时 RECIEVE_TIMEOUT,揽收成功 TAKEN_IN_SUCCESS,揽收失败 TAKEN_IN_FAILED,揽收超时 TAKEN_TIMEOUT,签收成功 SIGN_IN,签收失败 REJECTED_BY_OTHER_SIDE,订单等待发送给物流公司 WAITING_TO_BE_SENT,用户取消物流订单 CANCELED + */ + private String codStatus; + + /** + * 买家货到付款服务费 + */ + private String buyerCodFee; + + /** + * 卖家货到付款服务费 + */ + private String sellerCodFee; + + /** + * 快递代收款。 + */ + private String expressAgencyFee; + + /** + * 交易佣金。 + */ + private Double commissionFee; + + /** + * 创建交易时的物流方式（交易完成前，物流方式有可能改变，但系统里的这个字段一直不变）。可选值：free(卖家包邮),post(平邮),express(快递),ems(EMS),virtual(虚拟发货)，25(次日必达)，26(预约配送)。 + */ + private String shippingType; + + /** + * 交易创建时间。格式:yyyy-MM-dd HH:mm:ss + */ + private Date created; + + /** + * 交易修改时间(用户对订单的任何修改都会更新此字段)。格式:yyyy-MM-dd HH:mm:ss + */ + private Date modified; + + /** + * 付款时间。格式:yyyy-MM-dd HH:mm:ss。订单的付款时间即为物流订单的创建时间。 + */ + private Date payTime; + + /** + * 卖家发货时间。格式:yyyy-MM-dd HH:mm:ss + */ + private Date consignTime; + + /** + * 交易结束时间。交易成功时间(更新交易状态为成功的同时更新)/确认收货时间或者交易关闭时间 。格式:yyyy-MM-dd HH:mm:ss + */ + private Date endTime; + + /** + * 卖家备忘信息 + */ + private String sellerMemo; + + /** + * 买家备注 + */ + private String buyerMemo; + + /** + * 买家留言 + */ + private String buyerMessage; + + /** + * 买家使用积分,下单时生成，且一直不变。格式:100;单位:个. + */ + private String pointFee; + + /** + * 买家实际使用积分（扣除部分退款使用的积分），交易完成后生成（交易成功或关闭），交易未完成时该字段值为0。格式:100;单位:个 + */ + private String realPointFee; + + /** + * 买家获得积分,返点的积分。格式:100;单位:个。返点的积分要交易成功之后才能获得。 + */ + private String buyerObtainPointFee; + + /** + * 收货时间，这里返回的是完全收货时间 + */ + private Date receivingTime; + + /** + * 交易状态。可选值: * TRADE_NO_CREATE_PAY(没有创建支付宝交易) * WAIT_BUYER_PAY(等待买家付款) * SELLER_CONSIGNED_PART(卖家部分发货) * WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) * WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) * TRADE_BUYER_SIGNED(买家已签收,货到付款专用) * TRADE_FINISHED(交易成功) * TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) * TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) * PAY_PENDING(国际信用卡支付付款确认中) * WAIT_PRE_AUTH_CONFIRM(0元购合约中) * PAID_FORBID_CONSIGN(拼团中订单或者发货强管控的订单，已付款但禁止发货) + */ + private String status; + + /** + * 交易备注。 + */ + private String tradeMemo; + + /** + * erp发货快递公司 + */ + private String erpSendCompany; + + /** + * erp发货快递单号 + */ + private String erpSendCode; + + /** + * erp发货状态 + */ + private Integer erpSendStatus; + + /** + * 数据库创建时间 + */ + private Date createTime; + + /** + * 数据库更新时间 + */ + private Date updateTime; + + /** + * 数据库更新人 + */ + private String updateBy; + + /** + * （收货人+手机号+座机+收货地址+create）5个字段组合成oaid，原始订单上座机为空也满足条件，否则生成不了oaid + */ + private String oaid; + + /** + * 地址aid字段 + */ + private String aid; + + /** + * 收货人国籍 + */ + private String receiverCountry; + + /** + * 收货人的所在省份 + */ + private String receiverState; + + /** + * 收货人的所在城市 + */ + private String receiverCity; + + /** + * 收货人的所在地区 + */ + private String receiverDistrict; + + /** + * 收货人街道地址 + */ + private String receiverTown; + + /** + * 收货人的详细地址 + */ + private String receiverAddress; + + /** + * 收货人的邮编 + */ + private String receiverZip; + + /** + * 收货人的姓名 + */ + private String receiverName; + + /** + * 收货人的手机号码 + */ + private String receiverMobile; + + /** + * 收货人的电话号码 + */ + private String receiverPhone; + + /** + * 卖家是否已评价。可选值:true(已评价),false(未评价) + */ + private String sellerRate; + + /** + * 卖家昵称 + */ + private String sellerNick; + + /** + * 买家是否已评价。可选值:true(已评价),false(未评价)。如买家只评价未打分，此字段仍返回false + */ + private String buyerRate; + + /** + * 买家下单的地区 + */ + private String buyerArea; + + /** + * 支付宝交易号，如：2009112081173831 + */ + private String alipayNo; + + /** + * 买家支付宝账号 + */ + private String buyerAlipayNo; + + /** + * 买家邮件地址 + */ + private String buyerEmail; + + /** + * 卖家支付宝账号 + */ + private String sellerAlipayNo; + + /** + * 是否包含邮费。与available_confirm_fee同时使用。可选值:true(包含),false(不包含) + */ + private String hasPostFee; + + /** + * 超时到期时间。格式:yyyy-MM-dd HH:mm:ss。业务规则：前提条件：只有在买家已付款，卖家已发货的情况下才有效如果申请了退款，那么超时会落在子订单上；比如说3笔ABC，A申请了，那么返回的是BC的列表, 主定单不存在如果没有申请过退款，那么超时会挂在主定单上；比如ABC，返回主定单，ABC的超时和主定单相同 + */ + private String timeoutActionTime; + + /** + * 交易快照地址 + */ + private String snapshotUrl; + + /** + * 交易促销详细信息 + */ + private String promotion; + + /** + * 订单的运费险，单位为元 + */ + private String yfxFee; + + /** + * 订单中是否包含运费险订单，如果包含运费险订单返回true，不包含运费险订单，返回false + */ + private String hasYfx; + + /** + * 订单将在此时间前发出，主要用于预售订单 + */ + private String sendTime; + + /** + * 是否是多次发货的订单如果卖家对订单进行多次发货，则为true否则为false + */ + private String isPartConsign; + + /** + * 物流运单号 + */ + private String sid; + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + public Long getId() { + return id; + } + + /** + * 主键id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 店铺id + */ + public Integer getShopId() { + return shopId; + } + + /** + * 店铺id + */ + public void setShopId(Integer shopId) { + this.shopId = shopId; + } + + /** + * 交易编号 (父订单的交易编号) + */ + public Long getTid() { + return tid; + } + + /** + * 交易编号 (父订单的交易编号) + */ + public void setTid(Long tid) { + this.tid = tid; + } + + /** + * 交易标题，以店铺名作为此标题的值。 + */ + public String getTitle() { + return title; + } + + /** + * 交易标题，以店铺名作为此标题的值。 + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * 交易类型列表，同时查询多种交易类型可用逗号分隔。 + */ + public String getType() { + return type; + } + + /** + * 交易类型列表，同时查询多种交易类型可用逗号分隔。 + */ + public void setType(String type) { + this.type = type; + } + + /** + * 卖家备注旗帜（与淘宝网上订单的卖家备注旗帜对应，只有卖家才能查看该字段）红、黄、绿、蓝、紫 分别对应 1、2、3、4、5 + */ + public String getSellerFlag() { + return sellerFlag; + } + + /** + * 卖家备注旗帜（与淘宝网上订单的卖家备注旗帜对应，只有卖家才能查看该字段）红、黄、绿、蓝、紫 分别对应 1、2、3、4、5 + */ + public void setSellerFlag(String sellerFlag) { + this.sellerFlag = sellerFlag; + } + + /** + * 判断订单是否有买家留言，有买家留言返回true，否则返回false + */ + public String getHasBuyerMessage() { + return hasBuyerMessage; + } + + /** + * 判断订单是否有买家留言，有买家留言返回true，否则返回false + */ + public void setHasBuyerMessage(String hasBuyerMessage) { + this.hasBuyerMessage = hasBuyerMessage; + } + + /** + * 使用信用卡支付金额数 + */ + public String getCreditCardFee() { + return creditCardFee; + } + + /** + * 使用信用卡支付金额数 + */ + public void setCreditCardFee(String creditCardFee) { + this.creditCardFee = creditCardFee; + } + + /** + * 分阶段付款的订单状态（例如万人团订单等），目前有三返回状态FRONT_NOPAID_FINAL_NOPAID(定金未付尾款未付)，FRONT_PAID_FINAL_NOPAID(定金已付尾款未付)，FRONT_PAID_FINAL_PAID(定金和尾款都付) + */ + public String getStepTradeStatus() { + return stepTradeStatus; + } + + /** + * 分阶段付款的订单状态（例如万人团订单等），目前有三返回状态FRONT_NOPAID_FINAL_NOPAID(定金未付尾款未付)，FRONT_PAID_FINAL_NOPAID(定金已付尾款未付)，FRONT_PAID_FINAL_PAID(定金和尾款都付) + */ + public void setStepTradeStatus(String stepTradeStatus) { + this.stepTradeStatus = stepTradeStatus; + } + + /** + * 分阶段付款的已付金额（万人团订单已付金额） + */ + public String getStepPaidFee() { + return stepPaidFee; + } + + /** + * 分阶段付款的已付金额（万人团订单已付金额） + */ + public void setStepPaidFee(String stepPaidFee) { + this.stepPaidFee = stepPaidFee; + } + + /** + * 买家OpenUid + */ + public String getBuyerOpenUid() { + return buyerOpenUid; + } + + /** + * 买家OpenUid + */ + public void setBuyerOpenUid(String buyerOpenUid) { + this.buyerOpenUid = buyerOpenUid; + } + + /** + * 订单出现异常问题的时候，给予用户的描述,没有异常的时候，此值为空 + */ + public String getMarkDesc() { + return markDesc; + } + + /** + * 订单出现异常问题的时候，给予用户的描述,没有异常的时候，此值为空 + */ + public void setMarkDesc(String markDesc) { + this.markDesc = markDesc; + } + + /** + * 买家昵称 + */ + public String getBuyerNick() { + return buyerNick; + } + + /** + * 买家昵称 + */ + public void setBuyerNick(String buyerNick) { + this.buyerNick = buyerNick; + } + + /** + * 商品数字编号 + */ + public String getNumIid() { + return numIid; + } + + /** + * 商品数字编号 + */ + public void setNumIid(String numIid) { + this.numIid = numIid; + } + + /** + * 商品购买数量。取值范围：大于零的整数,对于一个trade对应多个order的时候（一笔主订单，对应多笔子订单），num=0，num是一个跟商品关联的属性，一笔订单对应多比子订单的时候，主订单上的num无意义。 + */ + public Integer getNum() { + return num; + } + + /** + * 商品购买数量。取值范围：大于零的整数,对于一个trade对应多个order的时候（一笔主订单，对应多笔子订单），num=0，num是一个跟商品关联的属性，一笔订单对应多比子订单的时候，主订单上的num无意义。 + */ + public void setNum(Integer num) { + this.num = num; + } + + /** + * 商品价格。精确到2位小数；单位：元。如：200.07，表示：200元7分 + */ + public Double getPrice() { + return price; + } + + /** + * 商品价格。精确到2位小数；单位：元。如：200.07，表示：200元7分 + */ + public void setPrice(Double price) { + this.price = price; + } + + /** + * 商品金额（商品价格乘以数量的总金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public Double getTotalFee() { + return totalFee; + } + + /** + * 商品金额（商品价格乘以数量的总金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public void setTotalFee(Double totalFee) { + this.totalFee = totalFee; + } + + /** + * 卖家手工调整金额，精确到2位小数，单位：元。如：200.07 + */ + public Double getAdjustFee() { + return adjustFee; + } + + /** + * 卖家手工调整金额，精确到2位小数，单位：元。如：200.07 + */ + public void setAdjustFee(Double adjustFee) { + this.adjustFee = adjustFee; + } + + /** + * 邮费 + */ + public BigDecimal getPostFee() { + return postFee; + } + + /** + * 邮费 + */ + public void setPostFee(BigDecimal postFee) { + this.postFee = postFee; + } + + /** + * 优惠金额 + */ + public BigDecimal getDiscountFee() { + return discountFee; + } + + /** + * 优惠金额 + */ + public void setDiscountFee(BigDecimal discountFee) { + this.discountFee = discountFee; + } + + /** + * 实付金额 + */ + public BigDecimal getPayment() { + return payment; + } + + /** + * 实付金额 + */ + public void setPayment(BigDecimal payment) { + this.payment = payment; + } + + /** + * 卖家实际收到的支付宝打款金额（由于子订单可以部分确认收货，这个金额会随着子订单的确认收货而不断增加，交易成功后等于买家实付款减去退款金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public BigDecimal getReceivedPayment() { + return receivedPayment; + } + + /** + * 卖家实际收到的支付宝打款金额（由于子订单可以部分确认收货，这个金额会随着子订单的确认收货而不断增加，交易成功后等于买家实付款减去退款金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public void setReceivedPayment(BigDecimal receivedPayment) { + this.receivedPayment = receivedPayment; + } + + /** + * 交易中剩余的确认收货金额（这个金额会随着子订单确认收货而不断减少，交易成功后会变为零）。精确到2位小数;单位:元。如:200.07，表示:200 元7分 + */ + public Double getAvailableConfirmFee() { + return availableConfirmFee; + } + + /** + * 交易中剩余的确认收货金额（这个金额会随着子订单确认收货而不断减少，交易成功后会变为零）。精确到2位小数;单位:元。如:200.07，表示:200 元7分 + */ + public void setAvailableConfirmFee(Double availableConfirmFee) { + this.availableConfirmFee = availableConfirmFee; + } + + /** + * 货到付款服务费。 + */ + public Double getCodFee() { + return codFee; + } + + /** + * 货到付款服务费。 + */ + public void setCodFee(Double codFee) { + this.codFee = codFee; + } + + /** + * 货到付款物流状态。初始状态 NEW_CREATED,接单成功 ACCEPTED_BY_COMPANY,接单失败 REJECTED_BY_COMPANY,接单超时 RECIEVE_TIMEOUT,揽收成功 TAKEN_IN_SUCCESS,揽收失败 TAKEN_IN_FAILED,揽收超时 TAKEN_TIMEOUT,签收成功 SIGN_IN,签收失败 REJECTED_BY_OTHER_SIDE,订单等待发送给物流公司 WAITING_TO_BE_SENT,用户取消物流订单 CANCELED + */ + public String getCodStatus() { + return codStatus; + } + + /** + * 货到付款物流状态。初始状态 NEW_CREATED,接单成功 ACCEPTED_BY_COMPANY,接单失败 REJECTED_BY_COMPANY,接单超时 RECIEVE_TIMEOUT,揽收成功 TAKEN_IN_SUCCESS,揽收失败 TAKEN_IN_FAILED,揽收超时 TAKEN_TIMEOUT,签收成功 SIGN_IN,签收失败 REJECTED_BY_OTHER_SIDE,订单等待发送给物流公司 WAITING_TO_BE_SENT,用户取消物流订单 CANCELED + */ + public void setCodStatus(String codStatus) { + this.codStatus = codStatus; + } + + /** + * 买家货到付款服务费 + */ + public String getBuyerCodFee() { + return buyerCodFee; + } + + /** + * 买家货到付款服务费 + */ + public void setBuyerCodFee(String buyerCodFee) { + this.buyerCodFee = buyerCodFee; + } + + /** + * 卖家货到付款服务费 + */ + public String getSellerCodFee() { + return sellerCodFee; + } + + /** + * 卖家货到付款服务费 + */ + public void setSellerCodFee(String sellerCodFee) { + this.sellerCodFee = sellerCodFee; + } + + /** + * 快递代收款。 + */ + public String getExpressAgencyFee() { + return expressAgencyFee; + } + + /** + * 快递代收款。 + */ + public void setExpressAgencyFee(String expressAgencyFee) { + this.expressAgencyFee = expressAgencyFee; + } + + /** + * 交易佣金。 + */ + public Double getCommissionFee() { + return commissionFee; + } + + /** + * 交易佣金。 + */ + public void setCommissionFee(Double commissionFee) { + this.commissionFee = commissionFee; + } + + /** + * 创建交易时的物流方式（交易完成前，物流方式有可能改变，但系统里的这个字段一直不变）。可选值：free(卖家包邮),post(平邮),express(快递),ems(EMS),virtual(虚拟发货)，25(次日必达)，26(预约配送)。 + */ + public String getShippingType() { + return shippingType; + } + + /** + * 创建交易时的物流方式（交易完成前，物流方式有可能改变，但系统里的这个字段一直不变）。可选值：free(卖家包邮),post(平邮),express(快递),ems(EMS),virtual(虚拟发货)，25(次日必达)，26(预约配送)。 + */ + public void setShippingType(String shippingType) { + this.shippingType = shippingType; + } + + /** + * 交易创建时间。格式:yyyy-MM-dd HH:mm:ss + */ + public Date getCreated() { + return created; + } + + /** + * 交易创建时间。格式:yyyy-MM-dd HH:mm:ss + */ + public void setCreated(Date created) { + this.created = created; + } + + /** + * 交易修改时间(用户对订单的任何修改都会更新此字段)。格式:yyyy-MM-dd HH:mm:ss + */ + public Date getModified() { + return modified; + } + + /** + * 交易修改时间(用户对订单的任何修改都会更新此字段)。格式:yyyy-MM-dd HH:mm:ss + */ + public void setModified(Date modified) { + this.modified = modified; + } + + /** + * 付款时间。格式:yyyy-MM-dd HH:mm:ss。订单的付款时间即为物流订单的创建时间。 + */ + public Date getPayTime() { + return payTime; + } + + /** + * 付款时间。格式:yyyy-MM-dd HH:mm:ss。订单的付款时间即为物流订单的创建时间。 + */ + public void setPayTime(Date payTime) { + this.payTime = payTime; + } + + /** + * 卖家发货时间。格式:yyyy-MM-dd HH:mm:ss + */ + public Date getConsignTime() { + return consignTime; + } + + /** + * 卖家发货时间。格式:yyyy-MM-dd HH:mm:ss + */ + public void setConsignTime(Date consignTime) { + this.consignTime = consignTime; + } + + /** + * 交易结束时间。交易成功时间(更新交易状态为成功的同时更新)/确认收货时间或者交易关闭时间 。格式:yyyy-MM-dd HH:mm:ss + */ + public Date getEndTime() { + return endTime; + } + + /** + * 交易结束时间。交易成功时间(更新交易状态为成功的同时更新)/确认收货时间或者交易关闭时间 。格式:yyyy-MM-dd HH:mm:ss + */ + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + /** + * 卖家备忘信息 + */ + public String getSellerMemo() { + return sellerMemo; + } + + /** + * 卖家备忘信息 + */ + public void setSellerMemo(String sellerMemo) { + this.sellerMemo = sellerMemo; + } + + /** + * 买家备注 + */ + public String getBuyerMemo() { + return buyerMemo; + } + + /** + * 买家备注 + */ + public void setBuyerMemo(String buyerMemo) { + this.buyerMemo = buyerMemo; + } + + /** + * 买家留言 + */ + public String getBuyerMessage() { + return buyerMessage; + } + + /** + * 买家留言 + */ + public void setBuyerMessage(String buyerMessage) { + this.buyerMessage = buyerMessage; + } + + /** + * 买家使用积分,下单时生成，且一直不变。格式:100;单位:个. + */ + public String getPointFee() { + return pointFee; + } + + /** + * 买家使用积分,下单时生成，且一直不变。格式:100;单位:个. + */ + public void setPointFee(String pointFee) { + this.pointFee = pointFee; + } + + /** + * 买家实际使用积分（扣除部分退款使用的积分），交易完成后生成（交易成功或关闭），交易未完成时该字段值为0。格式:100;单位:个 + */ + public String getRealPointFee() { + return realPointFee; + } + + /** + * 买家实际使用积分（扣除部分退款使用的积分），交易完成后生成（交易成功或关闭），交易未完成时该字段值为0。格式:100;单位:个 + */ + public void setRealPointFee(String realPointFee) { + this.realPointFee = realPointFee; + } + + /** + * 买家获得积分,返点的积分。格式:100;单位:个。返点的积分要交易成功之后才能获得。 + */ + public String getBuyerObtainPointFee() { + return buyerObtainPointFee; + } + + /** + * 买家获得积分,返点的积分。格式:100;单位:个。返点的积分要交易成功之后才能获得。 + */ + public void setBuyerObtainPointFee(String buyerObtainPointFee) { + this.buyerObtainPointFee = buyerObtainPointFee; + } + + /** + * 收货时间，这里返回的是完全收货时间 + */ + public Date getReceivingTime() { + return receivingTime; + } + + /** + * 收货时间，这里返回的是完全收货时间 + */ + public void setReceivingTime(Date receivingTime) { + this.receivingTime = receivingTime; + } + + /** + * 交易状态。可选值: * TRADE_NO_CREATE_PAY(没有创建支付宝交易) * WAIT_BUYER_PAY(等待买家付款) * SELLER_CONSIGNED_PART(卖家部分发货) * WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) * WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) * TRADE_BUYER_SIGNED(买家已签收,货到付款专用) * TRADE_FINISHED(交易成功) * TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) * TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) * PAY_PENDING(国际信用卡支付付款确认中) * WAIT_PRE_AUTH_CONFIRM(0元购合约中) * PAID_FORBID_CONSIGN(拼团中订单或者发货强管控的订单，已付款但禁止发货) + */ + public String getStatus() { + return status; + } + + /** + * 交易状态。可选值: * TRADE_NO_CREATE_PAY(没有创建支付宝交易) * WAIT_BUYER_PAY(等待买家付款) * SELLER_CONSIGNED_PART(卖家部分发货) * WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) * WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) * TRADE_BUYER_SIGNED(买家已签收,货到付款专用) * TRADE_FINISHED(交易成功) * TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) * TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) * PAY_PENDING(国际信用卡支付付款确认中) * WAIT_PRE_AUTH_CONFIRM(0元购合约中) * PAID_FORBID_CONSIGN(拼团中订单或者发货强管控的订单，已付款但禁止发货) + */ + public void setStatus(String status) { + this.status = status; + } + + /** + * 交易备注。 + */ + public String getTradeMemo() { + return tradeMemo; + } + + /** + * 交易备注。 + */ + public void setTradeMemo(String tradeMemo) { + this.tradeMemo = tradeMemo; + } + + /** + * erp发货快递公司 + */ + public String getErpSendCompany() { + return erpSendCompany; + } + + /** + * erp发货快递公司 + */ + public void setErpSendCompany(String erpSendCompany) { + this.erpSendCompany = erpSendCompany; + } + + /** + * erp发货快递单号 + */ + public String getErpSendCode() { + return erpSendCode; + } + + /** + * erp发货快递单号 + */ + public void setErpSendCode(String erpSendCode) { + this.erpSendCode = erpSendCode; + } + + /** + * erp发货状态 + */ + public Integer getErpSendStatus() { + return erpSendStatus; + } + + /** + * erp发货状态 + */ + public void setErpSendStatus(Integer erpSendStatus) { + this.erpSendStatus = erpSendStatus; + } + + /** + * 数据库创建时间 + */ + public Date getCreateTime() { + return createTime; + } + + /** + * 数据库创建时间 + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 数据库更新时间 + */ + public Date getUpdateTime() { + return updateTime; + } + + /** + * 数据库更新时间 + */ + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + /** + * 数据库更新人 + */ + public String getUpdateBy() { + return updateBy; + } + + /** + * 数据库更新人 + */ + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + /** + * （收货人+手机号+座机+收货地址+create）5个字段组合成oaid，原始订单上座机为空也满足条件，否则生成不了oaid + */ + public String getOaid() { + return oaid; + } + + /** + * （收货人+手机号+座机+收货地址+create）5个字段组合成oaid，原始订单上座机为空也满足条件，否则生成不了oaid + */ + public void setOaid(String oaid) { + this.oaid = oaid; + } + + /** + * 地址aid字段 + */ + public String getAid() { + return aid; + } + + /** + * 地址aid字段 + */ + public void setAid(String aid) { + this.aid = aid; + } + + /** + * 收货人国籍 + */ + public String getReceiverCountry() { + return receiverCountry; + } + + /** + * 收货人国籍 + */ + public void setReceiverCountry(String receiverCountry) { + this.receiverCountry = receiverCountry; + } + + /** + * 收货人的所在省份 + */ + public String getReceiverState() { + return receiverState; + } + + /** + * 收货人的所在省份 + */ + public void setReceiverState(String receiverState) { + this.receiverState = receiverState; + } + + /** + * 收货人的所在城市 + */ + public String getReceiverCity() { + return receiverCity; + } + + /** + * 收货人的所在城市 + */ + public void setReceiverCity(String receiverCity) { + this.receiverCity = receiverCity; + } + + /** + * 收货人的所在地区 + */ + public String getReceiverDistrict() { + return receiverDistrict; + } + + /** + * 收货人的所在地区 + */ + public void setReceiverDistrict(String receiverDistrict) { + this.receiverDistrict = receiverDistrict; + } + + /** + * 收货人街道地址 + */ + public String getReceiverTown() { + return receiverTown; + } + + /** + * 收货人街道地址 + */ + public void setReceiverTown(String receiverTown) { + this.receiverTown = receiverTown; + } + + /** + * 收货人的详细地址 + */ + public String getReceiverAddress() { + return receiverAddress; + } + + /** + * 收货人的详细地址 + */ + public void setReceiverAddress(String receiverAddress) { + this.receiverAddress = receiverAddress; + } + + /** + * 收货人的邮编 + */ + public String getReceiverZip() { + return receiverZip; + } + + /** + * 收货人的邮编 + */ + public void setReceiverZip(String receiverZip) { + this.receiverZip = receiverZip; + } + + /** + * 收货人的姓名 + */ + public String getReceiverName() { + return receiverName; + } + + /** + * 收货人的姓名 + */ + public void setReceiverName(String receiverName) { + this.receiverName = receiverName; + } + + /** + * 收货人的手机号码 + */ + public String getReceiverMobile() { + return receiverMobile; + } + + /** + * 收货人的手机号码 + */ + public void setReceiverMobile(String receiverMobile) { + this.receiverMobile = receiverMobile; + } + + /** + * 收货人的电话号码 + */ + public String getReceiverPhone() { + return receiverPhone; + } + + /** + * 收货人的电话号码 + */ + public void setReceiverPhone(String receiverPhone) { + this.receiverPhone = receiverPhone; + } + + /** + * 卖家是否已评价。可选值:true(已评价),false(未评价) + */ + public String getSellerRate() { + return sellerRate; + } + + /** + * 卖家是否已评价。可选值:true(已评价),false(未评价) + */ + public void setSellerRate(String sellerRate) { + this.sellerRate = sellerRate; + } + + /** + * 卖家昵称 + */ + public String getSellerNick() { + return sellerNick; + } + + /** + * 卖家昵称 + */ + public void setSellerNick(String sellerNick) { + this.sellerNick = sellerNick; + } + + /** + * 买家是否已评价。可选值:true(已评价),false(未评价)。如买家只评价未打分，此字段仍返回false + */ + public String getBuyerRate() { + return buyerRate; + } + + /** + * 买家是否已评价。可选值:true(已评价),false(未评价)。如买家只评价未打分，此字段仍返回false + */ + public void setBuyerRate(String buyerRate) { + this.buyerRate = buyerRate; + } + + /** + * 买家下单的地区 + */ + public String getBuyerArea() { + return buyerArea; + } + + /** + * 买家下单的地区 + */ + public void setBuyerArea(String buyerArea) { + this.buyerArea = buyerArea; + } + + /** + * 支付宝交易号，如：2009112081173831 + */ + public String getAlipayNo() { + return alipayNo; + } + + /** + * 支付宝交易号，如：2009112081173831 + */ + public void setAlipayNo(String alipayNo) { + this.alipayNo = alipayNo; + } + + /** + * 买家支付宝账号 + */ + public String getBuyerAlipayNo() { + return buyerAlipayNo; + } + + /** + * 买家支付宝账号 + */ + public void setBuyerAlipayNo(String buyerAlipayNo) { + this.buyerAlipayNo = buyerAlipayNo; + } + + /** + * 买家邮件地址 + */ + public String getBuyerEmail() { + return buyerEmail; + } + + /** + * 买家邮件地址 + */ + public void setBuyerEmail(String buyerEmail) { + this.buyerEmail = buyerEmail; + } + + /** + * 卖家支付宝账号 + */ + public String getSellerAlipayNo() { + return sellerAlipayNo; + } + + /** + * 卖家支付宝账号 + */ + public void setSellerAlipayNo(String sellerAlipayNo) { + this.sellerAlipayNo = sellerAlipayNo; + } + + /** + * 是否包含邮费。与available_confirm_fee同时使用。可选值:true(包含),false(不包含) + */ + public String getHasPostFee() { + return hasPostFee; + } + + /** + * 是否包含邮费。与available_confirm_fee同时使用。可选值:true(包含),false(不包含) + */ + public void setHasPostFee(String hasPostFee) { + this.hasPostFee = hasPostFee; + } + + /** + * 超时到期时间。格式:yyyy-MM-dd HH:mm:ss。业务规则：前提条件：只有在买家已付款，卖家已发货的情况下才有效如果申请了退款，那么超时会落在子订单上；比如说3笔ABC，A申请了，那么返回的是BC的列表, 主定单不存在如果没有申请过退款，那么超时会挂在主定单上；比如ABC，返回主定单，ABC的超时和主定单相同 + */ + public String getTimeoutActionTime() { + return timeoutActionTime; + } + + /** + * 超时到期时间。格式:yyyy-MM-dd HH:mm:ss。业务规则：前提条件：只有在买家已付款，卖家已发货的情况下才有效如果申请了退款，那么超时会落在子订单上；比如说3笔ABC，A申请了，那么返回的是BC的列表, 主定单不存在如果没有申请过退款，那么超时会挂在主定单上；比如ABC，返回主定单，ABC的超时和主定单相同 + */ + public void setTimeoutActionTime(String timeoutActionTime) { + this.timeoutActionTime = timeoutActionTime; + } + + /** + * 交易快照地址 + */ + public String getSnapshotUrl() { + return snapshotUrl; + } + + /** + * 交易快照地址 + */ + public void setSnapshotUrl(String snapshotUrl) { + this.snapshotUrl = snapshotUrl; + } + + /** + * 交易促销详细信息 + */ + public String getPromotion() { + return promotion; + } + + /** + * 交易促销详细信息 + */ + public void setPromotion(String promotion) { + this.promotion = promotion; + } + + /** + * 订单的运费险，单位为元 + */ + public String getYfxFee() { + return yfxFee; + } + + /** + * 订单的运费险，单位为元 + */ + public void setYfxFee(String yfxFee) { + this.yfxFee = yfxFee; + } + + /** + * 订单中是否包含运费险订单，如果包含运费险订单返回true，不包含运费险订单，返回false + */ + public String getHasYfx() { + return hasYfx; + } + + /** + * 订单中是否包含运费险订单，如果包含运费险订单返回true，不包含运费险订单，返回false + */ + public void setHasYfx(String hasYfx) { + this.hasYfx = hasYfx; + } + + /** + * 订单将在此时间前发出，主要用于预售订单 + */ + public String getSendTime() { + return sendTime; + } + + /** + * 订单将在此时间前发出，主要用于预售订单 + */ + public void setSendTime(String sendTime) { + this.sendTime = sendTime; + } + + /** + * 是否是多次发货的订单如果卖家对订单进行多次发货，则为true否则为false + */ + public String getIsPartConsign() { + return isPartConsign; + } + + /** + * 是否是多次发货的订单如果卖家对订单进行多次发货，则为true否则为false + */ + public void setIsPartConsign(String isPartConsign) { + this.isPartConsign = isPartConsign; + } + + /** + * 物流运单号 + */ + public String getSid() { + return sid; + } + + /** + * 物流运单号 + */ + public void setSid(String sid) { + this.sid = sid; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + TaoOrder other = (TaoOrder) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getShopId() == null ? other.getShopId() == null : this.getShopId().equals(other.getShopId())) + && (this.getTid() == null ? other.getTid() == null : this.getTid().equals(other.getTid())) + && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getSellerFlag() == null ? other.getSellerFlag() == null : this.getSellerFlag().equals(other.getSellerFlag())) + && (this.getHasBuyerMessage() == null ? other.getHasBuyerMessage() == null : this.getHasBuyerMessage().equals(other.getHasBuyerMessage())) + && (this.getCreditCardFee() == null ? other.getCreditCardFee() == null : this.getCreditCardFee().equals(other.getCreditCardFee())) + && (this.getStepTradeStatus() == null ? other.getStepTradeStatus() == null : this.getStepTradeStatus().equals(other.getStepTradeStatus())) + && (this.getStepPaidFee() == null ? other.getStepPaidFee() == null : this.getStepPaidFee().equals(other.getStepPaidFee())) + && (this.getBuyerOpenUid() == null ? other.getBuyerOpenUid() == null : this.getBuyerOpenUid().equals(other.getBuyerOpenUid())) + && (this.getMarkDesc() == null ? other.getMarkDesc() == null : this.getMarkDesc().equals(other.getMarkDesc())) + && (this.getBuyerNick() == null ? other.getBuyerNick() == null : this.getBuyerNick().equals(other.getBuyerNick())) + && (this.getNumIid() == null ? other.getNumIid() == null : this.getNumIid().equals(other.getNumIid())) + && (this.getNum() == null ? other.getNum() == null : this.getNum().equals(other.getNum())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (this.getTotalFee() == null ? other.getTotalFee() == null : this.getTotalFee().equals(other.getTotalFee())) + && (this.getAdjustFee() == null ? other.getAdjustFee() == null : this.getAdjustFee().equals(other.getAdjustFee())) + && (this.getPostFee() == null ? other.getPostFee() == null : this.getPostFee().equals(other.getPostFee())) + && (this.getDiscountFee() == null ? other.getDiscountFee() == null : this.getDiscountFee().equals(other.getDiscountFee())) + && (this.getPayment() == null ? other.getPayment() == null : this.getPayment().equals(other.getPayment())) + && (this.getReceivedPayment() == null ? other.getReceivedPayment() == null : this.getReceivedPayment().equals(other.getReceivedPayment())) + && (this.getAvailableConfirmFee() == null ? other.getAvailableConfirmFee() == null : this.getAvailableConfirmFee().equals(other.getAvailableConfirmFee())) + && (this.getCodFee() == null ? other.getCodFee() == null : this.getCodFee().equals(other.getCodFee())) + && (this.getCodStatus() == null ? other.getCodStatus() == null : this.getCodStatus().equals(other.getCodStatus())) + && (this.getBuyerCodFee() == null ? other.getBuyerCodFee() == null : this.getBuyerCodFee().equals(other.getBuyerCodFee())) + && (this.getSellerCodFee() == null ? other.getSellerCodFee() == null : this.getSellerCodFee().equals(other.getSellerCodFee())) + && (this.getExpressAgencyFee() == null ? other.getExpressAgencyFee() == null : this.getExpressAgencyFee().equals(other.getExpressAgencyFee())) + && (this.getCommissionFee() == null ? other.getCommissionFee() == null : this.getCommissionFee().equals(other.getCommissionFee())) + && (this.getShippingType() == null ? other.getShippingType() == null : this.getShippingType().equals(other.getShippingType())) + && (this.getCreated() == null ? other.getCreated() == null : this.getCreated().equals(other.getCreated())) + && (this.getModified() == null ? other.getModified() == null : this.getModified().equals(other.getModified())) + && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) + && (this.getConsignTime() == null ? other.getConsignTime() == null : this.getConsignTime().equals(other.getConsignTime())) + && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) + && (this.getSellerMemo() == null ? other.getSellerMemo() == null : this.getSellerMemo().equals(other.getSellerMemo())) + && (this.getBuyerMemo() == null ? other.getBuyerMemo() == null : this.getBuyerMemo().equals(other.getBuyerMemo())) + && (this.getBuyerMessage() == null ? other.getBuyerMessage() == null : this.getBuyerMessage().equals(other.getBuyerMessage())) + && (this.getPointFee() == null ? other.getPointFee() == null : this.getPointFee().equals(other.getPointFee())) + && (this.getRealPointFee() == null ? other.getRealPointFee() == null : this.getRealPointFee().equals(other.getRealPointFee())) + && (this.getBuyerObtainPointFee() == null ? other.getBuyerObtainPointFee() == null : this.getBuyerObtainPointFee().equals(other.getBuyerObtainPointFee())) + && (this.getReceivingTime() == null ? other.getReceivingTime() == null : this.getReceivingTime().equals(other.getReceivingTime())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getTradeMemo() == null ? other.getTradeMemo() == null : this.getTradeMemo().equals(other.getTradeMemo())) + && (this.getErpSendCompany() == null ? other.getErpSendCompany() == null : this.getErpSendCompany().equals(other.getErpSendCompany())) + && (this.getErpSendCode() == null ? other.getErpSendCode() == null : this.getErpSendCode().equals(other.getErpSendCode())) + && (this.getErpSendStatus() == null ? other.getErpSendStatus() == null : this.getErpSendStatus().equals(other.getErpSendStatus())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) + && (this.getUpdateBy() == null ? other.getUpdateBy() == null : this.getUpdateBy().equals(other.getUpdateBy())) + && (this.getOaid() == null ? other.getOaid() == null : this.getOaid().equals(other.getOaid())) + && (this.getAid() == null ? other.getAid() == null : this.getAid().equals(other.getAid())) + && (this.getReceiverCountry() == null ? other.getReceiverCountry() == null : this.getReceiverCountry().equals(other.getReceiverCountry())) + && (this.getReceiverState() == null ? other.getReceiverState() == null : this.getReceiverState().equals(other.getReceiverState())) + && (this.getReceiverCity() == null ? other.getReceiverCity() == null : this.getReceiverCity().equals(other.getReceiverCity())) + && (this.getReceiverDistrict() == null ? other.getReceiverDistrict() == null : this.getReceiverDistrict().equals(other.getReceiverDistrict())) + && (this.getReceiverTown() == null ? other.getReceiverTown() == null : this.getReceiverTown().equals(other.getReceiverTown())) + && (this.getReceiverAddress() == null ? other.getReceiverAddress() == null : this.getReceiverAddress().equals(other.getReceiverAddress())) + && (this.getReceiverZip() == null ? other.getReceiverZip() == null : this.getReceiverZip().equals(other.getReceiverZip())) + && (this.getReceiverName() == null ? other.getReceiverName() == null : this.getReceiverName().equals(other.getReceiverName())) + && (this.getReceiverMobile() == null ? other.getReceiverMobile() == null : this.getReceiverMobile().equals(other.getReceiverMobile())) + && (this.getReceiverPhone() == null ? other.getReceiverPhone() == null : this.getReceiverPhone().equals(other.getReceiverPhone())) + && (this.getSellerRate() == null ? other.getSellerRate() == null : this.getSellerRate().equals(other.getSellerRate())) + && (this.getSellerNick() == null ? other.getSellerNick() == null : this.getSellerNick().equals(other.getSellerNick())) + && (this.getBuyerRate() == null ? other.getBuyerRate() == null : this.getBuyerRate().equals(other.getBuyerRate())) + && (this.getBuyerArea() == null ? other.getBuyerArea() == null : this.getBuyerArea().equals(other.getBuyerArea())) + && (this.getAlipayNo() == null ? other.getAlipayNo() == null : this.getAlipayNo().equals(other.getAlipayNo())) + && (this.getBuyerAlipayNo() == null ? other.getBuyerAlipayNo() == null : this.getBuyerAlipayNo().equals(other.getBuyerAlipayNo())) + && (this.getBuyerEmail() == null ? other.getBuyerEmail() == null : this.getBuyerEmail().equals(other.getBuyerEmail())) + && (this.getSellerAlipayNo() == null ? other.getSellerAlipayNo() == null : this.getSellerAlipayNo().equals(other.getSellerAlipayNo())) + && (this.getHasPostFee() == null ? other.getHasPostFee() == null : this.getHasPostFee().equals(other.getHasPostFee())) + && (this.getTimeoutActionTime() == null ? other.getTimeoutActionTime() == null : this.getTimeoutActionTime().equals(other.getTimeoutActionTime())) + && (this.getSnapshotUrl() == null ? other.getSnapshotUrl() == null : this.getSnapshotUrl().equals(other.getSnapshotUrl())) + && (this.getPromotion() == null ? other.getPromotion() == null : this.getPromotion().equals(other.getPromotion())) + && (this.getYfxFee() == null ? other.getYfxFee() == null : this.getYfxFee().equals(other.getYfxFee())) + && (this.getHasYfx() == null ? other.getHasYfx() == null : this.getHasYfx().equals(other.getHasYfx())) + && (this.getSendTime() == null ? other.getSendTime() == null : this.getSendTime().equals(other.getSendTime())) + && (this.getIsPartConsign() == null ? other.getIsPartConsign() == null : this.getIsPartConsign().equals(other.getIsPartConsign())) + && (this.getSid() == null ? other.getSid() == null : this.getSid().equals(other.getSid())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getShopId() == null) ? 0 : getShopId().hashCode()); + result = prime * result + ((getTid() == null) ? 0 : getTid().hashCode()); + result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); + result = prime * result + ((getSellerFlag() == null) ? 0 : getSellerFlag().hashCode()); + result = prime * result + ((getHasBuyerMessage() == null) ? 0 : getHasBuyerMessage().hashCode()); + result = prime * result + ((getCreditCardFee() == null) ? 0 : getCreditCardFee().hashCode()); + result = prime * result + ((getStepTradeStatus() == null) ? 0 : getStepTradeStatus().hashCode()); + result = prime * result + ((getStepPaidFee() == null) ? 0 : getStepPaidFee().hashCode()); + result = prime * result + ((getBuyerOpenUid() == null) ? 0 : getBuyerOpenUid().hashCode()); + result = prime * result + ((getMarkDesc() == null) ? 0 : getMarkDesc().hashCode()); + result = prime * result + ((getBuyerNick() == null) ? 0 : getBuyerNick().hashCode()); + result = prime * result + ((getNumIid() == null) ? 0 : getNumIid().hashCode()); + result = prime * result + ((getNum() == null) ? 0 : getNum().hashCode()); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + ((getTotalFee() == null) ? 0 : getTotalFee().hashCode()); + result = prime * result + ((getAdjustFee() == null) ? 0 : getAdjustFee().hashCode()); + result = prime * result + ((getPostFee() == null) ? 0 : getPostFee().hashCode()); + result = prime * result + ((getDiscountFee() == null) ? 0 : getDiscountFee().hashCode()); + result = prime * result + ((getPayment() == null) ? 0 : getPayment().hashCode()); + result = prime * result + ((getReceivedPayment() == null) ? 0 : getReceivedPayment().hashCode()); + result = prime * result + ((getAvailableConfirmFee() == null) ? 0 : getAvailableConfirmFee().hashCode()); + result = prime * result + ((getCodFee() == null) ? 0 : getCodFee().hashCode()); + result = prime * result + ((getCodStatus() == null) ? 0 : getCodStatus().hashCode()); + result = prime * result + ((getBuyerCodFee() == null) ? 0 : getBuyerCodFee().hashCode()); + result = prime * result + ((getSellerCodFee() == null) ? 0 : getSellerCodFee().hashCode()); + result = prime * result + ((getExpressAgencyFee() == null) ? 0 : getExpressAgencyFee().hashCode()); + result = prime * result + ((getCommissionFee() == null) ? 0 : getCommissionFee().hashCode()); + result = prime * result + ((getShippingType() == null) ? 0 : getShippingType().hashCode()); + result = prime * result + ((getCreated() == null) ? 0 : getCreated().hashCode()); + result = prime * result + ((getModified() == null) ? 0 : getModified().hashCode()); + result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); + result = prime * result + ((getConsignTime() == null) ? 0 : getConsignTime().hashCode()); + result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); + result = prime * result + ((getSellerMemo() == null) ? 0 : getSellerMemo().hashCode()); + result = prime * result + ((getBuyerMemo() == null) ? 0 : getBuyerMemo().hashCode()); + result = prime * result + ((getBuyerMessage() == null) ? 0 : getBuyerMessage().hashCode()); + result = prime * result + ((getPointFee() == null) ? 0 : getPointFee().hashCode()); + result = prime * result + ((getRealPointFee() == null) ? 0 : getRealPointFee().hashCode()); + result = prime * result + ((getBuyerObtainPointFee() == null) ? 0 : getBuyerObtainPointFee().hashCode()); + result = prime * result + ((getReceivingTime() == null) ? 0 : getReceivingTime().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getTradeMemo() == null) ? 0 : getTradeMemo().hashCode()); + result = prime * result + ((getErpSendCompany() == null) ? 0 : getErpSendCompany().hashCode()); + result = prime * result + ((getErpSendCode() == null) ? 0 : getErpSendCode().hashCode()); + result = prime * result + ((getErpSendStatus() == null) ? 0 : getErpSendStatus().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); + result = prime * result + ((getUpdateBy() == null) ? 0 : getUpdateBy().hashCode()); + result = prime * result + ((getOaid() == null) ? 0 : getOaid().hashCode()); + result = prime * result + ((getAid() == null) ? 0 : getAid().hashCode()); + result = prime * result + ((getReceiverCountry() == null) ? 0 : getReceiverCountry().hashCode()); + result = prime * result + ((getReceiverState() == null) ? 0 : getReceiverState().hashCode()); + result = prime * result + ((getReceiverCity() == null) ? 0 : getReceiverCity().hashCode()); + result = prime * result + ((getReceiverDistrict() == null) ? 0 : getReceiverDistrict().hashCode()); + result = prime * result + ((getReceiverTown() == null) ? 0 : getReceiverTown().hashCode()); + result = prime * result + ((getReceiverAddress() == null) ? 0 : getReceiverAddress().hashCode()); + result = prime * result + ((getReceiverZip() == null) ? 0 : getReceiverZip().hashCode()); + result = prime * result + ((getReceiverName() == null) ? 0 : getReceiverName().hashCode()); + result = prime * result + ((getReceiverMobile() == null) ? 0 : getReceiverMobile().hashCode()); + result = prime * result + ((getReceiverPhone() == null) ? 0 : getReceiverPhone().hashCode()); + result = prime * result + ((getSellerRate() == null) ? 0 : getSellerRate().hashCode()); + result = prime * result + ((getSellerNick() == null) ? 0 : getSellerNick().hashCode()); + result = prime * result + ((getBuyerRate() == null) ? 0 : getBuyerRate().hashCode()); + result = prime * result + ((getBuyerArea() == null) ? 0 : getBuyerArea().hashCode()); + result = prime * result + ((getAlipayNo() == null) ? 0 : getAlipayNo().hashCode()); + result = prime * result + ((getBuyerAlipayNo() == null) ? 0 : getBuyerAlipayNo().hashCode()); + result = prime * result + ((getBuyerEmail() == null) ? 0 : getBuyerEmail().hashCode()); + result = prime * result + ((getSellerAlipayNo() == null) ? 0 : getSellerAlipayNo().hashCode()); + result = prime * result + ((getHasPostFee() == null) ? 0 : getHasPostFee().hashCode()); + result = prime * result + ((getTimeoutActionTime() == null) ? 0 : getTimeoutActionTime().hashCode()); + result = prime * result + ((getSnapshotUrl() == null) ? 0 : getSnapshotUrl().hashCode()); + result = prime * result + ((getPromotion() == null) ? 0 : getPromotion().hashCode()); + result = prime * result + ((getYfxFee() == null) ? 0 : getYfxFee().hashCode()); + result = prime * result + ((getHasYfx() == null) ? 0 : getHasYfx().hashCode()); + result = prime * result + ((getSendTime() == null) ? 0 : getSendTime().hashCode()); + result = prime * result + ((getIsPartConsign() == null) ? 0 : getIsPartConsign().hashCode()); + result = prime * result + ((getSid() == null) ? 0 : getSid().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", shopId=").append(shopId); + sb.append(", tid=").append(tid); + sb.append(", title=").append(title); + sb.append(", type=").append(type); + sb.append(", sellerFlag=").append(sellerFlag); + sb.append(", hasBuyerMessage=").append(hasBuyerMessage); + sb.append(", creditCardFee=").append(creditCardFee); + sb.append(", stepTradeStatus=").append(stepTradeStatus); + sb.append(", stepPaidFee=").append(stepPaidFee); + sb.append(", buyerOpenUid=").append(buyerOpenUid); + sb.append(", markDesc=").append(markDesc); + sb.append(", buyerNick=").append(buyerNick); + sb.append(", numIid=").append(numIid); + sb.append(", num=").append(num); + sb.append(", price=").append(price); + sb.append(", totalFee=").append(totalFee); + sb.append(", adjustFee=").append(adjustFee); + sb.append(", postFee=").append(postFee); + sb.append(", discountFee=").append(discountFee); + sb.append(", payment=").append(payment); + sb.append(", receivedPayment=").append(receivedPayment); + sb.append(", availableConfirmFee=").append(availableConfirmFee); + sb.append(", codFee=").append(codFee); + sb.append(", codStatus=").append(codStatus); + sb.append(", buyerCodFee=").append(buyerCodFee); + sb.append(", sellerCodFee=").append(sellerCodFee); + sb.append(", expressAgencyFee=").append(expressAgencyFee); + sb.append(", commissionFee=").append(commissionFee); + sb.append(", shippingType=").append(shippingType); + sb.append(", created=").append(created); + sb.append(", modified=").append(modified); + sb.append(", payTime=").append(payTime); + sb.append(", consignTime=").append(consignTime); + sb.append(", endTime=").append(endTime); + sb.append(", sellerMemo=").append(sellerMemo); + sb.append(", buyerMemo=").append(buyerMemo); + sb.append(", buyerMessage=").append(buyerMessage); + sb.append(", pointFee=").append(pointFee); + sb.append(", realPointFee=").append(realPointFee); + sb.append(", buyerObtainPointFee=").append(buyerObtainPointFee); + sb.append(", receivingTime=").append(receivingTime); + sb.append(", status=").append(status); + sb.append(", tradeMemo=").append(tradeMemo); + sb.append(", erpSendCompany=").append(erpSendCompany); + sb.append(", erpSendCode=").append(erpSendCode); + sb.append(", erpSendStatus=").append(erpSendStatus); + sb.append(", createTime=").append(createTime); + sb.append(", updateTime=").append(updateTime); + sb.append(", updateBy=").append(updateBy); + sb.append(", oaid=").append(oaid); + sb.append(", aid=").append(aid); + sb.append(", receiverCountry=").append(receiverCountry); + sb.append(", receiverState=").append(receiverState); + sb.append(", receiverCity=").append(receiverCity); + sb.append(", receiverDistrict=").append(receiverDistrict); + sb.append(", receiverTown=").append(receiverTown); + sb.append(", receiverAddress=").append(receiverAddress); + sb.append(", receiverZip=").append(receiverZip); + sb.append(", receiverName=").append(receiverName); + sb.append(", receiverMobile=").append(receiverMobile); + sb.append(", receiverPhone=").append(receiverPhone); + sb.append(", sellerRate=").append(sellerRate); + sb.append(", sellerNick=").append(sellerNick); + sb.append(", buyerRate=").append(buyerRate); + sb.append(", buyerArea=").append(buyerArea); + sb.append(", alipayNo=").append(alipayNo); + sb.append(", buyerAlipayNo=").append(buyerAlipayNo); + sb.append(", buyerEmail=").append(buyerEmail); + sb.append(", sellerAlipayNo=").append(sellerAlipayNo); + sb.append(", hasPostFee=").append(hasPostFee); + sb.append(", timeoutActionTime=").append(timeoutActionTime); + sb.append(", snapshotUrl=").append(snapshotUrl); + sb.append(", promotion=").append(promotion); + sb.append(", yfxFee=").append(yfxFee); + sb.append(", hasYfx=").append(hasYfx); + sb.append(", sendTime=").append(sendTime); + sb.append(", isPartConsign=").append(isPartConsign); + sb.append(", sid=").append(sid); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/domain/TaoOrderItem.java b/oms-api/src/main/java/com/qihang/oms/domain/TaoOrderItem.java new file mode 100644 index 00000000..ecc63c9b --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/domain/TaoOrderItem.java @@ -0,0 +1,930 @@ +package com.qihang.oms.domain; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 淘宝订单明细表 + * @TableName tao_order_item + */ +public class TaoOrderItem implements Serializable { + /** + * + */ + private Long id; + + /** + * 订单id + */ + private Long tid; + + /** + * 子订单编号 + */ + private Long oid; + + /** + * 应付金额（商品价格 * 商品数量 + 手工调整金额 - 子订单级订单优惠金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + private BigDecimal totalFee; + + /** + * 子订单级订单优惠金额。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + private BigDecimal discountFee; + + /** + * 手工调整金额.格式为:1.01;单位:元;精确到小数点后两位. + */ + private BigDecimal adjustFee; + + /** + * 分摊之后的实付金额 + */ + private Double divideOrderFee; + + /** + * 优惠分摊 + */ + private Double partMjzDiscount; + + /** + * 子订单实付金额。精确到2位小数，单位:元。如:200.07，表示:200元7分。对于多子订单的交易，计算公式如下：payment = price * num + adjust_fee - discount_fee ；单子订单交易，payment与主订单的payment一致，对于退款成功的子订单，由于主订单的优惠分摊金额，会造成该字段可能不为0.00元。建议使用退款前的实付金额减去退款单中的实际退款金额计算。 + */ + private Double payment; + + /** + * 商品标题 + */ + private String title; + + /** + * 商品主图 + */ + private String picPath; + + /** + * 商品价格 + */ + private BigDecimal price; + + /** + * 商品数字ID + */ + private Long numIid; + + /** + * 商品的最小库存单位Sku的id.可以通过taobao.item.sku.get获取详细的Sku信息天猫的SKUID + */ + private String skuId; + + /** + * 商家外部编码(可与商家外部系统对接)。 + */ + private String outerIid; + + /** + * 外部网店自己定义的Sku编号 + */ + private String outerSkuId; + + /** + * SKU的值。如：机身颜色:黑色;手机套餐:官方标配 + */ + private String skuPropertiesName; + + /** + * 套餐ID + */ + private String itemMealId; + + /** + * 套餐的值。如：M8原装电池:便携支架:M8专用座充:莫凡保护袋 + */ + private String itemMealName; + + /** + * 数量 + */ + private Integer num; + + /** + * 订单超时到期时间。格式:yyyy-MM-dd HH:mm:ss + */ + private Date timeoutActionTime; + + /** + * 商品备注 + */ + private String itemMemo; + + /** + * 买家是否已评价。可选值：true(已评价)，false(未评价) + */ + private String buyerRate; + + /** + * 卖家是否已评价。可选值：true(已评价)，false(未评价) + */ + private String sellerRate; + + /** + * 卖家类型，可选值为：B（商城商家），C（普通卖家） + */ + private String sellerType; + + /** + * 交易商品对应的类目ID + */ + private Long cid; + + /** + * 是否超卖 + */ + private String isOversold; + + /** + * 子订单的交易结束时间说明：子订单有单独的结束时间，与主订单的结束时间可能有所不同，在有退款发起的时候或者是主订单分阶段付款的时候，子订单的结束时间会早于主订单的结束时间，所以开放这个字段便于订单结束状态的判断 + */ + private Date endTime; + + /** + * 子订单来源,如jhs(聚划算)、taobao(淘宝)、wap(无线) + */ + private String orderFrom; + + /** + * 是否是服务订单，是返回true，否返回false。 + */ + private String isServiceOrder; + + /** + * 子订单发货时间，当卖家对订单进行了多次发货，子订单的发货时间和主订单的发货时间可能不一样了，那么就需要以子订单的时间为准。（没有进行多次发货的订单，主订单的发货时间和子订单的发货时间都一样） + */ + private Date consignTime; + + /** + * 子订单的运送方式（卖家对订单进行多次发货之后，一个主订单下的子订单的运送方式可能不同，用order.shipping_type来区分子订单的运送方式） + */ + private String shippingType; + + /** + * 子订单发货的快递公司名称 + */ + private String logisticsCompany; + + /** + * 子订单所在包裹的运单号 + */ + private String invoiceNo; + + /** + * 捆绑的子订单号，表示该子订单要和捆绑的子订单一起发货，用于卖家子订单捆绑发货 + */ + private String bindOid; + + /** + * 订单状态（请关注此状态，如果为TRADE_CLOSED_BY_TAOBAO状态，则不要对此订单进行发货，切记啊！）。可选值: +TRADE_NO_CREATE_PAY(没有创建支付宝交易) +WAIT_BUYER_PAY(等待买家付款) +WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) +WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) +TRADE_BUYER_SIGNED(买家已签收,货到付款专用) +TRADE_FINISHED(交易成功) +TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) +TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) +PAY_PENDING(国际信用卡支付付款确认中) + */ + private String status; + + /** + * 退款状态。退款状态。可选值 WAIT_SELLER_AGREE(买家已经申请退款，等待卖家同意) WAIT_BUYER_RETURN_GOODS(卖家已经同意退款，等待买家退货) WAIT_SELLER_CONFIRM_GOODS(买家已经退货，等待卖家确认收货) SELLER_REFUSE_BUYER(卖家拒绝退款) CLOSED(退款关闭) SUCCESS(退款成功) + */ + private String refundStatus; + + /** + * 最近退款ID + */ + private String refundId; + + /** + * + */ + private String remark; + + private static final long serialVersionUID = 1L; + + /** + * + */ + public Long getId() { + return id; + } + + /** + * + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 订单id + */ + public Long getTid() { + return tid; + } + + /** + * 订单id + */ + public void setTid(Long tid) { + this.tid = tid; + } + + /** + * 子订单编号 + */ + public Long getOid() { + return oid; + } + + /** + * 子订单编号 + */ + public void setOid(Long oid) { + this.oid = oid; + } + + /** + * 应付金额（商品价格 * 商品数量 + 手工调整金额 - 子订单级订单优惠金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public BigDecimal getTotalFee() { + return totalFee; + } + + /** + * 应付金额（商品价格 * 商品数量 + 手工调整金额 - 子订单级订单优惠金额）。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public void setTotalFee(BigDecimal totalFee) { + this.totalFee = totalFee; + } + + /** + * 子订单级订单优惠金额。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public BigDecimal getDiscountFee() { + return discountFee; + } + + /** + * 子订单级订单优惠金额。精确到2位小数;单位:元。如:200.07，表示:200元7分 + */ + public void setDiscountFee(BigDecimal discountFee) { + this.discountFee = discountFee; + } + + /** + * 手工调整金额.格式为:1.01;单位:元;精确到小数点后两位. + */ + public BigDecimal getAdjustFee() { + return adjustFee; + } + + /** + * 手工调整金额.格式为:1.01;单位:元;精确到小数点后两位. + */ + public void setAdjustFee(BigDecimal adjustFee) { + this.adjustFee = adjustFee; + } + + /** + * 分摊之后的实付金额 + */ + public Double getDivideOrderFee() { + return divideOrderFee; + } + + /** + * 分摊之后的实付金额 + */ + public void setDivideOrderFee(Double divideOrderFee) { + this.divideOrderFee = divideOrderFee; + } + + /** + * 优惠分摊 + */ + public Double getPartMjzDiscount() { + return partMjzDiscount; + } + + /** + * 优惠分摊 + */ + public void setPartMjzDiscount(Double partMjzDiscount) { + this.partMjzDiscount = partMjzDiscount; + } + + /** + * 子订单实付金额。精确到2位小数，单位:元。如:200.07，表示:200元7分。对于多子订单的交易，计算公式如下：payment = price * num + adjust_fee - discount_fee ；单子订单交易，payment与主订单的payment一致，对于退款成功的子订单，由于主订单的优惠分摊金额，会造成该字段可能不为0.00元。建议使用退款前的实付金额减去退款单中的实际退款金额计算。 + */ + public Double getPayment() { + return payment; + } + + /** + * 子订单实付金额。精确到2位小数，单位:元。如:200.07，表示:200元7分。对于多子订单的交易，计算公式如下：payment = price * num + adjust_fee - discount_fee ；单子订单交易，payment与主订单的payment一致，对于退款成功的子订单，由于主订单的优惠分摊金额，会造成该字段可能不为0.00元。建议使用退款前的实付金额减去退款单中的实际退款金额计算。 + */ + public void setPayment(Double payment) { + this.payment = payment; + } + + /** + * 商品标题 + */ + public String getTitle() { + return title; + } + + /** + * 商品标题 + */ + public void setTitle(String title) { + this.title = title; + } + + /** + * 商品主图 + */ + public String getPicPath() { + return picPath; + } + + /** + * 商品主图 + */ + public void setPicPath(String picPath) { + this.picPath = picPath; + } + + /** + * 商品价格 + */ + public BigDecimal getPrice() { + return price; + } + + /** + * 商品价格 + */ + public void setPrice(BigDecimal price) { + this.price = price; + } + + /** + * 商品数字ID + */ + public Long getNumIid() { + return numIid; + } + + /** + * 商品数字ID + */ + public void setNumIid(Long numIid) { + this.numIid = numIid; + } + + /** + * 商品的最小库存单位Sku的id.可以通过taobao.item.sku.get获取详细的Sku信息天猫的SKUID + */ + public String getSkuId() { + return skuId; + } + + /** + * 商品的最小库存单位Sku的id.可以通过taobao.item.sku.get获取详细的Sku信息天猫的SKUID + */ + public void setSkuId(String skuId) { + this.skuId = skuId; + } + + /** + * 商家外部编码(可与商家外部系统对接)。 + */ + public String getOuterIid() { + return outerIid; + } + + /** + * 商家外部编码(可与商家外部系统对接)。 + */ + public void setOuterIid(String outerIid) { + this.outerIid = outerIid; + } + + /** + * 外部网店自己定义的Sku编号 + */ + public String getOuterSkuId() { + return outerSkuId; + } + + /** + * 外部网店自己定义的Sku编号 + */ + public void setOuterSkuId(String outerSkuId) { + this.outerSkuId = outerSkuId; + } + + /** + * SKU的值。如：机身颜色:黑色;手机套餐:官方标配 + */ + public String getSkuPropertiesName() { + return skuPropertiesName; + } + + /** + * SKU的值。如：机身颜色:黑色;手机套餐:官方标配 + */ + public void setSkuPropertiesName(String skuPropertiesName) { + this.skuPropertiesName = skuPropertiesName; + } + + /** + * 套餐ID + */ + public String getItemMealId() { + return itemMealId; + } + + /** + * 套餐ID + */ + public void setItemMealId(String itemMealId) { + this.itemMealId = itemMealId; + } + + /** + * 套餐的值。如：M8原装电池:便携支架:M8专用座充:莫凡保护袋 + */ + public String getItemMealName() { + return itemMealName; + } + + /** + * 套餐的值。如：M8原装电池:便携支架:M8专用座充:莫凡保护袋 + */ + public void setItemMealName(String itemMealName) { + this.itemMealName = itemMealName; + } + + /** + * 数量 + */ + public Integer getNum() { + return num; + } + + /** + * 数量 + */ + public void setNum(Integer num) { + this.num = num; + } + + /** + * 订单超时到期时间。格式:yyyy-MM-dd HH:mm:ss + */ + public Date getTimeoutActionTime() { + return timeoutActionTime; + } + + /** + * 订单超时到期时间。格式:yyyy-MM-dd HH:mm:ss + */ + public void setTimeoutActionTime(Date timeoutActionTime) { + this.timeoutActionTime = timeoutActionTime; + } + + /** + * 商品备注 + */ + public String getItemMemo() { + return itemMemo; + } + + /** + * 商品备注 + */ + public void setItemMemo(String itemMemo) { + this.itemMemo = itemMemo; + } + + /** + * 买家是否已评价。可选值：true(已评价)，false(未评价) + */ + public String getBuyerRate() { + return buyerRate; + } + + /** + * 买家是否已评价。可选值：true(已评价)，false(未评价) + */ + public void setBuyerRate(String buyerRate) { + this.buyerRate = buyerRate; + } + + /** + * 卖家是否已评价。可选值：true(已评价)，false(未评价) + */ + public String getSellerRate() { + return sellerRate; + } + + /** + * 卖家是否已评价。可选值：true(已评价)，false(未评价) + */ + public void setSellerRate(String sellerRate) { + this.sellerRate = sellerRate; + } + + /** + * 卖家类型，可选值为：B（商城商家），C（普通卖家） + */ + public String getSellerType() { + return sellerType; + } + + /** + * 卖家类型，可选值为：B（商城商家），C（普通卖家） + */ + public void setSellerType(String sellerType) { + this.sellerType = sellerType; + } + + /** + * 交易商品对应的类目ID + */ + public Long getCid() { + return cid; + } + + /** + * 交易商品对应的类目ID + */ + public void setCid(Long cid) { + this.cid = cid; + } + + /** + * 是否超卖 + */ + public String getIsOversold() { + return isOversold; + } + + /** + * 是否超卖 + */ + public void setIsOversold(String isOversold) { + this.isOversold = isOversold; + } + + /** + * 子订单的交易结束时间说明：子订单有单独的结束时间，与主订单的结束时间可能有所不同，在有退款发起的时候或者是主订单分阶段付款的时候，子订单的结束时间会早于主订单的结束时间，所以开放这个字段便于订单结束状态的判断 + */ + public Date getEndTime() { + return endTime; + } + + /** + * 子订单的交易结束时间说明：子订单有单独的结束时间，与主订单的结束时间可能有所不同，在有退款发起的时候或者是主订单分阶段付款的时候，子订单的结束时间会早于主订单的结束时间，所以开放这个字段便于订单结束状态的判断 + */ + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + /** + * 子订单来源,如jhs(聚划算)、taobao(淘宝)、wap(无线) + */ + public String getOrderFrom() { + return orderFrom; + } + + /** + * 子订单来源,如jhs(聚划算)、taobao(淘宝)、wap(无线) + */ + public void setOrderFrom(String orderFrom) { + this.orderFrom = orderFrom; + } + + /** + * 是否是服务订单，是返回true，否返回false。 + */ + public String getIsServiceOrder() { + return isServiceOrder; + } + + /** + * 是否是服务订单，是返回true，否返回false。 + */ + public void setIsServiceOrder(String isServiceOrder) { + this.isServiceOrder = isServiceOrder; + } + + /** + * 子订单发货时间，当卖家对订单进行了多次发货，子订单的发货时间和主订单的发货时间可能不一样了，那么就需要以子订单的时间为准。（没有进行多次发货的订单，主订单的发货时间和子订单的发货时间都一样） + */ + public Date getConsignTime() { + return consignTime; + } + + /** + * 子订单发货时间，当卖家对订单进行了多次发货，子订单的发货时间和主订单的发货时间可能不一样了，那么就需要以子订单的时间为准。（没有进行多次发货的订单，主订单的发货时间和子订单的发货时间都一样） + */ + public void setConsignTime(Date consignTime) { + this.consignTime = consignTime; + } + + /** + * 子订单的运送方式（卖家对订单进行多次发货之后，一个主订单下的子订单的运送方式可能不同，用order.shipping_type来区分子订单的运送方式） + */ + public String getShippingType() { + return shippingType; + } + + /** + * 子订单的运送方式（卖家对订单进行多次发货之后，一个主订单下的子订单的运送方式可能不同，用order.shipping_type来区分子订单的运送方式） + */ + public void setShippingType(String shippingType) { + this.shippingType = shippingType; + } + + /** + * 子订单发货的快递公司名称 + */ + public String getLogisticsCompany() { + return logisticsCompany; + } + + /** + * 子订单发货的快递公司名称 + */ + public void setLogisticsCompany(String logisticsCompany) { + this.logisticsCompany = logisticsCompany; + } + + /** + * 子订单所在包裹的运单号 + */ + public String getInvoiceNo() { + return invoiceNo; + } + + /** + * 子订单所在包裹的运单号 + */ + public void setInvoiceNo(String invoiceNo) { + this.invoiceNo = invoiceNo; + } + + /** + * 捆绑的子订单号，表示该子订单要和捆绑的子订单一起发货，用于卖家子订单捆绑发货 + */ + public String getBindOid() { + return bindOid; + } + + /** + * 捆绑的子订单号，表示该子订单要和捆绑的子订单一起发货，用于卖家子订单捆绑发货 + */ + public void setBindOid(String bindOid) { + this.bindOid = bindOid; + } + + /** + * 订单状态（请关注此状态，如果为TRADE_CLOSED_BY_TAOBAO状态，则不要对此订单进行发货，切记啊！）。可选值: +TRADE_NO_CREATE_PAY(没有创建支付宝交易) +WAIT_BUYER_PAY(等待买家付款) +WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) +WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) +TRADE_BUYER_SIGNED(买家已签收,货到付款专用) +TRADE_FINISHED(交易成功) +TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) +TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) +PAY_PENDING(国际信用卡支付付款确认中) + */ + public String getStatus() { + return status; + } + + /** + * 订单状态（请关注此状态，如果为TRADE_CLOSED_BY_TAOBAO状态，则不要对此订单进行发货，切记啊！）。可选值: +TRADE_NO_CREATE_PAY(没有创建支付宝交易) +WAIT_BUYER_PAY(等待买家付款) +WAIT_SELLER_SEND_GOODS(等待卖家发货,即:买家已付款) +WAIT_BUYER_CONFIRM_GOODS(等待买家确认收货,即:卖家已发货) +TRADE_BUYER_SIGNED(买家已签收,货到付款专用) +TRADE_FINISHED(交易成功) +TRADE_CLOSED(付款以后用户退款成功，交易自动关闭) +TRADE_CLOSED_BY_TAOBAO(付款以前，卖家或买家主动关闭交易) +PAY_PENDING(国际信用卡支付付款确认中) + */ + public void setStatus(String status) { + this.status = status; + } + + /** + * 退款状态。退款状态。可选值 WAIT_SELLER_AGREE(买家已经申请退款，等待卖家同意) WAIT_BUYER_RETURN_GOODS(卖家已经同意退款，等待买家退货) WAIT_SELLER_CONFIRM_GOODS(买家已经退货，等待卖家确认收货) SELLER_REFUSE_BUYER(卖家拒绝退款) CLOSED(退款关闭) SUCCESS(退款成功) + */ + public String getRefundStatus() { + return refundStatus; + } + + /** + * 退款状态。退款状态。可选值 WAIT_SELLER_AGREE(买家已经申请退款，等待卖家同意) WAIT_BUYER_RETURN_GOODS(卖家已经同意退款，等待买家退货) WAIT_SELLER_CONFIRM_GOODS(买家已经退货，等待卖家确认收货) SELLER_REFUSE_BUYER(卖家拒绝退款) CLOSED(退款关闭) SUCCESS(退款成功) + */ + public void setRefundStatus(String refundStatus) { + this.refundStatus = refundStatus; + } + + /** + * 最近退款ID + */ + public String getRefundId() { + return refundId; + } + + /** + * 最近退款ID + */ + public void setRefundId(String refundId) { + this.refundId = refundId; + } + + /** + * + */ + public String getRemark() { + return remark; + } + + /** + * + */ + public void setRemark(String remark) { + this.remark = remark; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + TaoOrderItem other = (TaoOrderItem) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getTid() == null ? other.getTid() == null : this.getTid().equals(other.getTid())) + && (this.getOid() == null ? other.getOid() == null : this.getOid().equals(other.getOid())) + && (this.getTotalFee() == null ? other.getTotalFee() == null : this.getTotalFee().equals(other.getTotalFee())) + && (this.getDiscountFee() == null ? other.getDiscountFee() == null : this.getDiscountFee().equals(other.getDiscountFee())) + && (this.getAdjustFee() == null ? other.getAdjustFee() == null : this.getAdjustFee().equals(other.getAdjustFee())) + && (this.getDivideOrderFee() == null ? other.getDivideOrderFee() == null : this.getDivideOrderFee().equals(other.getDivideOrderFee())) + && (this.getPartMjzDiscount() == null ? other.getPartMjzDiscount() == null : this.getPartMjzDiscount().equals(other.getPartMjzDiscount())) + && (this.getPayment() == null ? other.getPayment() == null : this.getPayment().equals(other.getPayment())) + && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle())) + && (this.getPicPath() == null ? other.getPicPath() == null : this.getPicPath().equals(other.getPicPath())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (this.getNumIid() == null ? other.getNumIid() == null : this.getNumIid().equals(other.getNumIid())) + && (this.getSkuId() == null ? other.getSkuId() == null : this.getSkuId().equals(other.getSkuId())) + && (this.getOuterIid() == null ? other.getOuterIid() == null : this.getOuterIid().equals(other.getOuterIid())) + && (this.getOuterSkuId() == null ? other.getOuterSkuId() == null : this.getOuterSkuId().equals(other.getOuterSkuId())) + && (this.getSkuPropertiesName() == null ? other.getSkuPropertiesName() == null : this.getSkuPropertiesName().equals(other.getSkuPropertiesName())) + && (this.getItemMealId() == null ? other.getItemMealId() == null : this.getItemMealId().equals(other.getItemMealId())) + && (this.getItemMealName() == null ? other.getItemMealName() == null : this.getItemMealName().equals(other.getItemMealName())) + && (this.getNum() == null ? other.getNum() == null : this.getNum().equals(other.getNum())) + && (this.getTimeoutActionTime() == null ? other.getTimeoutActionTime() == null : this.getTimeoutActionTime().equals(other.getTimeoutActionTime())) + && (this.getItemMemo() == null ? other.getItemMemo() == null : this.getItemMemo().equals(other.getItemMemo())) + && (this.getBuyerRate() == null ? other.getBuyerRate() == null : this.getBuyerRate().equals(other.getBuyerRate())) + && (this.getSellerRate() == null ? other.getSellerRate() == null : this.getSellerRate().equals(other.getSellerRate())) + && (this.getSellerType() == null ? other.getSellerType() == null : this.getSellerType().equals(other.getSellerType())) + && (this.getCid() == null ? other.getCid() == null : this.getCid().equals(other.getCid())) + && (this.getIsOversold() == null ? other.getIsOversold() == null : this.getIsOversold().equals(other.getIsOversold())) + && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) + && (this.getOrderFrom() == null ? other.getOrderFrom() == null : this.getOrderFrom().equals(other.getOrderFrom())) + && (this.getIsServiceOrder() == null ? other.getIsServiceOrder() == null : this.getIsServiceOrder().equals(other.getIsServiceOrder())) + && (this.getConsignTime() == null ? other.getConsignTime() == null : this.getConsignTime().equals(other.getConsignTime())) + && (this.getShippingType() == null ? other.getShippingType() == null : this.getShippingType().equals(other.getShippingType())) + && (this.getLogisticsCompany() == null ? other.getLogisticsCompany() == null : this.getLogisticsCompany().equals(other.getLogisticsCompany())) + && (this.getInvoiceNo() == null ? other.getInvoiceNo() == null : this.getInvoiceNo().equals(other.getInvoiceNo())) + && (this.getBindOid() == null ? other.getBindOid() == null : this.getBindOid().equals(other.getBindOid())) + && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getRefundStatus() == null ? other.getRefundStatus() == null : this.getRefundStatus().equals(other.getRefundStatus())) + && (this.getRefundId() == null ? other.getRefundId() == null : this.getRefundId().equals(other.getRefundId())) + && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getTid() == null) ? 0 : getTid().hashCode()); + result = prime * result + ((getOid() == null) ? 0 : getOid().hashCode()); + result = prime * result + ((getTotalFee() == null) ? 0 : getTotalFee().hashCode()); + result = prime * result + ((getDiscountFee() == null) ? 0 : getDiscountFee().hashCode()); + result = prime * result + ((getAdjustFee() == null) ? 0 : getAdjustFee().hashCode()); + result = prime * result + ((getDivideOrderFee() == null) ? 0 : getDivideOrderFee().hashCode()); + result = prime * result + ((getPartMjzDiscount() == null) ? 0 : getPartMjzDiscount().hashCode()); + result = prime * result + ((getPayment() == null) ? 0 : getPayment().hashCode()); + result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode()); + result = prime * result + ((getPicPath() == null) ? 0 : getPicPath().hashCode()); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + ((getNumIid() == null) ? 0 : getNumIid().hashCode()); + result = prime * result + ((getSkuId() == null) ? 0 : getSkuId().hashCode()); + result = prime * result + ((getOuterIid() == null) ? 0 : getOuterIid().hashCode()); + result = prime * result + ((getOuterSkuId() == null) ? 0 : getOuterSkuId().hashCode()); + result = prime * result + ((getSkuPropertiesName() == null) ? 0 : getSkuPropertiesName().hashCode()); + result = prime * result + ((getItemMealId() == null) ? 0 : getItemMealId().hashCode()); + result = prime * result + ((getItemMealName() == null) ? 0 : getItemMealName().hashCode()); + result = prime * result + ((getNum() == null) ? 0 : getNum().hashCode()); + result = prime * result + ((getTimeoutActionTime() == null) ? 0 : getTimeoutActionTime().hashCode()); + result = prime * result + ((getItemMemo() == null) ? 0 : getItemMemo().hashCode()); + result = prime * result + ((getBuyerRate() == null) ? 0 : getBuyerRate().hashCode()); + result = prime * result + ((getSellerRate() == null) ? 0 : getSellerRate().hashCode()); + result = prime * result + ((getSellerType() == null) ? 0 : getSellerType().hashCode()); + result = prime * result + ((getCid() == null) ? 0 : getCid().hashCode()); + result = prime * result + ((getIsOversold() == null) ? 0 : getIsOversold().hashCode()); + result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); + result = prime * result + ((getOrderFrom() == null) ? 0 : getOrderFrom().hashCode()); + result = prime * result + ((getIsServiceOrder() == null) ? 0 : getIsServiceOrder().hashCode()); + result = prime * result + ((getConsignTime() == null) ? 0 : getConsignTime().hashCode()); + result = prime * result + ((getShippingType() == null) ? 0 : getShippingType().hashCode()); + result = prime * result + ((getLogisticsCompany() == null) ? 0 : getLogisticsCompany().hashCode()); + result = prime * result + ((getInvoiceNo() == null) ? 0 : getInvoiceNo().hashCode()); + result = prime * result + ((getBindOid() == null) ? 0 : getBindOid().hashCode()); + result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getRefundStatus() == null) ? 0 : getRefundStatus().hashCode()); + result = prime * result + ((getRefundId() == null) ? 0 : getRefundId().hashCode()); + result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", tid=").append(tid); + sb.append(", oid=").append(oid); + sb.append(", totalFee=").append(totalFee); + sb.append(", discountFee=").append(discountFee); + sb.append(", adjustFee=").append(adjustFee); + sb.append(", divideOrderFee=").append(divideOrderFee); + sb.append(", partMjzDiscount=").append(partMjzDiscount); + sb.append(", payment=").append(payment); + sb.append(", title=").append(title); + sb.append(", picPath=").append(picPath); + sb.append(", price=").append(price); + sb.append(", numIid=").append(numIid); + sb.append(", skuId=").append(skuId); + sb.append(", outerIid=").append(outerIid); + sb.append(", outerSkuId=").append(outerSkuId); + sb.append(", skuPropertiesName=").append(skuPropertiesName); + sb.append(", itemMealId=").append(itemMealId); + sb.append(", itemMealName=").append(itemMealName); + sb.append(", num=").append(num); + sb.append(", timeoutActionTime=").append(timeoutActionTime); + sb.append(", itemMemo=").append(itemMemo); + sb.append(", buyerRate=").append(buyerRate); + sb.append(", sellerRate=").append(sellerRate); + sb.append(", sellerType=").append(sellerType); + sb.append(", cid=").append(cid); + sb.append(", isOversold=").append(isOversold); + sb.append(", endTime=").append(endTime); + sb.append(", orderFrom=").append(orderFrom); + sb.append(", isServiceOrder=").append(isServiceOrder); + sb.append(", consignTime=").append(consignTime); + sb.append(", shippingType=").append(shippingType); + sb.append(", logisticsCompany=").append(logisticsCompany); + sb.append(", invoiceNo=").append(invoiceNo); + sb.append(", bindOid=").append(bindOid); + sb.append(", status=").append(status); + sb.append(", refundStatus=").append(refundStatus); + sb.append(", refundId=").append(refundId); + sb.append(", remark=").append(remark); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/TaoGoodsSkuMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/TaoGoodsSkuMapper.java new file mode 100644 index 00000000..30c48be3 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/mapper/TaoGoodsSkuMapper.java @@ -0,0 +1,18 @@ +package com.qihang.oms.mapper; + +import com.qihang.oms.domain.TaoGoodsSku; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【tao_goods_sku】的数据库操作Mapper +* @createDate 2024-03-16 17:51:46 +* @Entity com.qihang.oms.domain.TaoGoodsSku +*/ +public interface TaoGoodsSkuMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderItemMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderItemMapper.java new file mode 100644 index 00000000..fe2ea121 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderItemMapper.java @@ -0,0 +1,18 @@ +package com.qihang.oms.mapper; + +import com.qihang.oms.domain.TaoOrderItem; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【tao_order_item(淘宝订单明细表)】的数据库操作Mapper +* @createDate 2024-03-16 17:51:46 +* @Entity com.qihang.oms.domain.TaoOrderItem +*/ +public interface TaoOrderItemMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderMapper.java new file mode 100644 index 00000000..d83f0248 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/mapper/TaoOrderMapper.java @@ -0,0 +1,18 @@ +package com.qihang.oms.mapper; + +import com.qihang.oms.domain.TaoOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** +* @author TW +* @description 针对表【tao_order(淘宝订单表)】的数据库操作Mapper +* @createDate 2024-03-16 17:51:46 +* @Entity com.qihang.oms.domain.TaoOrder +*/ +public interface TaoOrderMapper extends BaseMapper { + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/TaoGoodsSkuService.java b/oms-api/src/main/java/com/qihang/oms/service/TaoGoodsSkuService.java new file mode 100644 index 00000000..3e2af32a --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/TaoGoodsSkuService.java @@ -0,0 +1,13 @@ +package com.qihang.oms.service; + +import com.qihang.oms.domain.TaoGoodsSku; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【tao_goods_sku】的数据库操作Service +* @createDate 2024-03-16 17:51:46 +*/ +public interface TaoGoodsSkuService extends IService { + +} diff --git a/oms-api/src/main/java/com/qihang/oms/service/TaoOrderItemService.java b/oms-api/src/main/java/com/qihang/oms/service/TaoOrderItemService.java new file mode 100644 index 00000000..20614c93 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/TaoOrderItemService.java @@ -0,0 +1,13 @@ +package com.qihang.oms.service; + +import com.qihang.oms.domain.TaoOrderItem; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【tao_order_item(淘宝订单明细表)】的数据库操作Service +* @createDate 2024-03-16 17:51:46 +*/ +public interface TaoOrderItemService extends IService { + +} diff --git a/oms-api/src/main/java/com/qihang/oms/service/TaoOrderService.java b/oms-api/src/main/java/com/qihang/oms/service/TaoOrderService.java new file mode 100644 index 00000000..e899e07a --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/TaoOrderService.java @@ -0,0 +1,13 @@ +package com.qihang.oms.service; + +import com.qihang.oms.domain.TaoOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author TW +* @description 针对表【tao_order(淘宝订单表)】的数据库操作Service +* @createDate 2024-03-16 17:51:46 +*/ +public interface TaoOrderService extends IService { + +} diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java index 2f114c7e..28e45ba9 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/OOrderServiceImpl.java @@ -35,6 +35,10 @@ public class OOrderServiceImpl extends ServiceImpl private final JdOrderMapper jdOrderMapper; private final JdOrderItemMapper jdOrderItemMapper; private final JdGoodsSkuMapper jdGoodsSkuMapper; + private final TaoOrderMapper taoOrderMapper; + private final TaoOrderItemMapper taoOrderItemMapper; + private final TaoGoodsSkuMapper taoGoodsSkuMapper; + @Transactional @Override public ResultVo jdOrderMessage(String orderId) { @@ -42,7 +46,7 @@ public class OOrderServiceImpl extends ServiceImpl List jdOrders = jdOrderMapper.selectList(new LambdaQueryWrapper().eq(JdOrder::getOrderId, orderId)); if(jdOrders == null || jdOrders.size() == 0) { // 没有找到订单信息 - return new ResultVo<>(ResultVoEnum.NotFound,"没有找到京东订单："+orderId); + return new ResultVo<>(ResultVoEnum.NotFound,"没有找到JD订单："+orderId); } JdOrder jdOrder = jdOrders.get(0); @@ -147,11 +151,42 @@ public class OOrderServiceImpl extends ServiceImpl @Override public ResultVo taoOrderMessage(String orderId) { log.info("Tao订单消息处理"+orderId); -// List jdOrders = jdOrderMapper.selectList(new LambdaQueryWrapper().eq(JdOrder::getOrderId, orderId)); -// if(jdOrders == null || jdOrders.size() == 0) { -// // 没有找到订单信息 -// return new ResultVo<>(ResultVoEnum.NotFound,"没有找到TAO订单："+orderId); -// } + List taoOrders = taoOrderMapper.selectList(new LambdaQueryWrapper().eq(TaoOrder::getTid, orderId)); + + if(taoOrders == null || taoOrders.size() == 0) { + // 没有找到订单信息 + return new ResultVo<>(ResultVoEnum.NotFound,"没有找到TAO订单："+orderId); + } + TaoOrder taoOrder = taoOrders.get(0); + List oOrders = orderMapper.selectList(new LambdaQueryWrapper().eq(OOrder::getOrderNum, orderId)); + if(oOrders == null || oOrders.isEmpty()) { + // 新增订单 + OOrder insert = new OOrder(); + + List taoOrderItems = taoOrderItemMapper.selectList(new LambdaQueryWrapper().eq(TaoOrderItem::getTid, taoOrder.getTid())); + if(taoOrderItems!=null && taoOrderItems.size()>0) { + for (var item : taoOrderItems) { + OOrderItem orderItem = new OOrderItem(); + orderItem.setOrderId(insert.getId()); + orderItem.setSubOrderNum(item.getTid().toString()); + // TODO：这里将订单商品skuid转换成erp系统的skuid + Long erpGoodsId = 0L; + Long erpSkuId = 0L; + + List taoGoodsSku = taoGoodsSkuMapper.selectList(new LambdaQueryWrapper().eq(TaoGoodsSku::getSkuId, item.getSkuId())); + if (taoGoodsSku != null && !taoGoodsSku.isEmpty()) { + erpGoodsId = taoGoodsSku.get(0).getErpGoodsId(); + erpSkuId = taoGoodsSku.get(0).getErpGoodsSkuId(); +// orderItem.setGoodsImg(taoGoodsSku.get(0).getLogo()); +// orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSkuName()); + orderItem.setSkuNum(taoGoodsSku.get(0).getOuterId()); + } + } + } + + }else{ + // 修改订单 (修改：) + } return null; } } diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/TaoGoodsSkuServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoGoodsSkuServiceImpl.java new file mode 100644 index 00000000..e9fd330e --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoGoodsSkuServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.oms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.oms.domain.TaoGoodsSku; +import com.qihang.oms.service.TaoGoodsSkuService; +import com.qihang.oms.mapper.TaoGoodsSkuMapper; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【tao_goods_sku】的数据库操作Service实现 +* @createDate 2024-03-16 17:51:46 +*/ +@Service +public class TaoGoodsSkuServiceImpl extends ServiceImpl + implements TaoGoodsSkuService{ + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderItemServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderItemServiceImpl.java new file mode 100644 index 00000000..aaa74d0b --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderItemServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.oms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.oms.domain.TaoOrderItem; +import com.qihang.oms.service.TaoOrderItemService; +import com.qihang.oms.mapper.TaoOrderItemMapper; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【tao_order_item(淘宝订单明细表)】的数据库操作Service实现 +* @createDate 2024-03-16 17:51:46 +*/ +@Service +public class TaoOrderItemServiceImpl extends ServiceImpl + implements TaoOrderItemService{ + +} + + + + diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderServiceImpl.java new file mode 100644 index 00000000..77905355 --- /dev/null +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/TaoOrderServiceImpl.java @@ -0,0 +1,22 @@ +package com.qihang.oms.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qihang.oms.domain.TaoOrder; +import com.qihang.oms.service.TaoOrderService; +import com.qihang.oms.mapper.TaoOrderMapper; +import org.springframework.stereotype.Service; + +/** +* @author TW +* @description 针对表【tao_order(淘宝订单表)】的数据库操作Service实现 +* @createDate 2024-03-16 17:51:46 +*/ +@Service +public class TaoOrderServiceImpl extends ServiceImpl + implements TaoOrderService{ + +} + + + + diff --git a/oms-api/src/main/resources/mapper/TaoGoodsSkuMapper.xml b/oms-api/src/main/resources/mapper/TaoGoodsSkuMapper.xml new file mode 100644 index 00000000..96ab9054 --- /dev/null +++ b/oms-api/src/main/resources/mapper/TaoGoodsSkuMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,tao_goods_id,num_iid, + iid,sku_id,properties, + properties_name,quantity,spec, + price,outer_id,created, + modified,status,sku_spec_id, + barcode,erp_goods_sku_id,erp_goods_id, + create_time + + diff --git a/oms-api/src/main/resources/mapper/TaoOrderItemMapper.xml b/oms-api/src/main/resources/mapper/TaoOrderItemMapper.xml new file mode 100644 index 00000000..a18932f8 --- /dev/null +++ b/oms-api/src/main/resources/mapper/TaoOrderItemMapper.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,tid,oid, + total_fee,discount_fee,adjust_fee, + divide_order_fee,part_mjz_discount,payment, + title,pic_path,price, + num_iid,sku_id,outer_iid, + outer_sku_id,sku_properties_name,item_meal_id, + item_meal_name,num,timeout_action_time, + item_memo,buyer_rate,seller_rate, + seller_type,cid,is_oversold, + end_time,order_from,is_service_order, + consign_time,shipping_type,logistics_company, + invoice_no,bind_oid,status, + refund_status,refund_id,remark + + diff --git a/oms-api/src/main/resources/mapper/TaoOrderMapper.xml b/oms-api/src/main/resources/mapper/TaoOrderMapper.xml new file mode 100644 index 00000000..57b16c4e --- /dev/null +++ b/oms-api/src/main/resources/mapper/TaoOrderMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id,shop_id,tid, + title,type,seller_flag, + has_buyer_message,credit_card_fee,step_trade_status, + step_paid_fee,buyer_open_uid,mark_desc, + buyer_nick,num_iid,num, + price,total_fee,adjust_fee, + post_fee,discount_fee,payment, + received_payment,available_confirm_fee,cod_fee, + cod_status,buyer_cod_fee,seller_cod_fee, + express_agency_fee,commission_fee,shipping_type, + created,modified,pay_time, + consign_time,end_time,seller_memo, + buyer_memo,buyer_message,point_fee, + real_point_fee,buyer_obtain_point_fee,receiving_time, + status,trade_memo,erp_send_company, + erp_send_code,erp_send_status,create_time, + update_time,update_by,oaid, + aid,receiver_country,receiver_state, + receiver_city,receiver_district,receiver_town, + receiver_address,receiver_zip,receiver_name, + receiver_mobile,receiver_phone,seller_rate, + seller_nick,buyer_rate,buyer_area, + alipay_no,buyer_alipay_no,buyer_email, + seller_alipay_no,has_post_fee,timeout_action_time, + snapshot_url,promotion,yfx_fee, + has_yfx,send_time,is_part_consign, + sid + + diff --git a/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java b/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java index fda58370..da1a8c09 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/OrderApiController.java @@ -39,9 +39,9 @@ public class OrderApiController { * @return * @throws ApiException */ - @GetMapping("/pull_order_tao") + @PostMapping("/pull_order_tao") @ResponseBody - public ApiResult pullIncrementOrder(TaoRequest req) throws ApiException { + public ApiResult pullIncrementOrder(@RequestBody TaoRequest req) throws ApiException { log.info("/**************增量拉取tao订单****************/"); if (req.getShopId() == null || req.getShopId() <= 0) { return ApiResult.build(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); diff --git a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java index c01dfb17..28177eb4 100644 --- a/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java +++ b/tao-api/src/main/java/com/qihang/tao/service/impl/TaoOrderServiceImpl.java @@ -31,6 +31,7 @@ public class TaoOrderServiceImpl extends ServiceImpl @Transactional @Override public ResultVo saveOrder(Integer shopId, TaoOrder order) { + if(order == null ) return new ResultVo<>(ResultVoEnum.SystemException); try { List taoOrders = mapper.selectList(new LambdaQueryWrapper().eq(TaoOrder::getTid, order.getTid())); if (taoOrders != null && taoOrders.size() > 0) { diff --git a/vue/package.json b/vue/package.json index 4eaff57f..587b792f 100644 --- a/vue/package.json +++ b/vue/package.json @@ -1,7 +1,7 @@ { "name": "qihang-ecerp", "version": "0.1.1", - "description": "启航电商ERP系统", + "description": "启航电商OMS系统", "author": "qihang", "license": "MIT", "scripts": { diff --git a/vue/src/api/login.js b/vue/src/api/login.js index 95ba2b9f..915f9996 100644 --- a/vue/src/api/login.js +++ b/vue/src/api/login.js @@ -18,17 +18,7 @@ export function login(username, password, code, uuid) { }) } -// 注册方法 -export function register(data) { - return request({ - url: '/register', - headers: { - isToken: false - }, - method: 'post', - data: data - }) -} + // 获取用户详细信息 export function getInfo() { @@ -46,14 +36,4 @@ export function logout() { }) } -// 获取验证码 -export function getCodeImg() { - return request({ - url: '/captchaImage', - headers: { - isToken: false - }, - method: 'get', - timeout: 20000 - }) -} + diff --git a/vue/src/components/ZhiJian/Doc/index.vue b/vue/src/components/ZhiJian/Doc/index.vue deleted file mode 100644 index cd93f085..00000000 --- a/vue/src/components/ZhiJian/Doc/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/vue/src/components/ZhiJian/Git/index.vue b/vue/src/components/ZhiJian/Git/index.vue deleted file mode 100644 index 3ee7d90d..00000000 --- a/vue/src/components/ZhiJian/Git/index.vue +++ /dev/null @@ -1,21 +0,0 @@ - - - diff --git a/vue/src/layout/components/Navbar.vue b/vue/src/layout/components/Navbar.vue index f0956fc8..a18e04de 100644 --- a/vue/src/layout/components/Navbar.vue +++ b/vue/src/layout/components/Navbar.vue @@ -54,8 +54,6 @@ import Hamburger from '@/components/Hamburger' import Screenfull from '@/components/Screenfull' import SizeSelect from '@/components/SizeSelect' import Search from '@/components/HeaderSearch' -import ZhiJianGit from '@/components/ZhiJian/Git' -import ZhiJianDoc from '@/components/ZhiJian/Doc' export default { components: { @@ -64,9 +62,7 @@ export default { Hamburger, Screenfull, SizeSelect, - Search, - ZhiJianGit, - ZhiJianDoc + Search }, computed: { ...mapGetters([ diff --git a/vue/src/router/index.js b/vue/src/router/index.js index 0faaf663..05c318bd 100644 --- a/vue/src/router/index.js +++ b/vue/src/router/index.js @@ -46,11 +46,6 @@ export const constantRoutes = [ component: () => import('@/views/login'), hidden: true }, - { - path: '/register', - component: () => import('@/views/register'), - hidden: true - }, { path: '/404', component: () => import('@/views/error/404'), diff --git a/vue/src/views/login.vue b/vue/src/views/login.vue index 20e0a5ec..57e2f54d 100644 --- a/vue/src/views/login.vue +++ b/vue/src/views/login.vue @@ -1,7 +1,7 @@ - -