diff --git a/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineStatusLogDao.java b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineStatusLogDao.java
new file mode 100644
index 0000000..a974a8a
--- /dev/null
+++ b/api-mapper/src/main/java/com/heyu/api/data/dao/vv/VvTradeOrderLineStatusLogDao.java
@@ -0,0 +1,36 @@
+package com.heyu.api.data.dao.vv;
+/**
+*
+* 订单表状态变更记录 服务类
+*
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+@Mapper
+public interface VvTradeOrderLineStatusLogDao extends BaseMapper {
+
+
+ VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(@Param("id")Long id);
+
+
+ Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int deleteVvTradeOrderLineStatusLogById(@Param("id")Long id);
+
+
+}
\ 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 2bba034..7e2d358 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-11
+* @since 2025-11-16
*/
@Data
@@ -21,709 +21,223 @@ 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 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 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 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 num_ = CLASS_NAME + "num"; // 数量
+ 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 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 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 contry_ = CLASS_NAME + "contry"; // 国家
+ 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 buyer_detail_address = CLASS_NAME + "buyer_detail_address"; // 买家详细地址
+ 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 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 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 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;
- //买家地址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 gmtPrePay;
- //拒绝签收时间
- private Date gmtRejectSignReceipt;
- //结算时间
- private Date gmtSettle;
- //是否已经签收
- private Date gmtShipped;
- //签收日期
- private Date gmtSignReceipt;
- //打包时间
- private Date gmtToShipping;
- //重新打包的时间
- private Date gmtUnpack;
+ 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 buyer_address_id = CLASS_NAME + "buyer_address_id"; // 买家地址id
+ public final static String gmt_down_order = CLASS_NAME + "gmt_down_order"; // 下单时间
+ public final static String gmt_pre_pay = CLASS_NAME + "gmt_pre_pay"; // 预支付时间
+ public final static String gmt_pay = CLASS_NAME + "gmt_pay"; // 支付时间
+ public final static String gmt_cancel = CLASS_NAME + "gmt_cancel"; // 订单取消时间
+ public final static String cancel_user = CLASS_NAME + "cancel_user"; // 订单取消用户
+ public final static String gmt_to_shipping = CLASS_NAME + "gmt_to_shipping"; // 打包时间
+ public final static String shipping_user = CLASS_NAME + "shipping_user"; // shipping的用户
+ public final static String cancel_reason = CLASS_NAME + "cancel_reason"; // 取消原因
+ public final static String shipped_user = CLASS_NAME + "shipped_user"; // shipped的用户
+ public final static String gmt_delivered = CLASS_NAME + "gmt_delivered"; // 妥投时间
+ public final static String delivered_user = CLASS_NAME + "delivered_user"; // delivered的用户
+ public final static String gmt_close = CLASS_NAME + "gmt_close"; // 订单关闭时间
+ public final static String close_user = CLASS_NAME + "close_user"; // 关闭订单的用户
+ public final static String gmt_un_shipping = CLASS_NAME + "gmt_un_shipping"; // 重新打包的时间
+ public final static String un_shipping_user = CLASS_NAME + "un_shipping_user"; // 不打包用户
+ public final static String gmt_shipped = CLASS_NAME + "gmt_shipped"; // 是否已经签收
+ public final static String un_shipping_reason = CLASS_NAME + "un_shipping_reason"; // 发货回退原因
+ public final static String gmt_reject_sign_receipt = CLASS_NAME + "gmt_reject_sign_receipt"; // 拒绝签收时间
+ public final static String reject_sign_receipt_reason = CLASS_NAME + "reject_sign_receipt_reason"; // 拒绝签收原因
+ public final static String reject_sign_receipt_features = CLASS_NAME + "reject_sign_receipt_features"; // 拒绝签收的信息
+ public final static String close_reason = CLASS_NAME + "close_reason"; // 关闭原因
//
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
//是否删除：0 否 1 删除
private Integer isDelete;
+ //创建时间
+ private Date createTime;
//修改时间
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;
- //运费
- private BigDecimal shippingAmount;
- //shipping的用户
- private String shippingUser;
+ //数量
+ private Integer num;
+ //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 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;
+ //评论 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 contry;
+ //省
+ private String province;
+ //市
+ private String city;
+ //区
+ private String district;
+ //买家详细地址
+ private String buyerDetailAddress;
+ //卖家名称
+ private String sellerName;
+ //批次数量
+ private Integer batchNum;
+ //运费
+ private BigDecimal shippingAmount;
+ //当时促销价
+ private BigDecimal promotionPrice;
//快递单当前状态，默认为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;
+ //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;
- // unpack 的用户
- private String unpackUser;
- /**
- * 这次活动的奖励次数
- * @return
- */
- public Integer getActivityAwardCount() {
- return activityAwardCount;
- }
- /**
- * 这次活动的奖励次数
- * @param activityAwardCount
- */
- public void setActivityAwardCount(Integer activityAwardCount) {
- this.activityAwardCount = activityAwardCount;
- }
-
- /**
- * 活动id
- * @return
- */
- public Long getActivityId() {
- return activityId;
- }
- /**
- * 活动id
- * @param activityId
- */
- public void setActivityId(Long activityId) {
- this.activityId = activityId;
- }
-
- /**
- * goudezhao
- * @return
- */
- public String getAppName() {
- return appName;
- }
- /**
- * goudezhao
- * @param appName
- */
- public void setAppName(String appName) {
- this.appName = appName;
- }
-
- /**
- * 奖励金额
- * @return
- */
- public BigDecimal getAwardAmount() {
- return awardAmount;
- }
- /**
- * 奖励金额
- * @param awardAmount
- */
- public void setAwardAmount(BigDecimal awardAmount) {
- this.awardAmount = awardAmount;
- }
-
- /**
- * 批次数量
- * @return
- */
- public Integer getBatchNum() {
- return batchNum;
- }
- /**
- * 批次数量
- * @param batchNum
- */
- public void setBatchNum(Integer batchNum) {
- this.batchNum = batchNum;
- }
-
- /**
- * 买家地址id
- * @return
- */
- public Long getBuyerAddressId() {
- return buyerAddressId;
- }
- /**
- * 买家地址id
- * @param buyerAddressId
- */
- public void setBuyerAddressId(Long buyerAddressId) {
- this.buyerAddressId = buyerAddressId;
- }
-
- /**
- * 订单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 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;
- }
-
- /**
- * 下单时间
- * @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 getGmtPrePay() {
- return gmtPrePay;
- }
- /**
- * 预支付时间
- * @param gmtPrePay
- */
- public void setGmtPrePay(Date gmtPrePay) {
- this.gmtPrePay = gmtPrePay;
- }
-
- /**
- * 拒绝签收时间
- * @return
- */
- public Date getGmtRejectSignReceipt() {
- return gmtRejectSignReceipt;
- }
- /**
- * 拒绝签收时间
- * @param gmtRejectSignReceipt
- */
- public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) {
- this.gmtRejectSignReceipt = gmtRejectSignReceipt;
- }
-
- /**
- * 结算时间
- * @return
- */
- public Date getGmtSettle() {
- return gmtSettle;
- }
- /**
- * 结算时间
- * @param gmtSettle
- */
- public void setGmtSettle(Date gmtSettle) {
- this.gmtSettle = gmtSettle;
- }
-
- /**
- * 是否已经签收
- * @return
- */
- public Date getGmtShipped() {
- return gmtShipped;
- }
- /**
- * 是否已经签收
- * @param gmtShipped
- */
- public void setGmtShipped(Date gmtShipped) {
- 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
- */
- public Date getGmtUnpack() {
- return gmtUnpack;
- }
- /**
- * 重新打包的时间
- * @param gmtUnpack
- */
- public void setGmtUnpack(Date gmtUnpack) {
- this.gmtUnpack = gmtUnpack;
- }
-
+ //支付方式，weixin
+ private String payType;
+ //预支付id
+ private String prepayId;
+ //买家地址id
+ private Long buyerAddressId;
+ //下单时间
+ private Date gmtDownOrder;
+ //预支付时间
+ private Date gmtPrePay;
+ //支付时间
+ private Date gmtPay;
+ //订单取消时间
+ private Date gmtCancel;
+ //订单取消用户
+ private String cancelUser;
+ //打包时间
+ private Date gmtToShipping;
+ //shipping的用户
+ private String shippingUser;
+ //取消原因
+ private String cancelReason;
+ //shipped的用户
+ private String shippedUser;
+ //妥投时间
+ private Date gmtDelivered;
+ //delivered的用户
+ private String deliveredUser;
+ //订单关闭时间
+ private Date gmtClose;
+ //关闭订单的用户
+ private String closeUser;
+ //重新打包的时间
+ private Date gmtUnShipping;
+ //不打包用户
+ private String unShippingUser;
+ //是否已经签收
+ private Date gmtShipped;
+ //发货回退原因
+ private String unShippingReason;
+ //拒绝签收时间
+ private Date gmtRejectSignReceipt;
+ //拒绝签收原因
+ private String rejectSignReceiptReason;
+ //拒绝签收的信息
+ private String rejectSignReceiptFeatures;
+ //关闭原因
+ private String closeReason;
/**
*
* @return
@@ -754,6 +268,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
@@ -769,261 +298,6 @@ private static final long serialVersionUID = 1L;
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
@@ -1040,93 +314,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;
}
/**
- * 卖家名称
+ * 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 getSellerName() {
- return sellerName;
+ public String getStatus() {
+ return status;
}
/**
- * 卖家名称
- * @param sellerName
+ * 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 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;
}
/**
- * shipped的用户
+ * 退款金额
* @return
*/
- public String getShippedUser() {
- return shippedUser;
+ public BigDecimal getRefundAmount() {
+ return refundAmount;
}
/**
- * shipped的用户
- * @param shippedUser
+ * 退款金额
+ * @param refundAmount
*/
- public void setShippedUser(String shippedUser) {
- this.shippedUser = shippedUser;
+ public void setRefundAmount(BigDecimal refundAmount) {
+ this.refundAmount = refundAmount;
}
/**
- * 运费
+ * 包裹追踪号
* @return
*/
- public BigDecimal getShippingAmount() {
- return shippingAmount;
+ public String getTrackNumber() {
+ return trackNumber;
}
/**
- * 运费
- * @param shippingAmount
+ * 包裹追踪号
+ * @param trackNumber
*/
- public void setShippingAmount(BigDecimal shippingAmount) {
- this.shippingAmount = shippingAmount;
+ public void setTrackNumber(String trackNumber) {
+ this.trackNumber = trackNumber;
}
/**
- * shipping的用户
+ * 退货数量
* @return
*/
- public String getShippingUser() {
- return shippingUser;
+ public Integer getRefundCount() {
+ return refundCount;
}
/**
- * shipping的用户
- * @param shippingUser
+ * 退货数量
+ * @param refundCount
*/
- public void setShippingUser(String shippingUser) {
- this.shippingUser = shippingUser;
+ 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;
}
/**
@@ -1160,18 +494,348 @@ 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;
+ }
+
+ /**
+ * 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 getContry() {
+ return contry;
+ }
+ /**
+ * 国家
+ * @param contry
+ */
+ public void setContry(String contry) {
+ this.contry = contry;
+ }
+
+ /**
+ * 省
+ * @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 getBuyerDetailAddress() {
+ return buyerDetailAddress;
+ }
+ /**
+ * 买家详细地址
+ * @param buyerDetailAddress
+ */
+ public void setBuyerDetailAddress(String buyerDetailAddress) {
+ this.buyerDetailAddress = buyerDetailAddress;
+ }
+
+ /**
+ * 卖家名称
+ * @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;
}
/**
@@ -1190,48 +854,93 @@ private static final long serialVersionUID = 1L;
}
/**
- * 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
+ * goudezhao
* @return
*/
- public String getStatus() {
- return status;
+ public String getAppName() {
+ return appName;
}
/**
- * 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
+ * goudezhao
+ * @param appName
*/
- public void setStatus(String status) {
- this.status = status;
+ public void setAppName(String appName) {
+ this.appName = appName;
}
/**
- * 包裹追踪号
+ * 渠道来源，如抖音，等
* @return
*/
- public String getTrackNumber() {
- return trackNumber;
+ public String getChannel() {
+ return channel;
}
/**
- * 包裹追踪号
- * @param trackNumber
+ * 渠道来源，如抖音，等
+ * @param channel
*/
- public void setTrackNumber(String trackNumber) {
- this.trackNumber = trackNumber;
+ public void setChannel(String channel) {
+ this.channel = channel;
}
/**
- * 订单号
+ * 推广者id
* @return
*/
- public Long getTradeOrderId() {
- return tradeOrderId;
+ public String getPromoterId() {
+ return promoterId;
}
/**
- * 订单号
- * @param tradeOrderId
+ * 推广者id
+ * @param promoterId
*/
- public void setTradeOrderId(Long tradeOrderId) {
- this.tradeOrderId = tradeOrderId;
+ 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;
}
/**
@@ -1250,92 +959,440 @@ private static final long serialVersionUID = 1L;
}
/**
- * unpack的用户
+ * 支付方式，weixin
* @return
*/
- public String getUnpackUser() {
- return unpackUser;
+ public String getPayType() {
+ return payType;
}
/**
- * unpack的用户
- * @param unpackUser
+ * 支付方式，weixin
+ * @param payType
*/
- public void setUnpackUser(String unpackUser) {
- this.unpackUser = unpackUser;
+ 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 getBuyerAddressId() {
+ return buyerAddressId;
+ }
+ /**
+ * 买家地址id
+ * @param buyerAddressId
+ */
+ public void setBuyerAddressId(Long buyerAddressId) {
+ this.buyerAddressId = buyerAddressId;
+ }
+
+ /**
+ * 下单时间
+ * @return
+ */
+ public Date getGmtDownOrder() {
+ return gmtDownOrder;
+ }
+ /**
+ * 下单时间
+ * @param gmtDownOrder
+ */
+ public void setGmtDownOrder(Date gmtDownOrder) {
+ this.gmtDownOrder = gmtDownOrder;
+ }
+
+ /**
+ * 预支付时间
+ * @return
+ */
+ public Date getGmtPrePay() {
+ return gmtPrePay;
+ }
+ /**
+ * 预支付时间
+ * @param gmtPrePay
+ */
+ public void setGmtPrePay(Date gmtPrePay) {
+ this.gmtPrePay = gmtPrePay;
+ }
+
+ /**
+ * 支付时间
+ * @return
+ */
+ public Date getGmtPay() {
+ return gmtPay;
+ }
+ /**
+ * 支付时间
+ * @param gmtPay
+ */
+ public void setGmtPay(Date gmtPay) {
+ this.gmtPay = gmtPay;
+ }
+
+ /**
+ * 订单取消时间
+ * @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;
+ }
+
+ /**
+ * 打包时间
+ * @return
+ */
+ public Date getGmtToShipping() {
+ return gmtToShipping;
+ }
+ /**
+ * 打包时间
+ * @param gmtToShipping
+ */
+ public void setGmtToShipping(Date gmtToShipping) {
+ this.gmtToShipping = gmtToShipping;
+ }
+
+ /**
+ * shipping的用户
+ * @return
+ */
+ public String getShippingUser() {
+ return shippingUser;
+ }
+ /**
+ * shipping的用户
+ * @param shippingUser
+ */
+ public void setShippingUser(String shippingUser) {
+ this.shippingUser = shippingUser;
+ }
+
+ /**
+ * 取消原因
+ * @return
+ */
+ public String getCancelReason() {
+ return cancelReason;
+ }
+ /**
+ * 取消原因
+ * @param cancelReason
+ */
+ public void setCancelReason(String cancelReason) {
+ this.cancelReason = cancelReason;
+ }
+
+ /**
+ * shipped的用户
+ * @return
+ */
+ public String getShippedUser() {
+ return shippedUser;
+ }
+ /**
+ * shipped的用户
+ * @param shippedUser
+ */
+ public void setShippedUser(String shippedUser) {
+ this.shippedUser = shippedUser;
+ }
+
+ /**
+ * 妥投时间
+ * @return
+ */
+ public Date getGmtDelivered() {
+ return gmtDelivered;
+ }
+ /**
+ * 妥投时间
+ * @param gmtDelivered
+ */
+ public void setGmtDelivered(Date gmtDelivered) {
+ this.gmtDelivered = gmtDelivered;
+ }
+
+ /**
+ * delivered的用户
+ * @return
+ */
+ public String getDeliveredUser() {
+ return deliveredUser;
+ }
+ /**
+ * delivered的用户
+ * @param deliveredUser
+ */
+ public void setDeliveredUser(String deliveredUser) {
+ this.deliveredUser = deliveredUser;
+ }
+
+ /**
+ * 订单关闭时间
+ * @return
+ */
+ public Date getGmtClose() {
+ return gmtClose;
+ }
+ /**
+ * 订单关闭时间
+ * @param gmtClose
+ */
+ public void setGmtClose(Date gmtClose) {
+ this.gmtClose = gmtClose;
+ }
+
+ /**
+ * 关闭订单的用户
+ * @return
+ */
+ public String getCloseUser() {
+ return closeUser;
+ }
+ /**
+ * 关闭订单的用户
+ * @param closeUser
+ */
+ public void setCloseUser(String closeUser) {
+ this.closeUser = closeUser;
+ }
+
+ /**
+ * 重新打包的时间
+ * @return
+ */
+ public Date getGmtUnShipping() {
+ return gmtUnShipping;
+ }
+ /**
+ * 重新打包的时间
+ * @param gmtUnShipping
+ */
+ public void setGmtUnShipping(Date gmtUnShipping) {
+ this.gmtUnShipping = gmtUnShipping;
+ }
+
+ /**
+ * 不打包用户
+ * @return
+ */
+ public String getUnShippingUser() {
+ return unShippingUser;
+ }
+ /**
+ * 不打包用户
+ * @param unShippingUser
+ */
+ public void setUnShippingUser(String unShippingUser) {
+ this.unShippingUser = unShippingUser;
+ }
+
+ /**
+ * 是否已经签收
+ * @return
+ */
+ public Date getGmtShipped() {
+ return gmtShipped;
+ }
+ /**
+ * 是否已经签收
+ * @param gmtShipped
+ */
+ public void setGmtShipped(Date gmtShipped) {
+ this.gmtShipped = gmtShipped;
+ }
+
+ /**
+ * 发货回退原因
+ * @return
+ */
+ public String getUnShippingReason() {
+ return unShippingReason;
+ }
+ /**
+ * 发货回退原因
+ * @param unShippingReason
+ */
+ public void setUnShippingReason(String unShippingReason) {
+ this.unShippingReason = unShippingReason;
+ }
+
+ /**
+ * 拒绝签收时间
+ * @return
+ */
+ public Date getGmtRejectSignReceipt() {
+ return gmtRejectSignReceipt;
+ }
+ /**
+ * 拒绝签收时间
+ * @param gmtRejectSignReceipt
+ */
+ public void setGmtRejectSignReceipt(Date gmtRejectSignReceipt) {
+ this.gmtRejectSignReceipt = gmtRejectSignReceipt;
+ }
+
+ /**
+ * 拒绝签收原因
+ * @return
+ */
+ public String getRejectSignReceiptReason() {
+ return rejectSignReceiptReason;
+ }
+ /**
+ * 拒绝签收原因
+ * @param rejectSignReceiptReason
+ */
+ public void setRejectSignReceiptReason(String rejectSignReceiptReason) {
+ this.rejectSignReceiptReason = rejectSignReceiptReason;
+ }
+
+ /**
+ * 拒绝签收的信息
+ * @return
+ */
+ public String getRejectSignReceiptFeatures() {
+ return rejectSignReceiptFeatures;
+ }
+ /**
+ * 拒绝签收的信息
+ * @param rejectSignReceiptFeatures
+ */
+ public void setRejectSignReceiptFeatures(String rejectSignReceiptFeatures) {
+ this.rejectSignReceiptFeatures = rejectSignReceiptFeatures;
+ }
+
+ /**
+ * 关闭原因
+ * @return
+ */
+ public String getCloseReason() {
+ return closeReason;
+ }
+ /**
+ * 关闭原因
+ * @param closeReason
+ */
+ public void setCloseReason(String closeReason) {
+ this.closeReason = closeReason;
}
@Override
public String toString() {
return "VvTradeOrderLineEntity{" +
- ",activityAwardCount=" + activityAwardCount +
- ",activityId=" + activityId +
- ",appName=" + appName +
- ",awardAmount=" + awardAmount +
- ",batchNum=" + batchNum +
- ",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 +
- ",gmtPrePay=" + gmtPrePay +
- ",gmtRejectSignReceipt=" + gmtRejectSignReceipt +
- ",gmtSettle=" + gmtSettle +
- ",gmtShipped=" + gmtShipped +
- ",gmtSignReceipt=" + gmtSignReceipt +
- ",gmtToShipping=" + gmtToShipping +
- ",gmtUnpack=" + gmtUnpack +
",id=" + id +
",isDelete=" + isDelete +
+ ",createTime=" + createTime +
",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 +
- ",shippingAmount=" + shippingAmount +
- ",shippingUser=" + shippingUser +
+ ",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 +
+ ",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 +
+ ",contry=" + contry +
+ ",province=" + province +
+ ",city=" + city +
+ ",district=" + district +
+ ",buyerDetailAddress=" + buyerDetailAddress +
+ ",sellerName=" + sellerName +
+ ",batchNum=" + batchNum +
+ ",shippingAmount=" + shippingAmount +
+ ",promotionPrice=" + promotionPrice +
",state=" + state +
- ",status=" + status +
- ",trackNumber=" + trackNumber +
- ",tradeOrderId=" + tradeOrderId +
+ ",appName=" + appName +
+ ",channel=" + channel +
+ ",promoterId=" + promoterId +
+ ",awardAmount=" + awardAmount +
+ ",activityId=" + activityId +
+ ",activityAwardCount=" + activityAwardCount +
",transactionId=" + transactionId +
- ",unpackUser=" + unpackUser +
+ ",payType=" + payType +
+ ",prepayId=" + prepayId +
+ ",buyerAddressId=" + buyerAddressId +
+ ",gmtDownOrder=" + gmtDownOrder +
+ ",gmtPrePay=" + gmtPrePay +
+ ",gmtPay=" + gmtPay +
+ ",gmtCancel=" + gmtCancel +
+ ",cancelUser=" + cancelUser +
+ ",gmtToShipping=" + gmtToShipping +
+ ",shippingUser=" + shippingUser +
+ ",cancelReason=" + cancelReason +
+ ",shippedUser=" + shippedUser +
+ ",gmtDelivered=" + gmtDelivered +
+ ",deliveredUser=" + deliveredUser +
+ ",gmtClose=" + gmtClose +
+ ",closeUser=" + closeUser +
+ ",gmtUnShipping=" + gmtUnShipping +
+ ",unShippingUser=" + unShippingUser +
+ ",gmtShipped=" + gmtShipped +
+ ",unShippingReason=" + unShippingReason +
+ ",gmtRejectSignReceipt=" + gmtRejectSignReceipt +
+ ",rejectSignReceiptReason=" + rejectSignReceiptReason +
+ ",rejectSignReceiptFeatures=" + rejectSignReceiptFeatures +
+ ",closeReason=" + closeReason +
"}";
}
}
\ No newline at end of file
diff --git a/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java
new file mode 100644
index 0000000..421af52
--- /dev/null
+++ b/api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvTradeOrderLineStatusLogEntity.java
@@ -0,0 +1,239 @@
+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;
+/**
+*订单表状态变更记录
+* @author quyixiao
+* @since 2025-11-16
+*/
+
+@Data
+@TableName("vv_trade_order_line_status_log")
+public class VvTradeOrderLineStatusLogEntity implements java.io.Serializable {
+private static final long serialVersionUID = 1L;
+
+ public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity:";
+
+ 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 trade_order_line_id = CLASS_NAME + "trade_order_line_id"; // 子订单号
+ public final static String status_ = CLASS_NAME + "status"; // 状态
+ public final static String current_time = CLASS_NAME + "current_time"; // 当前时间
+ public final static String reason_ = CLASS_NAME + "reason"; // 原因
+ public final static String features_ = CLASS_NAME + "features"; // 附加信息
+ public final static String change_status_user = CLASS_NAME + "change_status_user"; // 改变这个状态的用户
+ public final static String trace_id = CLASS_NAME + "trace_id"; // 日志编号
+ //
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+ //是否删除：0 否 1 删除
+ private Integer isDelete;
+ //创建时间
+ private Date createTime;
+ //修改时间
+ private Date modifyTime;
+ //子订单号
+ private Long tradeOrderLineId;
+ //状态
+ private String status;
+ //当前时间
+ private Date currentTime;
+ //原因
+ private String reason;
+ //附加信息
+ private String features;
+ //改变这个状态的用户
+ private String changeStatusUser;
+ //日志编号
+ private String traceId;
+ /**
+ *
+ * @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 getCreateTime() {
+ return createTime;
+ }
+ /**
+ * 创建时间
+ * @param createTime
+ */
+ public void setCreateTime(Date createTime) {
+ this.createTime = createTime;
+ }
+
+ /**
+ * 修改时间
+ * @return
+ */
+ public Date getModifyTime() {
+ return modifyTime;
+ }
+ /**
+ * 修改时间
+ * @param modifyTime
+ */
+ public void setModifyTime(Date modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ /**
+ * 子订单号
+ * @return
+ */
+ public Long getTradeOrderLineId() {
+ return tradeOrderLineId;
+ }
+ /**
+ * 子订单号
+ * @param tradeOrderLineId
+ */
+ public void setTradeOrderLineId(Long tradeOrderLineId) {
+ this.tradeOrderLineId = tradeOrderLineId;
+ }
+
+ /**
+ * 状态
+ * @return
+ */
+ public String getStatus() {
+ return status;
+ }
+ /**
+ * 状态
+ * @param status
+ */
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ /**
+ * 当前时间
+ * @return
+ */
+ public Date getCurrentTime() {
+ return currentTime;
+ }
+ /**
+ * 当前时间
+ * @param currentTime
+ */
+ public void setCurrentTime(Date currentTime) {
+ this.currentTime = currentTime;
+ }
+
+ /**
+ * 原因
+ * @return
+ */
+ public String getReason() {
+ return reason;
+ }
+ /**
+ * 原因
+ * @param reason
+ */
+ public void setReason(String reason) {
+ this.reason = reason;
+ }
+
+ /**
+ * 附加信息
+ * @return
+ */
+ public String getFeatures() {
+ return features;
+ }
+ /**
+ * 附加信息
+ * @param features
+ */
+ public void setFeatures(String features) {
+ this.features = features;
+ }
+
+ /**
+ * 改变这个状态的用户
+ * @return
+ */
+ public String getChangeStatusUser() {
+ return changeStatusUser;
+ }
+ /**
+ * 改变这个状态的用户
+ * @param changeStatusUser
+ */
+ public void setChangeStatusUser(String changeStatusUser) {
+ this.changeStatusUser = changeStatusUser;
+ }
+
+ /**
+ * 日志编号
+ * @return
+ */
+ public String getTraceId() {
+ return traceId;
+ }
+ /**
+ * 日志编号
+ * @param traceId
+ */
+ public void setTraceId(String traceId) {
+ this.traceId = traceId;
+ }
+
+ @Override
+ public String toString() {
+ return "VvTradeOrderLineStatusLogEntity{" +
+ ",id=" + id +
+ ",isDelete=" + isDelete +
+ ",createTime=" + createTime +
+ ",modifyTime=" + modifyTime +
+ ",tradeOrderLineId=" + tradeOrderLineId +
+ ",status=" + status +
+ ",currentTime=" + currentTime +
+ ",reason=" + reason +
+ ",features=" + features +
+ ",changeStatusUser=" + changeStatusUser +
+ ",traceId=" + traceId +
+ "}";
+ }
+}
\ No newline at end of file
diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java
index 790b570..019c90e 100644
--- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java
+++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvPackageServiceImpl.java
@@ -19,10 +19,7 @@ import com.heyu.api.data.dto.vv.KuaiDi100DTO;
import com.heyu.api.data.entity.vv.VvPackageEntity;
import com.heyu.api.data.entity.vv.VvReverseOrderEntity;
import com.heyu.api.data.entity.vv.VvTradeOrderLineEntity;
-import com.heyu.api.data.enums.DelayTypeEnums;
-import com.heyu.api.data.enums.KuaiDi100StateEnums;
-import com.heyu.api.data.enums.ReverseStatusEnums;
-import com.heyu.api.data.enums.ShippingTypeEnums;
+import com.heyu.api.data.enums.*;
import com.heyu.api.data.kuaidi100.KuaiDi100Utils;
import com.heyu.api.data.kuaidi100.LogisticsMapUtils;
import com.heyu.api.data.service.vv.VvPackageService;
@@ -160,9 +157,20 @@ public class VvPackageServiceImpl extends ServiceImpl tradeOrderLineEntities = tradeOrderLineDao.selectVvTradeOrderLineByTrackNumber(trackNumber);
for (VvTradeOrderLineEntity tradeOrderLineEntity : tradeOrderLineEntities) {
- tradeOrderLineEntity.setGmtSignReceipt(time);
+ tradeOrderLineEntity.setShippedUser(RoleEnums.system.getRole());
+ tradeOrderLineEntity.setGmtShipped(new Date());
+ tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
tradeOrderLineEntity.setState(kuaiDi100DTO.getState());
tradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+
+
+
+
+
+
+
+
}
}else{
VvReverseOrderEntity vvReverseOrderEntity = vvReverseOrderDao.selectVvReverseOrderByTrackNumber(trackNumber);
diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderLineStatusLogServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderLineStatusLogServiceImpl.java
new file mode 100644
index 0000000..e30a531
--- /dev/null
+++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderLineStatusLogServiceImpl.java
@@ -0,0 +1,68 @@
+package com.heyu.api.data.service.impl.vv;
+/**
+*
+* 订单表状态变更记录 服务类
+*
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao;
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+import com.heyu.api.data.service.vv.VvTradeOrderLineStatusLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+@Service
+public class VvTradeOrderLineStatusLogServiceImpl extends ServiceImpl implements VvTradeOrderLineStatusLogService {
+
+
+ @Autowired
+ private VvTradeOrderLineStatusLogDao vvTradeOrderLineStatusLogDao;
+
+
+
+ @Override
+ public VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(Long id){
+ return vvTradeOrderLineStatusLogDao.selectVvTradeOrderLineStatusLogById(id);
+ }
+
+
+
+ @Override
+ public Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+ return vvTradeOrderLineStatusLogDao.insertVvTradeOrderLineStatusLog(vvTradeOrderLineStatusLog);
+ }
+
+
+
+ @Override
+ public Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+ return vvTradeOrderLineStatusLogDao.insertOrUpdateVvTradeOrderLineStatusLog(vvTradeOrderLineStatusLog);
+ }
+
+
+
+ @Override
+ public int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+ return vvTradeOrderLineStatusLogDao.updateVvTradeOrderLineStatusLogById(vvTradeOrderLineStatusLog);
+ }
+
+
+
+ @Override
+ public int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog){
+ return vvTradeOrderLineStatusLogDao.updateCoverVvTradeOrderLineStatusLogById(vvTradeOrderLineStatusLog);
+ }
+
+
+
+ @Override
+ public int deleteVvTradeOrderLineStatusLogById(Long id){
+ return vvTradeOrderLineStatusLogDao.deleteVvTradeOrderLineStatusLogById(id);
+ }
+
+
+
+}
diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderLineStatusLogService.java b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderLineStatusLogService.java
new file mode 100644
index 0000000..08ac249
--- /dev/null
+++ b/api-mapper/src/main/java/com/heyu/api/data/service/vv/VvTradeOrderLineStatusLogService.java
@@ -0,0 +1,34 @@
+package com.heyu.api.data.service.vv;
+/**
+*
+* 订单表状态变更记录 服务类
+*
+*
+* @author quyixiao
+* @since 2025-11-16
+*/
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
+public interface VvTradeOrderLineStatusLogService extends IService {
+
+
+
+ VvTradeOrderLineStatusLogEntity selectVvTradeOrderLineStatusLogById(Long id);
+
+
+ Long insertVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ Long insertOrUpdateVvTradeOrderLineStatusLog(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int updateVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int updateCoverVvTradeOrderLineStatusLogById(VvTradeOrderLineStatusLogEntity vvTradeOrderLineStatusLog);
+
+
+ int deleteVvTradeOrderLineStatusLogById(Long id);
+
+
+}
\ No newline at end of file
diff --git a/api-mapper/src/main/resources/mapper/vv/VvTradeOrderLineStatusLogDao.xml b/api-mapper/src/main/resources/mapper/vv/VvTradeOrderLineStatusLogDao.xml
new file mode 100644
index 0000000..0ca8a13
--- /dev/null
+++ b/api-mapper/src/main/resources/mapper/vv/VvTradeOrderLineStatusLogDao.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
diff --git a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java
index 489e805..f916f31 100644
--- a/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java
+++ b/api-mapper/src/test/java/com/test/xxx/MysqlMain_insert.java
@@ -94,7 +94,7 @@ public class MysqlMain_insert {
List list = new ArrayList();
- list.add(new TablesBean("vv_my_account"));
+ list.add(new TablesBean("vv_trade_order_line_status_log"));
List list2 = new ArrayList();
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 5b8d8f1..1a845f9 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_trade_order_line"));
+ list.add(new TablesBean("vv_trade_order_line_status_log"));
//list.add(new TablesBean("vv_trade_order"));
diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnPackDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnShippingDTO.java
similarity index 64%
rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnPackDTO.java
rename to api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnShippingDTO.java
index 93eb4c1..e67fed7 100644
--- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnPackDTO.java
+++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/VvUnShippingDTO.java
@@ -6,12 +6,18 @@ import lombok.Data;
import java.util.List;
@Data
-public class VvUnPackDTO extends AdminBaseDTO{
+public class VvUnShippingDTO extends AdminBaseDTO{
/***
* 子订单号 ，是否必填写 ： 是
*/
private List tradeOrderLineIds;
+
+ /***
+ * 原因
+ */
+ private String reason;
+
}
diff --git a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToPackDTO.java b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java
similarity index 93%
rename from api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToPackDTO.java
rename to api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java
index 9ff39ac..6599bea 100644
--- a/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToPackDTO.java
+++ b/api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VvToShippingDTO.java
@@ -10,7 +10,7 @@ import java.util.ArrayList;
import java.util.List;
@Data
-public class VvToPackDTO extends AdminBaseDTO {
+public class VvToShippingDTO extends AdminBaseDTO {
/***
* 子订单号 ，是否必填写 ： 是
@@ -35,7 +35,7 @@ public class VvToPackDTO extends AdminBaseDTO {
public static void main(String[] args) {
- VvToPackDTO vvToPackDTO = new VvToPackDTO();
+ VvToShippingDTO vvToPackDTO = new VvToShippingDTO();
List tradeOrderLineIds = new ArrayList<>();
tradeOrderLineIds.add(202511172478L);
diff --git a/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java b/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java
index 49a2a5c..b034a9d 100644
--- a/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java
+++ b/api-third/src/main/java/com/heyu/api/service/VvTradeOrderConvertService.java
@@ -8,6 +8,18 @@ import java.util.List;
public interface VvTradeOrderConvertService {
List convertTradeOrderLineResp(List vvTradeOrderEntities,
- List list,boolean isApp) ;
+ List list, boolean isApp);
+
+
+ public int addOrderLineStatusLogList(List tradeOrderLineId, String status, String changeStatusUser, String... reason);
+
+
+ int addOrderLineStatusLog(Long tradeOrderLineId,
+ String status,
+ String changeStatusUser,
+ String... reason
+
+ );
+
}
diff --git a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java
index 1588f62..d439927 100644
--- a/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java
+++ b/api-third/src/main/java/com/heyu/api/service/impl/VvTradeOrderConvertServiceImpl.java
@@ -4,10 +4,13 @@ import com.heyu.api.alibaba.request.mm.order.resp.AdminPackageDTO;
import com.heyu.api.alibaba.request.mm.order.resp.OrderActionDTO;
import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
import com.heyu.api.alibaba.request.mm.order.resp.VvTradeOrderLineDO;
+import com.heyu.api.common.LogAspect;
import com.heyu.api.data.dao.vv.VvPackageDao;
+import com.heyu.api.data.dao.vv.VvTradeOrderLineStatusLogDao;
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 com.heyu.api.data.entity.vv.VvTradeOrderLineStatusLogEntity;
import com.heyu.api.data.utils.SanUtils;
import com.heyu.api.service.VvTradeOrderConvertService;
import org.springframework.beans.BeanUtils;
@@ -25,6 +28,12 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
private VvPackageDao vvPackageDao;
+
+ @Autowired
+ private VvTradeOrderLineStatusLogDao vvTradeOrderLineStatusLogDao;
+
+
+
@Override
public List convertTradeOrderLineResp(List vvTradeOrderEntities,
List list,boolean isApp) {
@@ -76,4 +85,29 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic
return vvOrderListResps;
}
+ @Override
+ public int addOrderLineStatusLogList(List tradeOrderLineIdList, String status, String changeStatusUser, String... reason) {
+ for (Long tradeOrderLineId : tradeOrderLineIdList) {
+ addOrderLineStatusLog(tradeOrderLineId, status, changeStatusUser, reason);
+ }
+
+ return tradeOrderLineIdList.size();
+ }
+
+
+ @Override
+ public int addOrderLineStatusLog(Long tradeOrderLineId, String status, String changeStatusUser, String... reason) {
+ VvTradeOrderLineStatusLogEntity entity = new VvTradeOrderLineStatusLogEntity();
+ entity.setTradeOrderLineId(tradeOrderLineId);
+ entity.setStatus(status);
+ entity.setChangeStatusUser(changeStatusUser);
+ if (reason != null && reason.length > 0) {
+ entity.setReason(reason[0]);
+ }
+ entity.setTraceId(LogAspect.threadLocalNo.get());
+ return 1;
+ }
+
+
+
}
diff --git a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
index b86863e..5e40a13 100644
--- a/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
+++ b/api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminOrderController.java
@@ -3,7 +3,7 @@ package com.heyu.api.controller.mm;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.heyu.api.alibaba.request.mm.VvUnPackDTO;
+import com.heyu.api.alibaba.request.mm.VvUnShippingDTO;
import com.heyu.api.alibaba.request.mm.order.*;
import com.heyu.api.alibaba.request.mm.order.resp.VVOrderDetailResp;
import com.heyu.api.alibaba.request.mm.order.resp.VVOrderListResp;
@@ -42,15 +42,12 @@ import java.util.Map;
@RequestMapping("/mm/order")
public class AdminOrderController {
-
@Autowired
private VvTradeOrderDao vvTradeOrderDao;
-
@Autowired
private VvTradeOrderLineDao vvTradeOrderLineDao;
-
@Autowired
private VvPackageDao vvPackageDao;
@@ -63,14 +60,9 @@ public class AdminOrderController {
@Autowired
private VvTradeOrderLineSettlementProveDao vvTradeOrderLineSettlementProveDao;
-
@Autowired
private VvTradeOrderConvertService vvTradeOrderConvertService;
-
- @Autowired
- private VvBuyerAddressDao vvBuyerAddressDao;
-
@Autowired
private VvBuyerDao vvBuyerDao;
@@ -168,7 +160,6 @@ public class AdminOrderController {
return R.ok().setData(pageUtils);
}
-
/***
* 订单详情
*
@@ -201,7 +192,7 @@ public class AdminOrderController {
* http://localhost:8888/mm/order/toShipping
*/
@RequestMapping("/toShipping")
- public R toPackAndShipping(@RequestBody VvToPackDTO vvOrderRequest) {
+ public R toPackAndShipping(@RequestBody VvToShippingDTO vvOrderRequest) {
List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIds());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
if (!OrderStatusEnums.wait_shipping.getStatus().equals(tradeOrderLineEntity.getStatus())) {
@@ -209,28 +200,35 @@ public class AdminOrderController {
}
}
VvTradeOrderEntity vvTradeOrderEntity = vvTradeOrderDao.selectVvTradeOrderById(vvTradeOrderLineEntityList.get(0).getTradeOrderId());
-
VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvOrderRequest.getTrackNumber());
if(vvPackageEntity == null ){
vvPackageEntity = new VvPackageEntity();
}
-
if (CollectionUtils.isNotEmpty(vvOrderRequest.getPackageImageUrls())) {
vvPackageEntity.setPackageImageUrl(JSON.toJSONString(vvOrderRequest.getPackageImageUrls()));
}
-
vvPackageEntity.setLogisticsCompany(vvOrderRequest.getLogisticsCompany());
vvPackageEntity.setShippingAmount(vvOrderRequest.getShippingAmount());
vvPackageEntity.setShippingFrom(vvOrderRequest.getShippingFrom());
- vvPackageEntity.setShippingTo(vvTradeOrderEntity.getContry() + vvTradeOrderEntity.getCity() + vvTradeOrderEntity.getDistrict() + vvTradeOrderEntity.getBuyerDetailAddress());
+
+ vvPackageEntity.setShippingTo(vvTradeOrderEntity.getContry()
+ + vvTradeOrderEntity.getCity()
+ + vvTradeOrderEntity.getDistrict()
+ + vvTradeOrderEntity.getBuyerDetailAddress());
+
vvPackageEntity.setTrackNumber(vvOrderRequest.getTrackNumber());
vvPackageEntity.setShippingType(ShippingTypeEnums.order.getType());
vvPackageDao.insertOrUpdateVvPackage(vvPackageEntity);
+
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setTrackNumber(vvOrderRequest.getTrackNumber());
tradeOrderLineEntity.setStatus(OrderStatusEnums.shipping.getStatus()); // 已经发货
tradeOrderLineEntity.setGmtToShipping(new Date());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+ vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+ OrderStatusEnums.shipping.getStatus(),
+ vvOrderRequest.getUserName());
}
return R.ok();
}
@@ -240,14 +238,22 @@ public class AdminOrderController {
* http://localhost:8888/mm/order/unShipping
*/
@RequestMapping("/unShipping")
- public R unpack(@RequestBody VvUnPackDTO vvOrderRequest) {
+ public R unpack(@RequestBody VvUnShippingDTO vvOrderRequest) {
List vvTradeOrderLineEntityList = vvTradeOrderLineDao.selectVvTradeOrderLineByIds(vvOrderRequest.getTradeOrderLineIds());
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.wait_shipping.getStatus());
tradeOrderLineEntity.setTrackNumber(null);
- tradeOrderLineEntity.setGmtUnpack(new Date());
- tradeOrderLineEntity.setUnpackUser(vvOrderRequest.getUserName());
+ tradeOrderLineEntity.setGmtUnShipping(new Date());
+ tradeOrderLineEntity.setUnShippingUser(vvOrderRequest.getUserName());
+ tradeOrderLineEntity.setUnShippingReason(vvOrderRequest.getReason());
vvTradeOrderLineDao.updateCoverVvTradeOrderLineById(tradeOrderLineEntity);
+
+ vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+ OrderStatusEnums.wait_shipping.getStatus(),
+ vvOrderRequest.getUserName(),
+ vvOrderRequest.getReason()
+ );
+
}
return R.ok();
}
@@ -267,9 +273,15 @@ public class AdminOrderController {
for (VvTradeOrderLineEntity tradeOrderLineEntity : vvTradeOrderLineEntityList) {
tradeOrderLineEntity.setStatus(OrderStatusEnums.shipped.getStatus());
tradeOrderLineEntity.setGmtShipped(new Date());
- tradeOrderLineEntity.setUnpackUser(vvDeliveredDTO.getUserName());
+ tradeOrderLineEntity.setShippedUser(vvDeliveredDTO.getUserName());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+ vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+ OrderStatusEnums.shipped.getStatus(),
+ vvDeliveredDTO.getUserName()
+ );
}
+
VvPackageEntity vvPackageEntity = vvPackageDao.selectVvPackageByTrackNumber(vvDeliveredDTO.getTrackNumber());
Date time = new Date();
Date timeAfter15 = DateUtils.addDays(time, 15);
@@ -314,6 +326,11 @@ public class AdminOrderController {
tradeOrderLineEntity.setGmtDelivered(new Date());
tradeOrderLineEntity.setDeliveredUser(vvDeliveredDTO.getUserName());
vvTradeOrderLineDao.updateVvTradeOrderLineById(tradeOrderLineEntity);
+
+ vvTradeOrderConvertService.addOrderLineStatusLog(tradeOrderLineEntity.getId(),
+ OrderStatusEnums.delivered.getStatus(),
+ vvDeliveredDTO.getUserName()
+ );
}
return R.ok();
}
@@ -331,22 +348,16 @@ public class AdminOrderController {
return R.error("订单状态不是wait_shipping，不能取消订单");
}
}
-
- for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
- vvTradeOrderLineEntity.setGmtCancel(new Date());
- vvTradeOrderLineEntity.setCancelUser(vvCancelDTO.getUserName());
- vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
- }
-
AppliyReverseRequest appliyReverseRequest = new AppliyReverseRequest();
appliyReverseRequest.setRefundType(RefundTypeEnums.only_refund.getCode());
appliyReverseRequest.setRefundReason("订单取消:" + vvCancelDTO.getCancelReason());
appliyReverseRequest.setStatus(ReverseStatusEnums.cancel.getStatus());
R r = reverseOrderService.createReverseOrder(vvTradeOrderLineEntityList, appliyReverseRequest);
+
if (r.ifSuccessful()) {
- VvReverseOrderEntity reverseOrderEntity = (VvReverseOrderEntity)r.getData();
+ VvReverseOrderEntity reverseOrderEntity = (VvReverseOrderEntity) r.getData();
Refund refund = jsapiPrepay.refund(reverseOrderEntity.getTradeOrderId(), reverseOrderEntity.getId());
- log.info("ReverseOrderServiceImpl reverseOrderEntity id:{} refund:{}",reverseOrderEntity.getId(), JSON.toJSONString(refund));
+ log.info("ReverseOrderServiceImpl reverseOrderEntity id:{} refund:{}", reverseOrderEntity.getId(), JSON.toJSONString(refund));
reverseOrderEntity.setWeixinFundsAccount(JSON.toJSONString(refund.getFundsAccount()));
reverseOrderEntity.setWeixinStatus(JSON.toJSONString(refund.getStatus()));
reverseOrderEntity.setWeixinRefundId(refund.getRefundId());
@@ -355,7 +366,21 @@ public class AdminOrderController {
reverseOrderEntity.setUserEceivedAccount(refund.getUserReceivedAccount());
reverseOrderEntity.setPreRefundInfo(JSON.toJSONString(refund));
reverseOrderEntity.setGmtPreRefund(new Date());
- reverseOrderEntity.setGmtCancel(new Date());
+
+ for (VvTradeOrderLineEntity vvTradeOrderLineEntity : vvTradeOrderLineEntityList) {
+ vvTradeOrderLineEntity.setGmtCancel(new Date());
+ vvTradeOrderLineEntity.setCancelUser(vvCancelDTO.getUserName());
+ vvTradeOrderLineEntity.setCancelReason(vvCancelDTO.getCancelReason());
+ vvTradeOrderLineDao.updateVvTradeOrderLineById(vvTradeOrderLineEntity);
+
+ vvTradeOrderConvertService.addOrderLineStatusLog(
+ vvTradeOrderLineEntity.getId(),
+ OrderStatusEnums.cancel.getStatus(),
+ vvCancelDTO.getUserName(),
+ vvCancelDTO.getCancelReason()
+ );
+ }
+
vvReverseOrderDao.updateVvReverseOrderById(reverseOrderEntity);
}
return r;
@@ -388,7 +413,6 @@ public class AdminOrderController {
vvTradeOrderLineSettlementProveEntity.setSettlementProveId(vvSettlementProveEntity.getId());
vvTradeOrderLineSettlementProveDao.insertOrUpdateVvTradeOrderLineSettlementProve(vvTradeOrderLineSettlementProveEntity);
}
-
return R.ok();
}