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 6ba7700..12a58e4 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 @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *购物车 * @author quyixiao -* @since 2025-08-29 +* @since 2025-10-15 */ @Data @@ -21,370 +21,133 @@ 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 batch_num = CLASS_NAME + "batch_num"; // 批次数量 - 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 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_type = CLASS_NAME + "delivered_type"; // 1 买家手动确认收货， 2 系统自动确认收货 - public final static String district_ = CLASS_NAME + "district"; // 区 - 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_settle = CLASS_NAME + "gmt_settle"; // 结算时间 - public final static String gmt_to_pack = CLASS_NAME + "gmt_to_pack"; // 打包时间 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 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 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 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 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 shipping_amount = CLASS_NAME + "shipping_amount"; // 运费 + public final static String num_ = CLASS_NAME + "num"; // 数量 + public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，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 sku_info = CLASS_NAME + "sku_info"; // sku信息json - public final static String status_ = CLASS_NAME + "status"; // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 - public final static String track_number = CLASS_NAME + "track_number"; // 包裹追踪号 - public final static String trade_order_id = CLASS_NAME + "trade_order_id"; // 订单号 - //批次数量 - @TableId(value = "batch_num", type = IdType.AUTO) - private Integer batchNum; - //订单id - private Long buyerId; - //买家名称 - private String buyerName; - //买家手机号 - private String buyerPhone; - //买家微信 - private String buyerWeixin; - //市 - private String city; - //评论 id - private Long commentId; - //创建时间 - private Date createTime; - //创建时间 - private Long createTimestamp; - //1 买家手动确认收货， 2 系统自动确认收货 - private Integer deliveredType; - //区 - private String district; - //妥投时间 - private Date gmtDelivered; - //下单时间 - private Date gmtDownOrder; - //支付时间 - private Date gmtPay; - //结算时间 - private Date gmtSettle; - //打包时间 - private Date gmtToPack; + public final static String comment_id = CLASS_NAME + "comment_id"; // 评论 id + 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_pack = CLASS_NAME + "gmt_to_pack"; // 打包时间 + public final static String gmt_delivered = CLASS_NAME + "gmt_delivered"; // 妥投时间 + 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 buyer_id = CLASS_NAME + "buyer_id"; // 订单id + 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_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"; // 当时促销价 // + @TableId(value = "id", type = IdType.AUTO) private Long id; //是否删除：0 否 1 删除 private Integer isDelete; + //创建时间 + private Date createTime; //修改时间 private Date modifyTime; - //修改时间 - private Date modifyTimestamp; - //数量 - private Integer num; - //原来价格 - private BigDecimal originPrice; - //商品id - private Long productId; - //商品主图 - private String productMainImageUrl; - //商品名称 - private String productName; - //这笔子单获得利益 - private BigDecimal profitAmount; - //省 - private String province; - //退款金额 - private BigDecimal refundAmount; - //退货数量 - private Integer refundCount; - //逆向状态。 - private String reverseStatus; //单价 private BigDecimal salePrice; - //卖家id - private Long sellerId; - //卖家名称 - private String sellerName; - //0 未结算，1 已经结算 - private Integer settleStatus; - //运费 - private BigDecimal shippingAmount; + //数量 + private Integer num; + //wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，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; - //sku信息json - private String skuInfo; - //wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 - private String status; - //包裹追踪号 - private String trackNumber; - //订单号 - private Long tradeOrderId; - /** - * 批次数量 - * @return - */ - public Integer getBatchNum() { - return batchNum; - } - /** - * 批次数量 - * @param batchNum - */ - public void setBatchNum(Integer batchNum) { - this.batchNum = batchNum; - } - - /** - * 订单id - * @return - */ - public Long getBuyerId() { - return buyerId; - } - /** - * 订单id - * @param buyerId - */ - public void setBuyerId(Long buyerId) { - this.buyerId = buyerId; - } - - /** - * 买家名称 - * @return - */ - public String getBuyerName() { - return buyerName; - } - /** - * 买家名称 - * @param buyerName - */ - 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 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; - } - - /** - * 1 买家手动确认收货， 2 系统自动确认收货 - * @return - */ - public Integer getDeliveredType() { - return deliveredType; - } - /** - * 1 买家手动确认收货， 2 系统自动确认收货 - * @param deliveredType - */ - public void setDeliveredType(Integer deliveredType) { - this.deliveredType = deliveredType; - } - - /** - * 区 - * @return - */ - public String getDistrict() { - return district; - } - /** - * 区 - * @param district - */ - public void setDistrict(String district) { - this.district = district; - } - - /** - * 妥投时间 - * @return - */ - public Date getGmtDelivered() { - return gmtDelivered; - } - /** - * 妥投时间 - * @param gmtDelivered - */ - public void setGmtDelivered(Date gmtDelivered) { - this.gmtDelivered = gmtDelivered; - } - - /** - * 下单时间 - * @return - */ - public Date getGmtDownOrder() { - return gmtDownOrder; - } - /** - * 下单时间 - * @param gmtDownOrder - */ - public void setGmtDownOrder(Date gmtDownOrder) { - this.gmtDownOrder = gmtDownOrder; - } - - /** - * 支付时间 - * @return - */ - public Date getGmtPay() { - return gmtPay; - } - /** - * 支付时间 - * @param gmtPay - */ - public void setGmtPay(Date gmtPay) { - this.gmtPay = gmtPay; - } - - /** - * 结算时间 - * @return - */ - public Date getGmtSettle() { - return gmtSettle; - } - /** - * 结算时间 - * @param gmtSettle - */ - public void setGmtSettle(Date gmtSettle) { - this.gmtSettle = gmtSettle; - } - - /** - * 打包时间 - * @return - */ - public Date getGmtToPack() { - return gmtToPack; - } - /** - * 打包时间 - * @param gmtToPack - */ - public void setGmtToPack(Date gmtToPack) { - this.gmtToPack = gmtToPack; - } - + //评论 id + private Long commentId; + //下单时间 + private Date gmtDownOrder; + //支付时间 + private Date gmtPay; + //打包时间 + private Date gmtToPack; + //妥投时间 + private Date gmtDelivered; + //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; + //订单id + private Long buyerId; + //创建时间 + private Long createTimestamp; + //修改时间 + private Date modifyTimestamp; + //买家手机号 + private String buyerPhone; + //买家名称 + private String buyerName; + //买家微信 + private String buyerWeixin; + //省 + private String province; + //市 + private String city; + //区 + private String district; + //卖家名称 + private String sellerName; + //批次数量 + private Integer batchNum; + //运费 + private BigDecimal shippingAmount; + //当时促销价 + private BigDecimal promotionPrice; /** * * @return @@ -415,6 +178,21 @@ private static final long serialVersionUID = 1L; this.isDelete = isDelete; } + /** + * 创建时间 + * @return + */ + public Date getCreateTime() { + return createTime; + } + /** + * 创建时间 + * @param createTime + */ + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + /** * 修改时间 * @return @@ -430,171 +208,6 @@ private static final long serialVersionUID = 1L; this.modifyTime = modifyTime; } - /** - * 修改时间 - * @return - */ - public Date getModifyTimestamp() { - return modifyTimestamp; - } - /** - * 修改时间 - * @param modifyTimestamp - */ - public void setModifyTimestamp(Date 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; - } - - /** - * 商品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; - } - - /** - * 省 - * @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 getReverseStatus() { - return reverseStatus; - } - /** - * 逆向状态。 - * @param reverseStatus - */ - public void setReverseStatus(String reverseStatus) { - this.reverseStatus = reverseStatus; - } - /** * 单价 * @return @@ -611,63 +224,153 @@ private static final long serialVersionUID = 1L; } /** - * 卖家id + * 数量 * @return */ - public Long getSellerId() { - return sellerId; + public Integer getNum() { + return num; } /** - * 卖家id - * @param sellerId + * 数量 + * @param num */ - public void setSellerId(Long sellerId) { - this.sellerId = sellerId; + public void setNum(Integer num) { + this.num = num; } /** - * 卖家名称 + * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 * @return */ - public String getSellerName() { - return sellerName; + public String getStatus() { + return status; } /** - * 卖家名称 - * @param sellerName + * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 + * @param status */ - public void setSellerName(String sellerName) { - this.sellerName = sellerName; + public void setStatus(String status) { + this.status = status; } /** - * 0 未结算，1 已经结算 + * 订单号 * @return */ - public Integer getSettleStatus() { - return settleStatus; + public Long getTradeOrderId() { + return tradeOrderId; } /** - * 0 未结算，1 已经结算 - * @param settleStatus + * 订单号 + * @param tradeOrderId */ - public void setSettleStatus(Integer settleStatus) { - this.settleStatus = settleStatus; + public void setTradeOrderId(Long tradeOrderId) { + this.tradeOrderId = tradeOrderId; } /** - * 运费 + * 退款金额 * @return */ - public BigDecimal getShippingAmount() { - return shippingAmount; + public BigDecimal getRefundAmount() { + return refundAmount; } /** - * 运费 - * @param shippingAmount + * 退款金额 + * @param refundAmount */ - public void setShippingAmount(BigDecimal shippingAmount) { - this.shippingAmount = shippingAmount; + 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; } /** @@ -701,109 +404,425 @@ private static final long serialVersionUID = 1L; } /** - * sku信息json + * 评论 id * @return */ - public String getSkuInfo() { - return skuInfo; + public Long getCommentId() { + return commentId; } /** - * sku信息json - * @param skuInfo + * 评论 id + * @param commentId */ - public void setSkuInfo(String skuInfo) { - this.skuInfo = skuInfo; + public void setCommentId(Long commentId) { + this.commentId = commentId; } /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 + * 下单时间 * @return */ - public String getStatus() { - return status; + public Date getGmtDownOrder() { + return gmtDownOrder; } /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 - * @param status + * 下单时间 + * @param gmtDownOrder */ - public void setStatus(String status) { - this.status = status; + public void setGmtDownOrder(Date gmtDownOrder) { + this.gmtDownOrder = gmtDownOrder; } /** - * 包裹追踪号 + * 支付时间 * @return */ - public String getTrackNumber() { - return trackNumber; + public Date getGmtPay() { + return gmtPay; } /** - * 包裹追踪号 - * @param trackNumber + * 支付时间 + * @param gmtPay */ - public void setTrackNumber(String trackNumber) { - this.trackNumber = trackNumber; + public void setGmtPay(Date gmtPay) { + this.gmtPay = gmtPay; } /** - * 订单号 + * 打包时间 * @return */ - public Long getTradeOrderId() { - return tradeOrderId; + public Date getGmtToPack() { + return gmtToPack; } /** - * 订单号 - * @param tradeOrderId + * 打包时间 + * @param gmtToPack */ - public void setTradeOrderId(Long tradeOrderId) { - this.tradeOrderId = tradeOrderId; + public void setGmtToPack(Date gmtToPack) { + this.gmtToPack = gmtToPack; + } + + /** + * 妥投时间 + * @return + */ + public Date getGmtDelivered() { + return gmtDelivered; + } + /** + * 妥投时间 + * @param gmtDelivered + */ + public void setGmtDelivered(Date gmtDelivered) { + this.gmtDelivered = gmtDelivered; + } + + /** + * 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; + } + + /** + * 订单id + * @return + */ + public Long getBuyerId() { + return buyerId; + } + /** + * 订单id + * @param buyerId + */ + public void setBuyerId(Long buyerId) { + this.buyerId = buyerId; + } + + /** + * 创建时间 + * @return + */ + public Long getCreateTimestamp() { + return createTimestamp; + } + /** + * 创建时间 + * @param createTimestamp + */ + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; + } + + /** + * 修改时间 + * @return + */ + public Date getModifyTimestamp() { + return modifyTimestamp; + } + /** + * 修改时间 + * @param modifyTimestamp + */ + public void setModifyTimestamp(Date modifyTimestamp) { + this.modifyTimestamp = modifyTimestamp; + } + + /** + * 买家手机号 + * @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; + } + + /** + * 批次数量 + * @return + */ + public Integer getBatchNum() { + return batchNum; + } + /** + * 批次数量 + * @param batchNum + */ + public void setBatchNum(Integer batchNum) { + this.batchNum = batchNum; + } + + /** + * 运费 + * @return + */ + public BigDecimal getShippingAmount() { + return shippingAmount; + } + /** + * 运费 + * @param shippingAmount + */ + public void setShippingAmount(BigDecimal shippingAmount) { + this.shippingAmount = shippingAmount; + } + + /** + * 当时促销价 + * @return + */ + public BigDecimal getPromotionPrice() { + return promotionPrice; + } + /** + * 当时促销价 + * @param promotionPrice + */ + public void setPromotionPrice(BigDecimal promotionPrice) { + this.promotionPrice = promotionPrice; } @Override public String toString() { return "VvTradeOrderLineEntity{" + - ",batchNum=" + batchNum + - ",buyerId=" + buyerId + - ",buyerName=" + buyerName + - ",buyerPhone=" + buyerPhone + - ",buyerWeixin=" + buyerWeixin + - ",city=" + city + - ",commentId=" + commentId + - ",createTime=" + createTime + - ",createTimestamp=" + createTimestamp + - ",deliveredType=" + deliveredType + - ",district=" + district + - ",gmtDelivered=" + gmtDelivered + - ",gmtDownOrder=" + gmtDownOrder + - ",gmtPay=" + gmtPay + - ",gmtSettle=" + gmtSettle + - ",gmtToPack=" + gmtToPack + ",id=" + id + ",isDelete=" + isDelete + + ",createTime=" + createTime + ",modifyTime=" + modifyTime + - ",modifyTimestamp=" + modifyTimestamp + - ",num=" + num + - ",originPrice=" + originPrice + - ",productId=" + productId + - ",productMainImageUrl=" + productMainImageUrl + - ",productName=" + productName + - ",profitAmount=" + profitAmount + - ",province=" + province + - ",refundAmount=" + refundAmount + - ",refundCount=" + refundCount + - ",reverseStatus=" + reverseStatus + ",salePrice=" + salePrice + - ",sellerId=" + sellerId + - ",sellerName=" + sellerName + - ",settleStatus=" + settleStatus + - ",shippingAmount=" + shippingAmount + + ",num=" + num + + ",status=" + status + + ",tradeOrderId=" + tradeOrderId + + ",refundAmount=" + refundAmount + + ",trackNumber=" + trackNumber + + ",refundCount=" + refundCount + + ",productId=" + productId + + ",productName=" + productName + + ",skuInfo=" + skuInfo + + ",productMainImageUrl=" + productMainImageUrl + ",skuId=" + skuId + ",skuImageUrl=" + skuImageUrl + - ",skuInfo=" + skuInfo + - ",status=" + status + - ",trackNumber=" + trackNumber + - ",tradeOrderId=" + tradeOrderId + + ",commentId=" + commentId + + ",gmtDownOrder=" + gmtDownOrder + + ",gmtPay=" + gmtPay + + ",gmtToPack=" + gmtToPack + + ",gmtDelivered=" + gmtDelivered + + ",deliveredType=" + deliveredType + + ",settleStatus=" + settleStatus + + ",gmtSettle=" + gmtSettle + + ",sellerId=" + sellerId + + ",reverseStatus=" + reverseStatus + + ",profitAmount=" + profitAmount + + ",originPrice=" + originPrice + + ",buyerId=" + buyerId + + ",createTimestamp=" + createTimestamp + + ",modifyTimestamp=" + modifyTimestamp + + ",buyerPhone=" + buyerPhone + + ",buyerName=" + buyerName + + ",buyerWeixin=" + buyerWeixin + + ",province=" + province + + ",city=" + city + + ",district=" + district + + ",sellerName=" + sellerName + + ",batchNum=" + batchNum + + ",shippingAmount=" + shippingAmount + + ",promotionPrice=" + promotionPrice + "}"; } } \ No newline at end of file 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 9ef889e..d28fb85 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(); - String a = "vv_app_category"; + String a = "vv_trade_order_line"; for (String s : a.split(",")) { list.add(new TablesBean(s)); } diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java index 1eabba1..d174aeb 100644 --- a/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/vv/AppOrderRequest.java @@ -17,7 +17,6 @@ public class AppOrderRequest { * 买家id */ private Long buyerId; - /*** * 订单号id */ @@ -38,10 +37,9 @@ public class AppOrderRequest { private String createTimestampSort; - //wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered + // wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered private String status; - /*** * 逆向状态 */ diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java index b3bff14..7b134c2 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppOrderController.java @@ -214,6 +214,7 @@ public class AppOrderController { vvTradeOrderLineEntity.setStatus(OrderStatusEnums.wait_pay.getStatus()); vvTradeOrderLineEntity.setProductId(vvSkuEntity.getProductId()); vvTradeOrderLineEntity.setProductName(vvProduct.getTitle()); + vvTradeOrderLineEntity.setPromotionPrice(vvSkuEntity.getPromotionPrice()); vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl()); vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues)); vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity); diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java index 22e8b1a..b046bf3 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppUploadOssController.java @@ -32,6 +32,7 @@ public class AppUploadOssController { *

* http://localhost:8888/app/upload/file file */ + // todo @PostMapping("/file") public R uploadFile(HttpServletRequest request, HttpServletResponse response, @RequestParam("file") MultipartFile file) { List> data = ossFileUploadService.uploadImages(new MultipartFile[]{file});