From 18565b1b91dfc09f4dd6524c6a63950dab8b5a5a Mon Sep 17 00:00:00 2001 From: quyixiao <2621048238@qq.com> Date: Tue, 11 Nov 2025 07:41:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/vv/VvTradeOrderLineEntity.java | 2070 +++++++++-------- .../heyu/api/data/enums/OrderStatusEnums.java | 34 +- .../java/com/test/xxx/MysqlMain_update.java | 2 +- 3 files changed, 1101 insertions(+), 1005 deletions(-) diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java index ef0b685..ff36fd9 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java +++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineEntity.java @@ -1,16 +1,16 @@ package com.heyu.api.data.entity.vv; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import com.lz.mybatis.plugin.annotations.AS; import java.math.BigDecimal; -import java.util.Date; +import java.util.Date;import java.util.Date; /** *购物车 * @author quyixiao -* @since 2025-11-09 +* @since 2025-11-11 */ @Data @@ -21,725 +21,272 @@ private static final long serialVersionUID = 1L; public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvTradeOrderLineEntity:"; public final static String all = CLASS_NAME + "*"; - public final static String id_ = CLASS_NAME + "id"; // - public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 - public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 - public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 - public final static String sale_price = CLASS_NAME + "sale_price"; // 单价 - public final static String num_ = CLASS_NAME + "num"; // 数量 - public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel - public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号 - public final static String refund_amount = CLASS_NAME + "refund_amount"; // 退款金额 - public final static String track_number = CLASS_NAME + "track_number"; // 包裹追踪号 - public final static String refund_count = CLASS_NAME + "refund_count"; // 退货数量 - public final static String product_id = CLASS_NAME + "product_id"; // 商品id - public final static String product_name = CLASS_NAME + "product_name"; // 商品名称 - public final static String sku_info = CLASS_NAME + "sku_info"; // sku信息json - public final static String product_main_image_url = CLASS_NAME + "product_main_image_url"; // 商品主图 - public final static String sku_id = CLASS_NAME + "sku_id"; // skuid - public final static String sku_image_url = CLASS_NAME + "sku_image_url"; // sku图片 - public final static String comment_id = CLASS_NAME + "comment_id"; // 评论 id - public final static String delivered_type = CLASS_NAME + "delivered_type"; // 1 买家手动确认收货， 2 系统自动确认收货 - public final static String settle_status = CLASS_NAME + "settle_status"; // 0 未结算，1 已经结算 - public final static String gmt_settle = CLASS_NAME + "gmt_settle"; // 结算时间 - public final static String seller_id = CLASS_NAME + "seller_id"; // 卖家id - public final static String reverse_status = CLASS_NAME + "reverse_status"; // 逆向状态。 - public final static String profit_amount = CLASS_NAME + "profit_amount"; // 这笔子单获得利益 - public final static String origin_price = CLASS_NAME + "origin_price"; // 原来价格 - public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间 - public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间 - public final static String buyer_id = CLASS_NAME + "buyer_id"; // 订单id - public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号 - public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称 - public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信 - public final static String province_ = CLASS_NAME + "province"; // 省 - public final static String city_ = CLASS_NAME + "city"; // 市 - public final static String district_ = CLASS_NAME + "district"; // 区 - public final static String seller_name = CLASS_NAME + "seller_name"; // 卖家名称 - public final static String batch_num = CLASS_NAME + "batch_num"; // 批次数量 - public final static String shipping_amount = CLASS_NAME + "shipping_amount"; // 运费 - public final static String promotion_price = CLASS_NAME + "promotion_price"; // 当时促销价 - public final static String state_ = CLASS_NAME + "state"; // 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 - public final static String gmt_down_order = CLASS_NAME + "gmt_down_order"; // 下单时间 - public final static String gmt_pay = CLASS_NAME + "gmt_pay"; // 支付时间 - public final static String gmt_to_shipping = CLASS_NAME + "gmt_to_shipping"; // 打包时间 - public final static String gmt_sign_receipt = CLASS_NAME + "gmt_sign_receipt"; // 签收日期 - public final static String gmt_delivered = CLASS_NAME + "gmt_delivered"; // 妥投时间 - public final static String delivered_by = CLASS_NAME + "delivered_by"; // system:系统，user:用户 ，admin 后台确认 - public final static String app_name = CLASS_NAME + "app_name"; // goudezhao - public final static String channel_ = CLASS_NAME + "channel"; // 渠道来源，如抖音，等 - public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id - public final static String award_amount = CLASS_NAME + "award_amount"; // 奖励金额 - public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id - public final static String activity_award_count = CLASS_NAME + "activity_award_count"; // 这次活动的奖励次数 - public final static String transaction_id = CLASS_NAME + "transaction_id"; // 支付事务id - public final static String pay_type = CLASS_NAME + "pay_type"; // 支付方式，weixin - public final static String gmt_pre_pay = CLASS_NAME + "gmt_pre_pay"; // 预支付时间 - public final static String gmt_close = CLASS_NAME + "gmt_close"; // 订单关闭时间 - public final static String prepay_id = CLASS_NAME + "prepay_id"; // 预支付id - public final static String buyer_address_id = CLASS_NAME + "buyer_address_id"; // 买家地址id - public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 是否已经签收 - public final static String gmt_unpack = CLASS_NAME + "gmt_unpack"; // 重新打包的时间 - public final static String shipped_user = CLASS_NAME + "shipped_user"; // shipped的用户 - public final static String delivered_user = CLASS_NAME + "delivered_user"; // delivered的用户 - public final static String shipping_user = CLASS_NAME + "shipping_user"; // shipping的用户 - public final static String unpack_user = CLASS_NAME + "unpack_user"; // unpack的用户 - public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间 - public final static String cancel_user = CLASS_NAME + "cancel_user"; // 订单取消用户 - // - @TableId(value = "id", type = IdType.AUTO) - private Long id; - //是否删除：0 否 1 删除 - private Integer isDelete; - //创建时间 - private Date createTime; - //修改时间 - private Date modifyTime; - //单价 - private BigDecimal salePrice; - //数量 - private Integer num; - //wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel - private String status; - //订单号 - private Long tradeOrderId; - //退款金额 - private BigDecimal refundAmount; - //包裹追踪号 - private String trackNumber; - //退货数量 - private Integer refundCount; - //商品id - private Long productId; - //商品名称 - private String productName; - //sku信息json - private String skuInfo; - //商品主图 - private String productMainImageUrl; - //skuid - private Long skuId; - //sku图片 - private String skuImageUrl; - //评论 id - private Long commentId; - //1 买家手动确认收货， 2 系统自动确认收货 - private Integer deliveredType; - //0 未结算，1 已经结算 - private Integer settleStatus; - //结算时间 - private Date gmtSettle; - //卖家id - private Long sellerId; - //逆向状态。 - private String reverseStatus; - //这笔子单获得利益 - private BigDecimal profitAmount; - //原来价格 - private BigDecimal originPrice; - //创建时间 - private Long createTimestamp; - //修改时间 - private Long modifyTimestamp; - //订单id - private Long buyerId; - //买家手机号 - private String buyerPhone; - //买家名称 - private String buyerName; - //买家微信 - private String buyerWeixin; - //省 - private String province; - //市 - private String city; - //区 - private String district; - //卖家名称 - private String sellerName; + public final static String activity_award_count = CLASS_NAME + "activity_award_count"; // 这次活动的奖励次数 + public final static String activity_id = CLASS_NAME + "activity_id"; // 活动id + public final static String app_name = CLASS_NAME + "app_name"; // goudezhao + public final static String award_amount = CLASS_NAME + "award_amount"; // 奖励金额 + public final static String batch_num = CLASS_NAME + "batch_num"; // 批次数量 + public final static String buyer_address_id = CLASS_NAME + "buyer_address_id"; // 买家地址id + public final static String buyer_id = CLASS_NAME + "buyer_id"; // 订单id + public final static String buyer_name = CLASS_NAME + "buyer_name"; // 买家名称 + public final static String buyer_phone = CLASS_NAME + "buyer_phone"; // 买家手机号 + public final static String buyer_weixin = CLASS_NAME + "buyer_weixin"; // 买家微信 + public final static String cancel_user = CLASS_NAME + "cancel_user"; // 订单取消用户 + public final static String channel_ = CLASS_NAME + "channel"; // 渠道来源，如抖音，等 + public final static String city_ = CLASS_NAME + "city"; // 市 + public final static String comment_id = CLASS_NAME + "comment_id"; // 评论 id + public final static String create_time = CLASS_NAME + "create_time"; // 创建时间 + public final static String create_timestamp = CLASS_NAME + "create_timestamp"; // 创建时间 + public final static String delivered_by = CLASS_NAME + "delivered_by"; // system:系统，user:用户 ，admin 后台确认 + public final static String delivered_type = CLASS_NAME + "delivered_type"; // 1 买家手动确认收货， 2 系统自动确认收货 + public final static String delivered_user = CLASS_NAME + "delivered_user"; // delivered的用户 + public final static String district_ = CLASS_NAME + "district"; // 区 + public final static String gmt_agree_sign_receipt = CLASS_NAME + "gmt_agree_sign_receipt"; // 同意签收时间 + public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间 + public final static String gmt_close = CLASS_NAME + "gmt_close"; // 订单关闭时间 + public final static String gmt_delivered = CLASS_NAME + "gmt_delivered"; // 妥投时间 + public final static String gmt_down_order = CLASS_NAME + "gmt_down_order"; // 下单时间 + public final static String gmt_pay = CLASS_NAME + "gmt_pay"; // 支付时间 + public final static String gmt_pre_pay = CLASS_NAME + "gmt_pre_pay"; // 预支付时间 + public final static String gmt_reject_sign_receipt = CLASS_NAME + "gmt_reject_sign_receipt"; // 拒绝签收时间 + public final static String gmt_settle = CLASS_NAME + "gmt_settle"; // 结算时间 + public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 是否已经签收 + public final static String gmt_sign_receipt = CLASS_NAME + "gmt_sign_receipt"; // 签收日期 + public final static String gmt_to_shipping = CLASS_NAME + "gmt_to_shipping"; // 打包时间 + public final static String gmt_unpack = CLASS_NAME + "gmt_unpack"; // 重新打包的时间 + public final static String id_ = CLASS_NAME + "id"; // + public final static String is_delete = CLASS_NAME + "is_delete"; // 是否删除：0 否 1 删除 + public final static String modify_time = CLASS_NAME + "modify_time"; // 修改时间 + public final static String modify_timestamp = CLASS_NAME + "modify_timestamp"; // 修改时间 + public final static String num_ = CLASS_NAME + "num"; // 数量 + public final static String origin_price = CLASS_NAME + "origin_price"; // 原来价格 + public final static String pay_type = CLASS_NAME + "pay_type"; // 支付方式，weixin + public final static String prepay_id = CLASS_NAME + "prepay_id"; // 预支付id + public final static String product_id = CLASS_NAME + "product_id"; // 商品id + public final static String product_main_image_url = CLASS_NAME + "product_main_image_url"; // 商品主图 + public final static String product_name = CLASS_NAME + "product_name"; // 商品名称 + public final static String profit_amount = CLASS_NAME + "profit_amount"; // 这笔子单获得利益 + public final static String promoter_id = CLASS_NAME + "promoter_id"; // 推广者id + public final static String promotion_price = CLASS_NAME + "promotion_price"; // 当时促销价 + public final static String province_ = CLASS_NAME + "province"; // 省 + public final static String refund_amount = CLASS_NAME + "refund_amount"; // 退款金额 + public final static String refund_count = CLASS_NAME + "refund_count"; // 退货数量 + public final static String reject_sign_receipt_features = CLASS_NAME + "reject_sign_receipt_features"; // 拒绝签收的信息 + public final static String reject_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_reason"; // 拒绝签收原因 + public final static String reverse_status = CLASS_NAME + "reverse_status"; // 逆向状态。 + public final static String sale_price = CLASS_NAME + "sale_price"; // 单价 + public final static String seller_id = CLASS_NAME + "seller_id"; // 卖家id + public final static String seller_name = CLASS_NAME + "seller_name"; // 卖家名称 + public final static String settle_status = CLASS_NAME + "settle_status"; // 0 未结算，1 已经结算 + public final static String shipped_user = CLASS_NAME + "shipped_user"; // shipped的用户 + public final static String shipping_amount = CLASS_NAME + "shipping_amount"; // 运费 + public final static String shipping_user = CLASS_NAME + "shipping_user"; // shipping的用户 + public final static String sku_id = CLASS_NAME + "sku_id"; // skuid + public final static String sku_image_url = CLASS_NAME + "sku_image_url"; // sku图片 + public final static String sku_info = CLASS_NAME + "sku_info"; // sku信息json + public final static String state_ = CLASS_NAME + "state"; // 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 + public final static String status_ = CLASS_NAME + "status"; // create:订单创建,wait_pay:待支付,支付完成,待发货:wait_shipping,买家申请取消订单:apply_cancel, 买家关闭订单:close，已发货，运送中:shipping,已投递，比如入到快递柜:shipped,同意签收:agree_sign_receipt,拒绝签收:reject_sign_receipt,包裹返回:package_return,包裹卖家签收:package_seller_sign_receipt,已妥投:delivered,退款:refund,删除:delete + public final static String track_number = CLASS_NAME + "track_number"; // 包裹追踪号 + public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号 + public final static String transaction_id = CLASS_NAME + "transaction_id"; // 支付事务id + public final static String unpack_user = CLASS_NAME + "unpack_user"; // unpack的用户 + //这次活动的奖励次数 + @TableId(value = "activity_award_count", type = IdType.AUTO) + private Integer activityAwardCount; + //活动id + private Long activityId; + //goudezhao + private String appName; + //奖励金额 + private BigDecimal awardAmount; //批次数量 private Integer batchNum; - //运费 - private BigDecimal shippingAmount; - //当时促销价 - private BigDecimal promotionPrice; - //快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 - private String state; + //买家地址id + private Long buyerAddressId; + //订单id + private Long buyerId; + //买家名称 + private String buyerName; + //买家手机号 + private String buyerPhone; + //买家微信 + private String buyerWeixin; + //订单取消用户 + private String cancelUser; + //渠道来源，如抖音，等 + private String channel; + //市 + private String city; + //评论 id + private Long commentId; + //创建时间 + private Date createTime; + //创建时间 + private Long createTimestamp; + //system:系统，user:用户 ，admin 后台确认 + private String deliveredBy; + //1 买家手动确认收货， 2 系统自动确认收货 + private Integer deliveredType; + //delivered的用户 + private String deliveredUser; + //区 + private String district; + //同意签收时间 + private Date gmtAgreeSignReceipt; + //订单取消时间 + private Date gmtCancel; + //订单关闭时间 + private Date gmtClose; + //妥投时间 + private Date gmtDelivered; //下单时间 private Date gmtDownOrder; //支付时间 private Date gmtPay; - //打包时间 - private Date gmtToShipping; - //签收日期 - private Date gmtSignReceipt; - //妥投时间 - private Date gmtDelivered; - //system:系统，user:用户 ，admin 后台确认 - private String deliveredBy; - //goudezhao - private String appName; - //渠道来源，如抖音，等 - private String channel; - //推广者id - private String promoterId; - //奖励金额 - private BigDecimal awardAmount; - //活动id - private Long activityId; - //这次活动的奖励次数 - private Integer activityAwardCount; - //支付事务id - private String transactionId; - //支付方式，weixin - private String payType; //预支付时间 private Date gmtPrePay; - //订单关闭时间 - private Date gmtClose; - //预支付id - private String prepayId; - //买家地址id - private Long buyerAddressId; + //拒绝签收时间 + private Date gmtRejectSignReceipt; + //结算时间 + private Date gmtSettle; //是否已经签收 private Date gmtShipped; + //签收日期 + private Date gmtSignReceipt; + //打包时间 + private Date gmtToShipping; //重新打包的时间 private Date gmtUnpack; + // + private Long id; + //是否删除：0 否 1 删除 + private Integer isDelete; + //修改时间 + private Date modifyTime; + //修改时间 + private Long modifyTimestamp; + //数量 + private Integer num; + //原来价格 + private BigDecimal originPrice; + //支付方式，weixin + private String payType; + //预支付id + private String prepayId; + //商品id + private Long productId; + //商品主图 + private String productMainImageUrl; + //商品名称 + private String productName; + //这笔子单获得利益 + private BigDecimal profitAmount; + //推广者id + private String promoterId; + //当时促销价 + private BigDecimal promotionPrice; + //省 + private String province; + //退款金额 + private BigDecimal refundAmount; + //退货数量 + private Integer refundCount; + //拒绝签收的信息 + private String rejectSignReceiptFeatures; + //拒绝签收原因 + private String rejectSignReceiptReason; + //逆向状态。 + private String reverseStatus; + //单价 + private BigDecimal salePrice; + //卖家id + private Long sellerId; + //卖家名称 + private String sellerName; + //0 未结算，1 已经结算 + private Integer settleStatus; //shipped的用户 private String shippedUser; - //delivered的用户 - private String deliveredUser; + //运费 + private BigDecimal shippingAmount; //shipping的用户 private String shippingUser; + //skuid + private Long skuId; + //sku图片 + private String skuImageUrl; + //sku信息json + private String skuInfo; + //快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 + private String state; + //create:订单创建,wait_pay:待支付,支付完成,待发货:wait_shipping,买家申请取消订单:apply_cancel, 买家关闭订单:close，已发货，运送中:shipping,已投递，比如入到快递柜:shipped,同意签收:agree_sign_receipt,拒绝签收:reject_sign_receipt,包裹返回:package_return,包裹卖家签收:package_seller_sign_receipt,已妥投:delivered,退款:refund,删除:delete + private String status; + //包裹追踪号 + private String trackNumber; + //订单号 + private Long tradeOrderId; + //支付事务id + private String transactionId; //unpack的用户 private String unpackUser; - //订单取消时间 - private Date gmtCancel; - //订单取消用户 - private String cancelUser; /** - * + * 这次活动的奖励次数 * @return */ - public Long getId() { - return id; + public Integer getActivityAwardCount() { + return activityAwardCount; } /** - * - * @param id + * 这次活动的奖励次数 + * @param activityAwardCount */ - public void setId(Long id) { - this.id = id; + public void setActivityAwardCount(Integer activityAwardCount) { + this.activityAwardCount = activityAwardCount; } /** - * 是否删除：0 否 1 删除 + * 活动id * @return */ - public Integer getIsDelete() { - return isDelete; + public Long getActivityId() { + return activityId; } /** - * 是否删除：0 否 1 删除 - * @param isDelete + * 活动id + * @param activityId */ - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; + public void setActivityId(Long activityId) { + this.activityId = activityId; } /** - * 创建时间 + * goudezhao * @return */ - public Date getCreateTime() { - return createTime; + public String getAppName() { + return appName; } /** - * 创建时间 - * @param createTime + * goudezhao + * @param appName */ - public void setCreateTime(Date createTime) { - this.createTime = createTime; + public void setAppName(String appName) { + this.appName = appName; } /** - * 修改时间 + * 奖励金额 * @return */ - public Date getModifyTime() { - return modifyTime; + public BigDecimal getAwardAmount() { + return awardAmount; } /** - * 修改时间 - * @param modifyTime + * 奖励金额 + * @param awardAmount */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; - } - - /** - * 单价 - * @return - */ - public BigDecimal getSalePrice() { - return salePrice; - } - /** - * 单价 - * @param salePrice - */ - public void setSalePrice(BigDecimal salePrice) { - this.salePrice = salePrice; - } - - /** - * 数量 - * @return - */ - public Integer getNum() { - return num; - } - /** - * 数量 - * @param num - */ - public void setNum(Integer num) { - this.num = num; - } - - /** - * wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel - * @return - */ - public String getStatus() { - return status; - } - /** - * wait_pay:待支付。 待发货：wait_shipping。已发货: shipping。 已经签收:shipped。已妥投：delivered。订单取消:cancel - * @param status - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * 订单号 - * @return - */ - public Long getTradeOrderId() { - return tradeOrderId; - } - /** - * 订单号 - * @param tradeOrderId - */ - public void setTradeOrderId(Long tradeOrderId) { - this.tradeOrderId = tradeOrderId; - } - - /** - * 退款金额 - * @return - */ - public BigDecimal getRefundAmount() { - return refundAmount; - } - /** - * 退款金额 - * @param refundAmount - */ - public void setRefundAmount(BigDecimal refundAmount) { - this.refundAmount = refundAmount; - } - - /** - * 包裹追踪号 - * @return - */ - public String getTrackNumber() { - return trackNumber; - } - /** - * 包裹追踪号 - * @param trackNumber - */ - public void setTrackNumber(String trackNumber) { - this.trackNumber = trackNumber; - } - - /** - * 退货数量 - * @return - */ - public Integer getRefundCount() { - return refundCount; - } - /** - * 退货数量 - * @param refundCount - */ - public void setRefundCount(Integer refundCount) { - this.refundCount = refundCount; - } - - /** - * 商品id - * @return - */ - public Long getProductId() { - return productId; - } - /** - * 商品id - * @param productId - */ - public void setProductId(Long productId) { - this.productId = productId; - } - - /** - * 商品名称 - * @return - */ - public String getProductName() { - return productName; - } - /** - * 商品名称 - * @param productName - */ - public void setProductName(String productName) { - this.productName = productName; - } - - /** - * sku信息json - * @return - */ - public String getSkuInfo() { - return skuInfo; - } - /** - * sku信息json - * @param skuInfo - */ - public void setSkuInfo(String skuInfo) { - this.skuInfo = skuInfo; - } - - /** - * 商品主图 - * @return - */ - public String getProductMainImageUrl() { - return productMainImageUrl; - } - /** - * 商品主图 - * @param productMainImageUrl - */ - public void setProductMainImageUrl(String productMainImageUrl) { - this.productMainImageUrl = productMainImageUrl; - } - - /** - * skuid - * @return - */ - public Long getSkuId() { - return skuId; - } - /** - * skuid - * @param skuId - */ - public void setSkuId(Long skuId) { - this.skuId = skuId; - } - - /** - * sku图片 - * @return - */ - public String getSkuImageUrl() { - return skuImageUrl; - } - /** - * sku图片 - * @param skuImageUrl - */ - public void setSkuImageUrl(String skuImageUrl) { - this.skuImageUrl = skuImageUrl; - } - - /** - * 评论 id - * @return - */ - public Long getCommentId() { - return commentId; - } - /** - * 评论 id - * @param commentId - */ - public void setCommentId(Long commentId) { - this.commentId = commentId; - } - - /** - * 1 买家手动确认收货， 2 系统自动确认收货 - * @return - */ - public Integer getDeliveredType() { - return deliveredType; - } - /** - * 1 买家手动确认收货， 2 系统自动确认收货 - * @param deliveredType - */ - public void setDeliveredType(Integer deliveredType) { - this.deliveredType = deliveredType; - } - - /** - * 0 未结算，1 已经结算 - * @return - */ - public Integer getSettleStatus() { - return settleStatus; - } - /** - * 0 未结算，1 已经结算 - * @param settleStatus - */ - public void setSettleStatus(Integer settleStatus) { - this.settleStatus = settleStatus; - } - - /** - * 结算时间 - * @return - */ - public Date getGmtSettle() { - return gmtSettle; - } - /** - * 结算时间 - * @param gmtSettle - */ - public void setGmtSettle(Date gmtSettle) { - this.gmtSettle = gmtSettle; - } - - /** - * 卖家id - * @return - */ - public Long getSellerId() { - return sellerId; - } - /** - * 卖家id - * @param sellerId - */ - public void setSellerId(Long sellerId) { - this.sellerId = sellerId; - } - - /** - * 逆向状态。 - * @return - */ - public String getReverseStatus() { - return reverseStatus; - } - /** - * 逆向状态。 - * @param reverseStatus - */ - public void setReverseStatus(String reverseStatus) { - this.reverseStatus = reverseStatus; - } - - /** - * 这笔子单获得利益 - * @return - */ - public BigDecimal getProfitAmount() { - return profitAmount; - } - /** - * 这笔子单获得利益 - * @param profitAmount - */ - public void setProfitAmount(BigDecimal profitAmount) { - this.profitAmount = profitAmount; - } - - /** - * 原来价格 - * @return - */ - public BigDecimal getOriginPrice() { - return originPrice; - } - /** - * 原来价格 - * @param originPrice - */ - public void setOriginPrice(BigDecimal originPrice) { - this.originPrice = originPrice; - } - - /** - * 创建时间 - * @return - */ - public Long getCreateTimestamp() { - return createTimestamp; - } - /** - * 创建时间 - * @param createTimestamp - */ - public void setCreateTimestamp(Long createTimestamp) { - this.createTimestamp = createTimestamp; - } - - /** - * 修改时间 - * @return - */ - public Long getModifyTimestamp() { - return modifyTimestamp; - } - /** - * 修改时间 - * @param modifyTimestamp - */ - public void setModifyTimestamp(Long modifyTimestamp) { - this.modifyTimestamp = modifyTimestamp; - } - - /** - * 订单id - * @return - */ - public Long getBuyerId() { - return buyerId; - } - /** - * 订单id - * @param buyerId - */ - public void setBuyerId(Long buyerId) { - this.buyerId = buyerId; - } - - /** - * 买家手机号 - * @return - */ - public String getBuyerPhone() { - return buyerPhone; - } - /** - * 买家手机号 - * @param buyerPhone - */ - public void setBuyerPhone(String buyerPhone) { - this.buyerPhone = buyerPhone; - } - - /** - * 买家名称 - * @return - */ - public String getBuyerName() { - return buyerName; - } - /** - * 买家名称 - * @param buyerName - */ - public void setBuyerName(String buyerName) { - this.buyerName = buyerName; - } - - /** - * 买家微信 - * @return - */ - public String getBuyerWeixin() { - return buyerWeixin; - } - /** - * 买家微信 - * @param buyerWeixin - */ - public void setBuyerWeixin(String buyerWeixin) { - this.buyerWeixin = buyerWeixin; - } - - /** - * 省 - * @return - */ - public String getProvince() { - return province; - } - /** - * 省 - * @param province - */ - public void setProvince(String province) { - this.province = province; - } - - /** - * 市 - * @return - */ - public String getCity() { - return city; - } - /** - * 市 - * @param city - */ - public void setCity(String city) { - this.city = city; - } - - /** - * 区 - * @return - */ - public String getDistrict() { - return district; - } - /** - * 区 - * @param district - */ - public void setDistrict(String district) { - this.district = district; - } - - /** - * 卖家名称 - * @return - */ - public String getSellerName() { - return sellerName; - } - /** - * 卖家名称 - * @param sellerName - */ - public void setSellerName(String sellerName) { - this.sellerName = sellerName; + public void setAwardAmount(BigDecimal awardAmount) { + this.awardAmount = awardAmount; } /** @@ -758,48 +305,288 @@ private static final long serialVersionUID = 1L; } /** - * 运费 + * 买家地址id * @return */ - public BigDecimal getShippingAmount() { - return shippingAmount; + public Long getBuyerAddressId() { + return buyerAddressId; } /** - * 运费 - * @param shippingAmount + * 买家地址id + * @param buyerAddressId */ - public void setShippingAmount(BigDecimal shippingAmount) { - this.shippingAmount = shippingAmount; + public void setBuyerAddressId(Long buyerAddressId) { + this.buyerAddressId = buyerAddressId; } /** - * 当时促销价 + * 订单id * @return */ - public BigDecimal getPromotionPrice() { - return promotionPrice; + public Long getBuyerId() { + return buyerId; } /** - * 当时促销价 - * @param promotionPrice + * 订单id + * @param buyerId */ - public void setPromotionPrice(BigDecimal promotionPrice) { - this.promotionPrice = promotionPrice; + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; } /** - * 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 + * 买家名称 * @return */ - public String getState() { - return state; + public String getBuyerName() { + return buyerName; } /** - * 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 - * @param state + * 买家名称 + * @param buyerName */ - public void setState(String state) { - this.state = state; + public void setBuyerName(String buyerName) { + this.buyerName = buyerName; + } + + /** + * 买家手机号 + * @return + */ + public String getBuyerPhone() { + return buyerPhone; + } + /** + * 买家手机号 + * @param buyerPhone + */ + public void setBuyerPhone(String buyerPhone) { + this.buyerPhone = buyerPhone; + } + + /** + * 买家微信 + * @return + */ + public String getBuyerWeixin() { + return buyerWeixin; + } + /** + * 买家微信 + * @param buyerWeixin + */ + public void setBuyerWeixin(String buyerWeixin) { + this.buyerWeixin = buyerWeixin; + } + + /** + * 订单取消用户 + * @return + */ + public String getCancelUser() { + return cancelUser; + } + /** + * 订单取消用户 + * @param cancelUser + */ + public void setCancelUser(String cancelUser) { + this.cancelUser = cancelUser; + } + + /** + * 渠道来源，如抖音，等 + * @return + */ + public String getChannel() { + return channel; + } + /** + * 渠道来源，如抖音，等 + * @param channel + */ + public void setChannel(String channel) { + this.channel = channel; + } + + /** + * 市 + * @return + */ + public String getCity() { + return city; + } + /** + * 市 + * @param city + */ + public void setCity(String city) { + this.city = city; + } + + /** + * 评论 id + * @return + */ + public Long getCommentId() { + return commentId; + } + /** + * 评论 id + * @param commentId + */ + public void setCommentId(Long commentId) { + this.commentId = commentId; + } + + /** + * 创建时间 + * @return + */ + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + /** + * 创建时间 + * @return + */ + public Long getCreateTimestamp() { + return createTimestamp; + } + /** + * 创建时间 + * @param createTimestamp + */ + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; + } + + /** + * system:系统，user:用户 ，admin 后台确认 + * @return + */ + public String getDeliveredBy() { + return deliveredBy; + } + /** + * system:系统，user:用户 ，admin 后台确认 + * @param deliveredBy + */ + public void setDeliveredBy(String deliveredBy) { + this.deliveredBy = deliveredBy; + } + + /** + * 1 买家手动确认收货， 2 系统自动确认收货 + * @return + */ + public Integer getDeliveredType() { + return deliveredType; + } + /** + * 1 买家手动确认收货， 2 系统自动确认收货 + * @param deliveredType + */ + public void setDeliveredType(Integer deliveredType) { + this.deliveredType = deliveredType; + } + + /** + * delivered的用户 + * @return + */ + public String getDeliveredUser() { + return deliveredUser; + } + /** + * delivered的用户 + * @param deliveredUser + */ + public void setDeliveredUser(String deliveredUser) { + this.deliveredUser = deliveredUser; + } + + /** + * 区 + * @return + */ + public String getDistrict() { + return district; + } + /** + * 区 + * @param district + */ + public void setDistrict(String district) { + this.district = district; + } + + /** + * 同意签收时间 + * @return + */ + public Date getGmtAgreeSignReceipt() { + return gmtAgreeSignReceipt; + } + /** + * 同意签收时间 + * @param gmtAgreeSignReceipt + */ + public void setGmtAgreeSignReceipt(Date gmtAgreeSignReceipt) { + this.gmtAgreeSignReceipt = gmtAgreeSignReceipt; + } + + /** + * 订单取消时间 + * @return + */ + public Date getGmtCancel() { + return gmtCancel; + } + /** + * 订单取消时间 + * @param gmtCancel + */ + public void setGmtCancel(Date gmtCancel) { + this.gmtCancel = gmtCancel; + } + + /** + * 订单关闭时间 + * @return + */ + public Date getGmtClose() { + return gmtClose; + } + /** + * 订单关闭时间 + * @param gmtClose + */ + public void setGmtClose(Date gmtClose) { + this.gmtClose = gmtClose; + } + + /** + * 妥投时间 + * @return + */ + public Date getGmtDelivered() { + return gmtDelivered; + } + /** + * 妥投时间 + * @param gmtDelivered + */ + public void setGmtDelivered(Date gmtDelivered) { + this.gmtDelivered = gmtDelivered; } /** @@ -832,186 +619,6 @@ private static final long serialVersionUID = 1L; this.gmtPay = gmtPay; } - /** - * 打包时间 - * @return - */ - public Date getGmtToShipping() { - return gmtToShipping; - } - /** - * 打包时间 - * @param gmtToShipping - */ - public void setGmtToShipping(Date gmtToShipping) { - this.gmtToShipping = gmtToShipping; - } - - /** - * 签收日期 - * @return - */ - public Date getGmtSignReceipt() { - return gmtSignReceipt; - } - /** - * 签收日期 - * @param gmtSignReceipt - */ - public void setGmtSignReceipt(Date gmtSignReceipt) { - this.gmtSignReceipt = gmtSignReceipt; - } - - /** - * 妥投时间 - * @return - */ - public Date getGmtDelivered() { - return gmtDelivered; - } - /** - * 妥投时间 - * @param gmtDelivered - */ - public void setGmtDelivered(Date gmtDelivered) { - this.gmtDelivered = gmtDelivered; - } - - /** - * system:系统，user:用户 ，admin 后台确认 - * @return - */ - public String getDeliveredBy() { - return deliveredBy; - } - /** - * system:系统，user:用户 ，admin 后台确认 - * @param deliveredBy - */ - public void setDeliveredBy(String deliveredBy) { - this.deliveredBy = deliveredBy; - } - - /** - * goudezhao - * @return - */ - public String getAppName() { - return appName; - } - /** - * goudezhao - * @param appName - */ - public void setAppName(String appName) { - this.appName = appName; - } - - /** - * 渠道来源，如抖音，等 - * @return - */ - public String getChannel() { - return channel; - } - /** - * 渠道来源，如抖音，等 - * @param channel - */ - public void setChannel(String channel) { - this.channel = channel; - } - - /** - * 推广者id - * @return - */ - public String getPromoterId() { - return promoterId; - } - /** - * 推广者id - * @param promoterId - */ - public void setPromoterId(String promoterId) { - this.promoterId = promoterId; - } - - /** - * 奖励金额 - * @return - */ - public BigDecimal getAwardAmount() { - return awardAmount; - } - /** - * 奖励金额 - * @param awardAmount - */ - public void setAwardAmount(BigDecimal awardAmount) { - this.awardAmount = awardAmount; - } - - /** - * 活动id - * @return - */ - public Long getActivityId() { - return activityId; - } - /** - * 活动id - * @param activityId - */ - public void setActivityId(Long activityId) { - this.activityId = activityId; - } - - /** - * 这次活动的奖励次数 - * @return - */ - public Integer getActivityAwardCount() { - return activityAwardCount; - } - /** - * 这次活动的奖励次数 - * @param activityAwardCount - */ - public void setActivityAwardCount(Integer activityAwardCount) { - this.activityAwardCount = activityAwardCount; - } - - /** - * 支付事务id - * @return - */ - public String getTransactionId() { - return transactionId; - } - /** - * 支付事务id - * @param transactionId - */ - public void setTransactionId(String transactionId) { - this.transactionId = transactionId; - } - - /** - * 支付方式，weixin - * @return - */ - public String getPayType() { - return payType; - } - /** - * 支付方式，weixin - * @param payType - */ - public void setPayType(String payType) { - this.payType = payType; - } - /** * 预支付时间 * @return @@ -1028,48 +635,33 @@ private static final long serialVersionUID = 1L; } /** - * 订单关闭时间 + * 拒绝签收时间 * @return */ - public Date getGmtClose() { - return gmtClose; + public Date getGmtRejectSignReceipt() { + return gmtRejectSignReceipt; } /** - * 订单关闭时间 - * @param gmtClose + * 拒绝签收时间 + * @param gmtRejectSignReceipt */ - public void setGmtClose(Date gmtClose) { - this.gmtClose = gmtClose; + public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) { + this.gmtRejectSignReceipt = gmtRejectSignReceipt; } /** - * 预支付id + * 结算时间 * @return */ - public String getPrepayId() { - return prepayId; + public Date getGmtSettle() { + return gmtSettle; } /** - * 预支付id - * @param prepayId + * 结算时间 + * @param gmtSettle */ - public void setPrepayId(String prepayId) { - this.prepayId = prepayId; - } - - /** - * 买家地址id - * @return - */ - public Long getBuyerAddressId() { - return buyerAddressId; - } - /** - * 买家地址id - * @param buyerAddressId - */ - public void setBuyerAddressId(Long buyerAddressId) { - this.buyerAddressId = buyerAddressId; + public void setGmtSettle(Date gmtSettle) { + this.gmtSettle = gmtSettle; } /** @@ -1087,6 +679,36 @@ private static final long serialVersionUID = 1L; this.gmtShipped = gmtShipped; } + /** + * 签收日期 + * @return + */ + public Date getGmtSignReceipt() { + return gmtSignReceipt; + } + /** + * 签收日期 + * @param gmtSignReceipt + */ + public void setGmtSignReceipt(Date gmtSignReceipt) { + this.gmtSignReceipt = gmtSignReceipt; + } + + /** + * 打包时间 + * @return + */ + public Date getGmtToShipping() { + return gmtToShipping; + } + /** + * 打包时间 + * @param gmtToShipping + */ + public void setGmtToShipping(Date gmtToShipping) { + this.gmtToShipping = gmtToShipping; + } + /** * 重新打包的时间 * @return @@ -1102,6 +724,366 @@ private static final long serialVersionUID = 1L; this.gmtUnpack = gmtUnpack; } + /** + * + * @return + */ + public Long getId() { + return id; + } + /** + * + * @param id + */ + public void setId(Long id) { + this.id = id; + } + + /** + * 是否删除：0 否 1 删除 + * @return + */ + public Integer getIsDelete() { + return isDelete; + } + /** + * 是否删除：0 否 1 删除 + * @param isDelete + */ + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; + } + + /** + * 修改时间 + * @return + */ + public Date getModifyTime() { + return modifyTime; + } + /** + * 修改时间 + * @param modifyTime + */ + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; + } + + /** + * 修改时间 + * @return + */ + public Long getModifyTimestamp() { + return modifyTimestamp; + } + /** + * 修改时间 + * @param modifyTimestamp + */ + public void setModifyTimestamp(Long modifyTimestamp) { + this.modifyTimestamp = modifyTimestamp; + } + + /** + * 数量 + * @return + */ + public Integer getNum() { + return num; + } + /** + * 数量 + * @param num + */ + public void setNum(Integer num) { + this.num = num; + } + + /** + * 原来价格 + * @return + */ + public BigDecimal getOriginPrice() { + return originPrice; + } + /** + * 原来价格 + * @param originPrice + */ + public void setOriginPrice(BigDecimal originPrice) { + this.originPrice = originPrice; + } + + /** + * 支付方式，weixin + * @return + */ + public String getPayType() { + return payType; + } + /** + * 支付方式，weixin + * @param payType + */ + public void setPayType(String payType) { + this.payType = payType; + } + + /** + * 预支付id + * @return + */ + public String getPrepayId() { + return prepayId; + } + /** + * 预支付id + * @param prepayId + */ + public void setPrepayId(String prepayId) { + this.prepayId = prepayId; + } + + /** + * 商品id + * @return + */ + public Long getProductId() { + return productId; + } + /** + * 商品id + * @param productId + */ + public void setProductId(Long productId) { + this.productId = productId; + } + + /** + * 商品主图 + * @return + */ + public String getProductMainImageUrl() { + return productMainImageUrl; + } + /** + * 商品主图 + * @param productMainImageUrl + */ + public void setProductMainImageUrl(String productMainImageUrl) { + this.productMainImageUrl = productMainImageUrl; + } + + /** + * 商品名称 + * @return + */ + public String getProductName() { + return productName; + } + /** + * 商品名称 + * @param productName + */ + public void setProductName(String productName) { + this.productName = productName; + } + + /** + * 这笔子单获得利益 + * @return + */ + public BigDecimal getProfitAmount() { + return profitAmount; + } + /** + * 这笔子单获得利益 + * @param profitAmount + */ + public void setProfitAmount(BigDecimal profitAmount) { + this.profitAmount = profitAmount; + } + + /** + * 推广者id + * @return + */ + public String getPromoterId() { + return promoterId; + } + /** + * 推广者id + * @param promoterId + */ + public void setPromoterId(String promoterId) { + this.promoterId = promoterId; + } + + /** + * 当时促销价 + * @return + */ + public BigDecimal getPromotionPrice() { + return promotionPrice; + } + /** + * 当时促销价 + * @param promotionPrice + */ + public void setPromotionPrice(BigDecimal promotionPrice) { + this.promotionPrice = promotionPrice; + } + + /** + * 省 + * @return + */ + public String getProvince() { + return province; + } + /** + * 省 + * @param province + */ + public void setProvince(String province) { + this.province = province; + } + + /** + * 退款金额 + * @return + */ + public BigDecimal getRefundAmount() { + return refundAmount; + } + /** + * 退款金额 + * @param refundAmount + */ + public void setRefundAmount(BigDecimal refundAmount) { + this.refundAmount = refundAmount; + } + + /** + * 退货数量 + * @return + */ + public Integer getRefundCount() { + return refundCount; + } + /** + * 退货数量 + * @param refundCount + */ + public void setRefundCount(Integer refundCount) { + this.refundCount = refundCount; + } + + /** + * 拒绝签收的信息 + * @return + */ + public String getRejectSignReceiptFeatures() { + return rejectSignReceiptFeatures; + } + /** + * 拒绝签收的信息 + * @param rejectSignReceiptFeatures + */ + public void setRejectSignReceiptFeatures(String rejectSignReceiptFeatures) { + this.rejectSignReceiptFeatures = rejectSignReceiptFeatures; + } + + /** + * 拒绝签收原因 + * @return + */ + public String getRejectSignReceiptReason() { + return rejectSignReceiptReason; + } + /** + * 拒绝签收原因 + * @param rejectSignReceiptReason + */ + public void setRejectSignReceiptReason(String rejectSignReceiptReason) { + this.rejectSignReceiptReason = rejectSignReceiptReason; + } + + /** + * 逆向状态。 + * @return + */ + public String getReverseStatus() { + return reverseStatus; + } + /** + * 逆向状态。 + * @param reverseStatus + */ + public void setReverseStatus(String reverseStatus) { + this.reverseStatus = reverseStatus; + } + + /** + * 单价 + * @return + */ + public BigDecimal getSalePrice() { + return salePrice; + } + /** + * 单价 + * @param salePrice + */ + public void setSalePrice(BigDecimal salePrice) { + this.salePrice = salePrice; + } + + /** + * 卖家id + * @return + */ + public Long getSellerId() { + return sellerId; + } + /** + * 卖家id + * @param sellerId + */ + public void setSellerId(Long sellerId) { + this.sellerId = sellerId; + } + + /** + * 卖家名称 + * @return + */ + public String getSellerName() { + return sellerName; + } + /** + * 卖家名称 + * @param sellerName + */ + public void setSellerName(String sellerName) { + this.sellerName = sellerName; + } + + /** + * 0 未结算，1 已经结算 + * @return + */ + public Integer getSettleStatus() { + return settleStatus; + } + /** + * 0 未结算，1 已经结算 + * @param settleStatus + */ + public void setSettleStatus(Integer settleStatus) { + this.settleStatus = settleStatus; + } + /** * shipped的用户 * @return @@ -1118,18 +1100,18 @@ private static final long serialVersionUID = 1L; } /** - * delivered的用户 + * 运费 * @return */ - public String getDeliveredUser() { - return deliveredUser; + public BigDecimal getShippingAmount() { + return shippingAmount; } /** - * delivered的用户 - * @param deliveredUser + * 运费 + * @param shippingAmount */ - public void setDeliveredUser(String deliveredUser) { - this.deliveredUser = deliveredUser; + public void setShippingAmount(BigDecimal shippingAmount) { + this.shippingAmount = shippingAmount; } /** @@ -1147,6 +1129,126 @@ private static final long serialVersionUID = 1L; this.shippingUser = shippingUser; } + /** + * skuid + * @return + */ + public Long getSkuId() { + return skuId; + } + /** + * skuid + * @param skuId + */ + public void setSkuId(Long skuId) { + this.skuId = skuId; + } + + /** + * sku图片 + * @return + */ + public String getSkuImageUrl() { + return skuImageUrl; + } + /** + * sku图片 + * @param skuImageUrl + */ + public void setSkuImageUrl(String skuImageUrl) { + this.skuImageUrl = skuImageUrl; + } + + /** + * sku信息json + * @return + */ + public String getSkuInfo() { + return skuInfo; + } + /** + * sku信息json + * @param skuInfo + */ + public void setSkuInfo(String skuInfo) { + this.skuInfo = skuInfo; + } + + /** + * 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 + * @return + */ + public String getState() { + return state; + } + /** + * 快递单当前状态，默认为0在途，1揽收，2疑难，3签收，4退签，5派件，8清关，14拒签等10个基础物流状态，如需要返回高级物流状态，请参考 resultv2 传值 + * @param state + */ + public void setState(String state) { + this.state = state; + } + + /** + * create:订单创建,wait_pay:待支付,支付完成,待发货:wait_shipping,买家申请取消订单:apply_cancel, 买家关闭订单:close，已发货，运送中:shipping,已投递，比如入到快递柜:shipped,同意签收:agree_sign_receipt,拒绝签收:reject_sign_receipt,包裹返回:package_return,包裹卖家签收:package_seller_sign_receipt,已妥投:delivered,退款:refund,删除:delete + * @return + */ + public String getStatus() { + return status; + } + /** + * create:订单创建,wait_pay:待支付,支付完成,待发货:wait_shipping,买家申请取消订单:apply_cancel, 买家关闭订单:close，已发货，运送中:shipping,已投递，比如入到快递柜:shipped,同意签收:agree_sign_receipt,拒绝签收:reject_sign_receipt,包裹返回:package_return,包裹卖家签收:package_seller_sign_receipt,已妥投:delivered,退款:refund,删除:delete + * @param status + */ + public void setStatus(String status) { + this.status = status; + } + + /** + * 包裹追踪号 + * @return + */ + public String getTrackNumber() { + return trackNumber; + } + /** + * 包裹追踪号 + * @param trackNumber + */ + public void setTrackNumber(String trackNumber) { + this.trackNumber = trackNumber; + } + + /** + * 订单号 + * @return + */ + public Long getTradeOrderId() { + return tradeOrderId; + } + /** + * 订单号 + * @param tradeOrderId + */ + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; + } + + /** + * 支付事务id + * @return + */ + public String getTransactionId() { + return transactionId; + } + /** + * 支付事务id + * @param transactionId + */ + public void setTransactionId(String transactionId) { + this.transactionId = transactionId; + } + /** * unpack的用户 * @return @@ -1162,104 +1264,78 @@ private static final long serialVersionUID = 1L; this.unpackUser = unpackUser; } - /** - * 订单取消时间 - * @return - */ - public Date getGmtCancel() { - return gmtCancel; - } - /** - * 订单取消时间 - * @param gmtCancel - */ - public void setGmtCancel(Date gmtCancel) { - this.gmtCancel = gmtCancel; - } - - /** - * 订单取消用户 - * @return - */ - public String getCancelUser() { - return cancelUser; - } - /** - * 订单取消用户 - * @param cancelUser - */ - public void setCancelUser(String cancelUser) { - this.cancelUser = cancelUser; - } - @Override public String toString() { return "VvTradeOrderLineEntity{" + - ",id=" + id + - ",isDelete=" + isDelete + - ",createTime=" + createTime + - ",modifyTime=" + modifyTime + - ",salePrice=" + salePrice + - ",num=" + num + - ",status=" + status + - ",tradeOrderId=" + tradeOrderId + - ",refundAmount=" + refundAmount + - ",trackNumber=" + trackNumber + - ",refundCount=" + refundCount + - ",productId=" + productId + - ",productName=" + productName + - ",skuInfo=" + skuInfo + - ",productMainImageUrl=" + productMainImageUrl + - ",skuId=" + skuId + - ",skuImageUrl=" + skuImageUrl + - ",commentId=" + commentId + - ",deliveredType=" + deliveredType + - ",settleStatus=" + settleStatus + - ",gmtSettle=" + gmtSettle + - ",sellerId=" + sellerId + - ",reverseStatus=" + reverseStatus + - ",profitAmount=" + profitAmount + - ",originPrice=" + originPrice + - ",createTimestamp=" + createTimestamp + - ",modifyTimestamp=" + modifyTimestamp + - ",buyerId=" + buyerId + - ",buyerPhone=" + buyerPhone + - ",buyerName=" + buyerName + - ",buyerWeixin=" + buyerWeixin + - ",province=" + province + - ",city=" + city + - ",district=" + district + - ",sellerName=" + sellerName + + ",activityAwardCount=" + activityAwardCount + + ",activityId=" + activityId + + ",appName=" + appName + + ",awardAmount=" + awardAmount + ",batchNum=" + batchNum + - ",shippingAmount=" + shippingAmount + - ",promotionPrice=" + promotionPrice + - ",state=" + state + + ",buyerAddressId=" + buyerAddressId + + ",buyerId=" + buyerId + + ",buyerName=" + buyerName + + ",buyerPhone=" + buyerPhone + + ",buyerWeixin=" + buyerWeixin + + ",cancelUser=" + cancelUser + + ",channel=" + channel + + ",city=" + city + + ",commentId=" + commentId + + ",createTime=" + createTime + + ",createTimestamp=" + createTimestamp + + ",deliveredBy=" + deliveredBy + + ",deliveredType=" + deliveredType + + ",deliveredUser=" + deliveredUser + + ",district=" + district + + ",gmtAgreeSignReceipt=" + gmtAgreeSignReceipt + + ",gmtCancel=" + gmtCancel + + ",gmtClose=" + gmtClose + + ",gmtDelivered=" + gmtDelivered + ",gmtDownOrder=" + gmtDownOrder + ",gmtPay=" + gmtPay + - ",gmtToShipping=" + gmtToShipping + - ",gmtSignReceipt=" + gmtSignReceipt + - ",gmtDelivered=" + gmtDelivered + - ",deliveredBy=" + deliveredBy + - ",appName=" + appName + - ",channel=" + channel + - ",promoterId=" + promoterId + - ",awardAmount=" + awardAmount + - ",activityId=" + activityId + - ",activityAwardCount=" + activityAwardCount + - ",transactionId=" + transactionId + - ",payType=" + payType + ",gmtPrePay=" + gmtPrePay + - ",gmtClose=" + gmtClose + - ",prepayId=" + prepayId + - ",buyerAddressId=" + buyerAddressId + + ",gmtRejectSignReceipt=" + gmtRejectSignReceipt + + ",gmtSettle=" + gmtSettle + ",gmtShipped=" + gmtShipped + + ",gmtSignReceipt=" + gmtSignReceipt + + ",gmtToShipping=" + gmtToShipping + ",gmtUnpack=" + gmtUnpack + + ",id=" + id + + ",isDelete=" + isDelete + + ",modifyTime=" + modifyTime + + ",modifyTimestamp=" + modifyTimestamp + + ",num=" + num + + ",originPrice=" + originPrice + + ",payType=" + payType + + ",prepayId=" + prepayId + + ",productId=" + productId + + ",productMainImageUrl=" + productMainImageUrl + + ",productName=" + productName + + ",profitAmount=" + profitAmount + + ",promoterId=" + promoterId + + ",promotionPrice=" + promotionPrice + + ",province=" + province + + ",refundAmount=" + refundAmount + + ",refundCount=" + refundCount + + ",rejectSignReceiptFeatures=" + rejectSignReceiptFeatures + + ",rejectSignReceiptReason=" + rejectSignReceiptReason + + ",reverseStatus=" + reverseStatus + + ",salePrice=" + salePrice + + ",sellerId=" + sellerId + + ",sellerName=" + sellerName + + ",settleStatus=" + settleStatus + ",shippedUser=" + shippedUser + - ",deliveredUser=" + deliveredUser + + ",shippingAmount=" + shippingAmount + ",shippingUser=" + shippingUser + + ",skuId=" + skuId + + ",skuImageUrl=" + skuImageUrl + + ",skuInfo=" + skuInfo + + ",state=" + state + + ",status=" + status + + ",trackNumber=" + trackNumber + + ",tradeOrderId=" + tradeOrderId + + ",transactionId=" + transactionId + ",unpackUser=" + unpackUser + - ",gmtCancel=" + gmtCancel + - ",cancelUser=" + cancelUser + "}"; } } \ No newline at end of file diff --git a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java index dc6ef04..7df0080 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java +++ b/api-mapper/src/main/java/com/heyu/api/data/enums/OrderStatusEnums.java @@ -1,16 +1,36 @@ package com.heyu.api.data.enums; public enum OrderStatusEnums { + + // create:订单创建,wait_pay:待支付,支付完成,待发货:wait_shipping,买家申请取消订单:apply_cancel, 买家关闭订单:close，已发货，运送中:shipping,已投递，比如入到快递柜:shipped,同意签收:agree_sign_receipt,拒绝签收:reject_sign_receipt,包裹返回:package_return,包裹卖家签收:package_seller_sign_receipt,已妥投:delivered,退款:refund,删除:delete create("create","订单创建"), + wait_pay("wait_pay","待支付"), - wait_shipping("wait_shipping","待发货"), - cancel("cancel","买家取消订单"), - close("close","卖家关闭订单"), - shipping("shipping","已发货"), - shipped("shipped","已签收"), + + wait_shipping("wait_shipping","支付完成,待发货"), + + apply_cancel("apply_cancel","买家申请取消订单"), + + cancel("cancel","卖家同意取消"), + + close("close","买家关闭订单"), + + shipping("shipping","已发货，运送中"), + + shipped("shipped", "已投递，比如入到快递柜"), + + agree_sign_receipt("agree_sign_receipt", "同意签收"), + + reject_sign_receipt("reject_sign_receipt", "拒绝签收"), + + package_return("package_return","包裹返回"), + + package_seller_sign_receipt("package_seller_sign_receipt","包裹卖家签收"), + delivered("delivered","已妥投"), - all_refund("all_refund","全部退款"), - part_refund("part_refund","部分退款"), + + refund("refund","退款"), + delete("delete","删除"), ; diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java index 1267050..5b8d8f1 100644 --- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java +++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_update.java @@ -49,7 +49,7 @@ public class MysqlMain_update { List list = new ArrayList(); - list.add(new TablesBean("vv_reverse_order")); + list.add(new TablesBean("vv_trade_order_line")); //list.add(new TablesBean("vv_trade_order"));