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 index f8b421e..71dad50 100644 --- 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 @@ -10,7 +10,7 @@ import java.util.Date;import java.util.Date; /** *订单表状态变更记录 * @author quyixiao -* @since 2025-11-21 +* @since 2025-11-22 */ @Data @@ -21,18 +21,19 @@ 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 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"; // 日志编号 - public final static String status_desc = CLASS_NAME + "status_desc"; // 状态描述 - public final static String type_ = CLASS_NAME + "type"; // 正向状态变更还是逆向状态变更 + 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 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 change_status_user_id = CLASS_NAME + "change_status_user_id"; // 改变这个状态的用户id + public final static String trace_id = CLASS_NAME + "trace_id"; // 日志编号 + public final static String status_desc = CLASS_NAME + "status_desc"; // 状态描述 + public final static String type_ = CLASS_NAME + "type"; // 正向状态变更还是逆向状态变更 // @TableId(value = "id", type = IdType.AUTO) private Long id; @@ -52,6 +53,8 @@ private static final long serialVersionUID = 1L; private String features; //改变这个状态的用户 private String changeStatusUser; + //改变这个状态的用户id + private Long changeStatusUserId; //日志编号 private String traceId; //状态描述 @@ -193,6 +196,21 @@ private static final long serialVersionUID = 1L; this.changeStatusUser = changeStatusUser; } + /** + * 改变这个状态的用户id + * @return + */ + public Long getChangeStatusUserId() { + return changeStatusUserId; + } + /** + * 改变这个状态的用户id + * @param changeStatusUserId + */ + public void setChangeStatusUserId(Long changeStatusUserId) { + this.changeStatusUserId = changeStatusUserId; + } + /** * 日志编号 * @return @@ -250,6 +268,7 @@ private static final long serialVersionUID = 1L; ",reason=" + reason + ",features=" + features + ",changeStatusUser=" + changeStatusUser + + ",changeStatusUserId=" + changeStatusUserId + ",traceId=" + traceId + ",statusDesc=" + statusDesc + ",type=" + type + diff --git a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java index f2e9336..1a0f81d 100644 --- a/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java +++ b/api-mapper/src/main/java/com/heyu/api/data/service/impl/vv/VvTradeOrderConvertServiceImpl.java @@ -108,6 +108,7 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic entity.setType("逆向"); } entity.setChangeStatusUser(changeStatusUser); + entity.setChangeStatusUserId(changeStatusUserId); if (reason != null && reason.length > 0) { entity.setReason(reason[0]); if (reason.length > 1) { @@ -119,6 +120,9 @@ public class VvTradeOrderConvertServiceImpl implements VvTradeOrderConvertServic return 1; } + + + @Override public List buildAppPackageDTO(List vvOrderListResps) { List appPackageDTOList = new ArrayList<>();