11

Reportapi/MyCode.Project.Domain/Model/JackOrders.cs

@@ -26,7 +26,7 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:销售单id(吉客云内码)
            /// Default:
-           /// Nullable:False
+           /// Nullable:True
            /// </summary>           
            [SugarColumn(ColumnName="tradeId")]
            public string TradeId {get;set;}
@@ -50,7 +50,7 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:店铺编码
            /// Default:
-           /// Nullable:False
+           /// Nullable:True
            /// </summary>           
            [SugarColumn(ColumnName="shopCode")]
            public string ShopCode {get;set;}
@@ -58,7 +58,7 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:发货单单号
            /// Default:
-           /// Nullable:False
+           /// Nullable:True
            /// </summary>           
            [SugarColumn(ColumnName="orderNo")]
            public string OrderNo {get;set;}
@@ -66,7 +66,7 @@ namespace MyCode.Project.Domain.Model
            /// <summary>
            /// Desc:订单编号
            /// Default:
-           /// Nullable:False
+           /// Nullable:True
            /// </summary>           
            [SugarColumn(ColumnName="tradeNo")]
            public string TradeNo {get;set;}
@@ -191,5 +191,37 @@ namespace MyCode.Project.Domain.Model
            [SugarColumn(ColumnName="updateTime")]
            public DateTime? UpdateTime {get;set;}
 
+           /// <summary>
+           /// Desc:0=未处理  1=已合并 2=已推送
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="status")]
+           public int? Status {get;set;}
+
+           /// <summary>
+           /// Desc:支付时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="payTime")]
+           public DateTime? PayTime {get;set;}
+
+           /// <summary>
+           /// Desc:发货时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="consignTime")]
+           public DateTime? ConsignTime {get;set;}
+
+           /// <summary>
+           /// Desc:销售单状态（1010：待审核；1020：审核中；1030：预售；1050：待复核；2000：备货等待；2010：备货等待等补货；2020：服务等待；2030：备货等待等生产；2040：采购等待；3010：虚拟发货；4110：待发货待递交；4111：待发货递交中；4112：待发货已递交；4113：待发货-递交失败；4121：待发货-取消中；4122：待发货已取消；4123：待发货取消失败；4130：待发货部分发货；4040：代销发货待递交；4041：代销发货已递交；5010：已取消；5020：已取消被合并；5030：已取消被拆分；6000：发货在途；9090：已完成）
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           [SugarColumn(ColumnName="tradeStatus")]
+           public int? TradeStatus {get;set;}
+
     }
 }

Reportapi/MyCode.Project.Domain/Model/JackOrdersItem.cs

@@ -167,14 +167,6 @@ namespace MyCode.Project.Domain.Model
            [SugarColumn(ColumnName="tradeId")]
            public string TradeId {get;set;}
 
-           /// <summary>
-           /// Desc:
-           /// Default:
-           /// Nullable:True
-           /// </summary>           
-           [SugarColumn(ColumnName="skuImgUrl")]
-           public string SkuImgUrl {get;set;}
-
            /// <summary>
            /// Desc:
            /// Default:DateTime.Now