diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java index 53352148e..c72c318e6 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrder.java @@ -272,5 +272,13 @@ public class IoCollectOrder implements Serializable { @TableField(value = "uploadError") private String uploadError; + + @TableField(value = "shipper") + @ApiModelProperty(value = "发货方编码") + private String shipper; + @TableField(value = "shipperName") + @ApiModelProperty(value = "发货方名称") + private String shipperName; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java index 03af44ed0..33084f0df 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderBackup.java @@ -234,16 +234,23 @@ public class IoCollectOrderBackup implements Serializable { private String errorMsg; /** - *上传状态(1.未上传,2.已上传,3.上传失败) + * 上传状态(1.未上传,2.已上传,3.上传失败) */ @TableField(value = "uploadStatus") private Integer uploadStatus; /** - *上传错误信息 + * 上传错误信息 */ @TableField(value = "uploadError") private String uploadError; + + @TableField(value = "shipper") + @ApiModelProperty(value = "发货方编码") + private String shipper; + @TableField(value = "shipperName") + @ApiModelProperty(value = "发货方名称") + private String shipperName; private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java index 9466a089f..bdd48c11d 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectOrderOrigin.java @@ -323,8 +323,10 @@ public class IoCollectOrderOrigin implements Serializable { private String errorMsg; @TableField(value = "shipper") - @ApiModelProperty(value="发货方") + @ApiModelProperty(value="发货方编码") private String shipper; - + @TableField(value = "shipperName") + @ApiModelProperty(value="发货方名称") + private String shipperName; } diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 2a2636178..890a5d68a 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -156,12 +156,12 @@ public class IoCollectOrderResponse { private Integer invAlert; /** - *上传状态(1.未上传,2.已上传,3.上传失败) + * 上传状态(1.未上传,2.已上传,3.上传失败) */ private Integer uploadStatus; /** - *上传错误信息 + * 上传错误信息 */ private String uploadError; @@ -174,10 +174,8 @@ public class IoCollectOrderResponse { * 第三方单据类型 */ private String actionName; - /** - * 发货方 - */ private String shipper; + private String shipperName; public String getFromName() { diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 9612c1ad2..493c5bd3a 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4387,3 +4387,22 @@ CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'tempSplitCount', CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'shipper', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', 1); +CALL Pro_Temp_ColumnWork('io_collect_order_origin', 'shipperName', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_order', 'shipper', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', + 1); +CALL Pro_Temp_ColumnWork('io_collect_order', 'shipperName', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', + 1); + + +CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'shipper', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', + 1); +CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'shipperName', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''发货方''', + 1); +