|
@@ -16,10 +16,7 @@ import lombok.EqualsAndHashCode;
|
|
import lombok.ToString;
|
|
import lombok.ToString;
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
-import java.util.Date;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* 订单 DO
|
|
* 订单 DO
|
|
@@ -210,35 +207,35 @@ public class OrderSendDO extends BaseDO {
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "快递鸟下单失败 0")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "快递鸟下单失败 0")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> createOrderFail = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> createOrderFail = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "待接单状态 1")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "待接单状态 1")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> createOrderSuccess = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> createOrderSuccess = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员接单状态 2")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员接单状态 2")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> userTakeOrder = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> userTakeOrder = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员到达状态 3")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员到达状态 3")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> userArrives = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> userArrives = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员配送中 4")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "业务员配送中 4")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> userSending = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> userSending = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "订单费用 5")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "订单费用 5")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> orderFee = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> orderFee = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "签收 6")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "签收 6")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> signIn = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> signIn = new HashMap<>();
|
|
|
|
|
|
@ApiModelProperty(name = "kdn_order_code", value = "取消状态 0")
|
|
@ApiModelProperty(name = "kdn_order_code", value = "取消状态 0")
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
@TableField(typeHandler = FastjsonTypeHandler.class)
|
|
- private Map<String,Object> cancelOrderKdn = new HashMap<>();
|
|
|
|
|
|
+ private Map<String, Object> cancelOrderKdn = new HashMap<>();
|
|
|
|
|
|
@TableField(exist = false)
|
|
@TableField(exist = false)
|
|
private OrderDO orderVo;
|
|
private OrderDO orderVo;
|
|
@@ -249,6 +246,19 @@ public class OrderSendDO extends BaseDO {
|
|
@TableField(exist = false)
|
|
@TableField(exist = false)
|
|
private WarehouseDO warehouseVO;
|
|
private WarehouseDO warehouseVO;
|
|
|
|
|
|
- private Integer selfPickupNum;
|
|
|
|
|
|
+ @ApiModelProperty(name = "kdn_order_code", value = "自提单号")
|
|
|
|
+ private Integer selfPickupNum;
|
|
|
|
|
|
|
|
+ @ApiModelProperty("物流轨迹")
|
|
|
|
+ @TableField(typeHandler = FastjsonTypeHandler.class)
|
|
|
|
+ private List<Map> logistics = new ArrayList<>();
|
|
|
|
+
|
|
|
|
+ @ApiModelProperty("快递类型")
|
|
|
|
+ private String logisticsType;
|
|
|
|
+
|
|
|
|
+ @ApiModelProperty("快递单号")
|
|
|
|
+ private String logisticsCode;
|
|
|
|
+
|
|
|
|
+ @ApiModelProperty("快递员电话后4位")
|
|
|
|
+ private String logisticsPhone;
|
|
}
|
|
}
|