diff --git a/api-mapper/pom.xml b/api-mapper/pom.xml index fd1b339..3f58eba 100644 --- a/api-mapper/pom.xml +++ b/api-mapper/pom.xml @@ -45,7 +45,7 @@ com.lz.mybatis.plugin lz_mybatis_plugin - 19.0-SNAPSHOT + 20.0-SNAPSHOT diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java index 916a7ec..ba37a7f 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java +++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvPackageDao.java @@ -7,8 +7,10 @@ package com.heyu.api.data.dao.vv; * @author quyixiao * @since 2025-08-23 */ -import com.heyu.api.data.entity.vv.VvPackageEntity; + import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.heyu.api.data.entity.vv.VvPackageEntity; +import com.lz.mybatis.plugin.annotations.IFNull; import com.lz.mybatis.plugin.annotations.IN; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -37,7 +39,5 @@ public interface VvPackageDao extends BaseMapper { int deleteVvPackageById(@Param("id")Long id); - - - List selectVvPackageByTrackNumbers(@IN List trackNumber); + List selectVvPackageByTrackNumbers(@IFNull @IN List trackNumber); } \ No newline at end of file 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 1f2550e..6ba7700 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-27 +* @since 2025-08-29 */ @Data @@ -21,152 +21,233 @@ 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 , 已接收，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 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_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 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 modify_time = CLASS_NAME + "modify_time"; // 修改时间 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 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 city_ = CLASS_NAME + "city"; // 市 - public final static String district_ = CLASS_NAME + "district"; // 区 + 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"; // 卖家名称 - // - @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 , 已接收，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; + 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 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 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 gmtToPack; + // + private Long id; + //是否删除：0 否 1 删除 + private Integer isDelete; + //修改时间 + private Date modifyTime; //修改时间 private Date modifyTimestamp; - //买家手机号 - private String buyerPhone; - //买家名称 - private String buyerName; - //买家微信 - private String buyerWeixin; + //数量 + private Integer num; + //原来价格 + private BigDecimal originPrice; + //商品id + private Long productId; + //商品主图 + private String productMainImageUrl; + //商品名称 + private String productName; + //这笔子单获得利益 + private BigDecimal profitAmount; //省 private String province; - //市 - private String city; - //区 - private String district; + //退款金额 + 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; + //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 Long getId() { - return id; + public Integer getBatchNum() { + return batchNum; } /** - * - * @param id + * 批次数量 + * @param batchNum */ - public void setId(Long id) { - this.id = id; + public void setBatchNum(Integer batchNum) { + this.batchNum = batchNum; } /** - * 是否删除：0 否 1 删除 + * 订单id * @return */ - public Integer getIsDelete() { - return isDelete; + public Long getBuyerId() { + return buyerId; } /** - * 是否删除：0 否 1 删除 - * @param isDelete + * 订单id + * @param buyerId */ - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; + 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; } /** @@ -185,228 +266,63 @@ private static final long serialVersionUID = 1L; } /** - * 修改时间 + * 创建时间 * @return */ - public Date getModifyTime() { - return modifyTime; + public Long getCreateTimestamp() { + return createTimestamp; } /** - * 修改时间 - * @param modifyTime + * 创建时间 + * @param createTimestamp */ - public void setModifyTime(Date modifyTime) { - this.modifyTime = modifyTime; + public void setCreateTimestamp(Long createTimestamp) { + this.createTimestamp = createTimestamp; } /** - * 单价 + * 1 买家手动确认收货， 2 系统自动确认收货 * @return */ - public BigDecimal getSalePrice() { - return salePrice; + public Integer getDeliveredType() { + return deliveredType; } /** - * 单价 - * @param salePrice + * 1 买家手动确认收货， 2 系统自动确认收货 + * @param deliveredType */ - public void setSalePrice(BigDecimal salePrice) { - this.salePrice = salePrice; + public void setDeliveredType(Integer deliveredType) { + this.deliveredType = deliveredType; } /** - * 数量 + * 区 * @return */ - public Integer getNum() { - return num; + public String getDistrict() { + return district; } /** - * 数量 - * @param num + * 区 + * @param district */ - public void setNum(Integer num) { - this.num = num; + public void setDistrict(String district) { + this.district = district; } /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 + * 妥投时间 * @return */ - public String getStatus() { - return status; + public Date getGmtDelivered() { + return gmtDelivered; } /** - * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 - * @param status + * 妥投时间 + * @param gmtDelivered */ - 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; + public void setGmtDelivered(Date gmtDelivered) { + this.gmtDelivered = gmtDelivered; } /** @@ -439,66 +355,6 @@ private static final long serialVersionUID = 1L; this.gmtPay = gmtPay; } - /** - * 打包时间 - * @return - */ - public Date getGmtToPack() { - return gmtToPack; - } - /** - * 打包时间 - * @param gmtToPack - */ - 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 @@ -515,93 +371,63 @@ private static final long serialVersionUID = 1L; } /** - * 卖家id + * 打包时间 * @return */ - public Long getSellerId() { - return sellerId; + public Date getGmtToPack() { + return gmtToPack; } /** - * 卖家id - * @param sellerId + * 打包时间 + * @param gmtToPack */ - public void setSellerId(Long sellerId) { - this.sellerId = sellerId; + public void setGmtToPack(Date gmtToPack) { + this.gmtToPack = gmtToPack; } /** - * 逆向状态。 + * * @return */ - public String getReverseStatus() { - return reverseStatus; + public Long getId() { + return id; } /** - * 逆向状态。 - * @param reverseStatus + * + * @param id */ - public void setReverseStatus(String reverseStatus) { - this.reverseStatus = reverseStatus; + public void setId(Long id) { + this.id = id; } /** - * 这笔子单获得利益 + * 是否删除：0 否 1 删除 * @return */ - public BigDecimal getProfitAmount() { - return profitAmount; + public Integer getIsDelete() { + return isDelete; } /** - * 这笔子单获得利益 - * @param profitAmount + * 是否删除：0 否 1 删除 + * @param isDelete */ - public void setProfitAmount(BigDecimal profitAmount) { - this.profitAmount = profitAmount; + public void setIsDelete(Integer isDelete) { + this.isDelete = isDelete; } /** - * 原来价格 + * 修改时间 * @return */ - public BigDecimal getOriginPrice() { - return originPrice; + public Date getModifyTime() { + return modifyTime; } /** - * 原来价格 - * @param originPrice + * 修改时间 + * @param modifyTime */ - 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; + public void setModifyTime(Date modifyTime) { + this.modifyTime = modifyTime; } /** @@ -620,48 +446,93 @@ private static final long serialVersionUID = 1L; } /** - * 买家手机号 + * 数量 * @return */ - public String getBuyerPhone() { - return buyerPhone; + public Integer getNum() { + return num; } /** - * 买家手机号 - * @param buyerPhone + * 数量 + * @param num */ - public void setBuyerPhone(String buyerPhone) { - this.buyerPhone = buyerPhone; + public void setNum(Integer num) { + this.num = num; } /** - * 买家名称 + * 原来价格 * @return */ - public String getBuyerName() { - return buyerName; + public BigDecimal getOriginPrice() { + return originPrice; } /** - * 买家名称 - * @param buyerName + * 原来价格 + * @param originPrice */ - public void setBuyerName(String buyerName) { - this.buyerName = buyerName; + public void setOriginPrice(BigDecimal originPrice) { + this.originPrice = originPrice; } /** - * 买家微信 + * 商品id * @return */ - public String getBuyerWeixin() { - return buyerWeixin; + public Long getProductId() { + return productId; } /** - * 买家微信 - * @param buyerWeixin + * 商品id + * @param productId */ - public void setBuyerWeixin(String buyerWeixin) { - this.buyerWeixin = buyerWeixin; + 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; } /** @@ -680,33 +551,78 @@ private static final long serialVersionUID = 1L; } /** - * 市 + * 退款金额 * @return */ - public String getCity() { - return city; + public BigDecimal getRefundAmount() { + return refundAmount; } /** - * 市 - * @param city + * 退款金额 + * @param refundAmount */ - public void setCity(String city) { - this.city = city; + public void setRefundAmount(BigDecimal refundAmount) { + this.refundAmount = refundAmount; } /** - * 区 + * 退货数量 * @return */ - public String getDistrict() { - return district; + public Integer getRefundCount() { + return refundCount; } /** - * 区 - * @param district + * 退货数量 + * @param refundCount */ - public void setDistrict(String district) { - this.district = district; + 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 + */ + 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; } /** @@ -724,48 +640,170 @@ private static final long serialVersionUID = 1L; this.sellerName = sellerName; } + /** + * 0 未结算，1 已经结算 + * @return + */ + public Integer getSettleStatus() { + return settleStatus; + } + /** + * 0 未结算，1 已经结算 + * @param settleStatus + */ + public void setSettleStatus(Integer settleStatus) { + this.settleStatus = settleStatus; + } + + /** + * 运费 + * @return + */ + public BigDecimal getShippingAmount() { + return shippingAmount; + } + /** + * 运费 + * @param shippingAmount + */ + public void setShippingAmount(BigDecimal shippingAmount) { + this.shippingAmount = shippingAmount; + } + + /** + * 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; + } + + /** + * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 + * @return + */ + public String getStatus() { + return status; + } + /** + * wait_pay:待支付,待发货：wait_shipping, 已经发货: shipping , 已接收，delivered， cancel 订单取消 + * @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; + } + @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 + + ",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 + - ",gmtToPack=" + gmtToPack + - ",gmtDelivered=" + gmtDelivered + - ",deliveredType=" + deliveredType + - ",settleStatus=" + settleStatus + ",gmtSettle=" + gmtSettle + - ",sellerId=" + sellerId + - ",reverseStatus=" + reverseStatus + - ",profitAmount=" + profitAmount + - ",originPrice=" + originPrice + - ",buyerId=" + buyerId + - ",createTimestamp=" + createTimestamp + + ",gmtToPack=" + gmtToPack + + ",id=" + id + + ",isDelete=" + isDelete + + ",modifyTime=" + modifyTime + ",modifyTimestamp=" + modifyTimestamp + - ",buyerPhone=" + buyerPhone + - ",buyerName=" + buyerName + - ",buyerWeixin=" + buyerWeixin + + ",num=" + num + + ",originPrice=" + originPrice + + ",productId=" + productId + + ",productMainImageUrl=" + productMainImageUrl + + ",productName=" + productName + + ",profitAmount=" + profitAmount + ",province=" + province + - ",city=" + city + - ",district=" + district + + ",refundAmount=" + refundAmount + + ",refundCount=" + refundCount + + ",reverseStatus=" + reverseStatus + + ",salePrice=" + salePrice + + ",sellerId=" + sellerId + ",sellerName=" + sellerName + + ",settleStatus=" + settleStatus + + ",shippingAmount=" + shippingAmount + + ",skuId=" + skuId + + ",skuImageUrl=" + skuImageUrl + + ",skuInfo=" + skuInfo + + ",status=" + status + + ",trackNumber=" + trackNumber + + ",tradeOrderId=" + tradeOrderId + "}"; } } \ 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 1c5c07e..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_resource"; + String a = "vv_trade_order_line"; for (String s : a.split(",")) { list.add(new TablesBean(s)); } diff --git a/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java b/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java index 1274087..e00f21f 100644 --- a/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java +++ b/api-mapper/src/test/java/com/test/xxx/mysql/SqlParseUtilsTest.java @@ -1,6 +1,6 @@ package com.test.xxx.mysql; -import com.heyu.api.data.dao.vv.VvTradeOrderLineDao; +import com.heyu.api.data.dao.vv.VvPackageDao; import com.lz.mybatis.plugin.utils.TestParseUtils; import com.lz.mybatis.plugin.utils.t.Tuple2; import org.junit.Test; @@ -11,10 +11,7 @@ SqlParseUtilsTest { @Test public void test1() { - - Tuple2 tuple = TestParseUtils.testSql(VvTradeOrderLineDao::selectByAdminCondition).getData(); - - + Tuple2 tuple = TestParseUtils.testSql(VvPackageDao::selectVvPackageByTrackNumbers).getData(); System.out.println(tuple.getSecond()); diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java new file mode 100644 index 0000000..371a253 --- /dev/null +++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/resp/AppTradeOrderLineResp.java @@ -0,0 +1,23 @@ +package com.heyu.api.alibaba.request.mm.order.resp; + +import com.heyu.api.data.entity.vv.VvPackageEntity; +import com.heyu.api.data.entity.vv.VvTradeOrderEntity; +import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity; +import lombok.Data; + + +@Data +public class AppTradeOrderLineResp extends VvTradeOrderLineEntity { + + /*** + * 订单相关的信息 + */ + private VvTradeOrderEntity tradeOrderEntity; + + /*** + * + * 包相关的信息 + * + */ + private VvPackageEntity vvPackageEntity; +} diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java index b43151d..afa3148 100644 --- a/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java +++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java @@ -64,6 +64,7 @@ public class AppIndexPageController { return vvProductDao.selectIndexVvProduct(page, vvProductRequest.getProductName(), vvProductRequest.getFrontPage(), + vvProductRequest.getStatus(), vvProductRequest.getCategoryId1(), vvProductRequest.getCategoryId2(), 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 11db379..36986cf 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 @@ -96,63 +96,45 @@ public class AppOrderController { // 获取子单 List vvTradeOrderLineEntities = pageUtils.getRows(); - // 获取订单 List tradeOrderIds = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTradeOrderId); List tradeOrderEntities = vvTradeOrderDao.selectVvTradeOrderByTradeOrderIds(tradeOrderIds); - // 对订单进行排序，必须按照子单的顺序 Map vvTradeOrderEntityMap = SanUtils.list2Map(tradeOrderEntities, VvTradeOrderEntity::getId); - List vvTradeOrderEntities = new ArrayList<>(); - for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntities) { - vvTradeOrderEntities.add(vvTradeOrderEntityMap.get(vvTradeOrderLineEntity.getTradeOrderId())); - } - // 重新获取子单 - List list = vvTradeOrderLineDao.selectByAdminConditionList( - vvOrderRequest.getTradeOrderIds(), - null, - null, - null, - null, - null, - vvOrderRequest.getStatus(), - null, - vvOrderRequest.getMinCreateTimestamp(), - vvOrderRequest.getMaxCreateTimestamp(), - vvOrderRequest.getProductName(), - null, - null, - vvOrderRequest.getBuyerId(), - vvOrderRequest.getReverseStatus(), - vvOrderRequest.getCreateTimestampSort()); - - SanUtils.setNull(list, + SanUtils.setNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getProfitAmount, VvTradeOrderLineEntity::getModifyTime, VvTradeOrderLineEntity::getIsDelete, VvTradeOrderLineEntity::getCreateTime ); - List trackNumbers = SanUtils.list2listFilterNull(list, VvTradeOrderLineEntity::getTrackNumber); + + + + List trackNumbers = SanUtils.list2listFilterNull(vvTradeOrderLineEntities, VvTradeOrderLineEntity::getTrackNumber); + Map vvPackageEntityMap = new HashMap<>(); + if (CollectionUtils.isNotEmpty(trackNumbers)) { List packageEntities = vvPackageDao.selectVvPackageByTrackNumbers(trackNumbers); - for (VvPackageEntity packageEntity : packageEntities) { - vvPackageEntityMap.put(packageEntity.getTrackNumber(), packageEntity); - } + vvPackageEntityMap = SanUtils.list2Map(packageEntities, VvPackageEntity::getTrackNumber); } List vvOrderListResps = new ArrayList<>(); + + + + for (VvTradeOrderEntity vvTradeOrderEntity : vvTradeOrderEntities) { VVOrderListResp vvOrderListResp = new VVOrderListResp(); BeanUtils.copyProperties(vvTradeOrderEntity, vvOrderListResp); List vvTradeOrderLineEntityList = new ArrayList<>(); - for (VvTradeOrderLineEntity tradeOrderLineEntity : list) { + for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntities) { if (vvTradeOrderEntity.getId().equals(tradeOrderLineEntity.getTradeOrderId())) { vvTradeOrderLineEntityList.add(tradeOrderLineEntity); } @@ -291,6 +273,7 @@ public class AppOrderController { vvTradeOrderLineEntity.setProductMainImageUrl(vvProduct.getMainImageUrl()); vvTradeOrderLineEntity.setSkuInfo(JSON.toJSONString(propertyNameValues)); vvTradeOrderLineEntityList.add(vvTradeOrderLineEntity); + vvTradeOrderLineEntity.setBatchNum(vvTradeOrderLineDTO.getNum()); } }