新增获取订单数据的接口

AutoTurnOver.DB/api_dao.cs

@@ -4,7 +4,9 @@ using AutoTurnOver.Models.Base;
 using Dapper;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace AutoTurnOver.DB
 {
@@ -34,5 +36,31 @@ namespace AutoTurnOver.DB
             }
             return _connection.Page<dc_quantity_out_stock_dto>(sql, search, parameters);
         }
+
+        public static async Task<IEnumerable<dc_base_oms_sku_full_dto>> GetOmsSkuFullPage(dc_base_oms_sku_full_search_dto search)
+        {
+            if (search.page <= 0)
+            {
+                search.page = 1;
+            }
+            var sql = " select t1.* from dc_base_oms_sku as t1 where 1=1 ";
+            DynamicParameters parameters = new DynamicParameters();
+            if (!string.IsNullOrWhiteSpace(search.warehouse_codes))
+            {
+                sql += " and t1.warehouse_code in @warehouse_codes ";
+                parameters.Add("warehouse_codes", search.warehouse_codes.Split(',').ToList());
+            }
+            if (search.btime != null)
+            {
+                sql += " and t1.gmt_modified >=@btime ";
+                parameters.Add("btime", search.btime);
+            }
+            if (search.etime != null)
+            {
+                sql += " and t1.gmt_modified <=@etime ";
+                parameters.Add("etime", search.etime);
+            }
+            return await _connection.QueryAsync<dc_base_oms_sku_full_dto>(sql+ $" limit {(search.page - 1) * search.rows},{search.rows} ", parameters);
+        }
     }
 }

AutoTurnOver.Models/dc_base_oms_sku.cs

@@ -4,9 +4,9 @@ using System.Text;
 
 namespace AutoTurnOver.Models
 {
-   /// <summary>
-   /// 百伦OMS 订单明细
-   /// </summary>
+    /// <summary>
+    /// 百伦OMS 订单明细
+    /// </summary>
     public class dc_base_oms_sku
     {
         public int id { get; set; }
@@ -47,7 +47,7 @@ namespace AutoTurnOver.Models
         public string label { get; set; }
     }
 
-    public class dc_base_oms_sku_goods_dto: dc_base_oms_sku
+    public class dc_base_oms_sku_goods_dto : dc_base_oms_sku
     {
         public string product_inner_code { get; set; }
 

AutoTurnOver.Models/dc_base_oms_sku_full_dto.cs

+using AutoTurnOver.Models.Base;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace AutoTurnOver.Models
+{
+   public class dc_base_oms_sku_full_dto
+    {
+            public int id { get; set; }
+
+            /// <summary>
+            /// 平台订单号
+            /// </summary>
+            public string origin_order_id { get; set; }
+
+            /// <summary>
+            /// 平台类型
+            /// </summary>
+            public string platform_type { get; set; }
+
+            /// <summary>
+            /// 交易号
+            /// </summary>
+            public string transaction_id { get; set; }
+
+            /// <summary>
+            /// 支付时间
+            /// </summary>
+            public DateTime? pay_time { get; set; }
+
+            /// <summary>
+            /// 支付方法
+            /// </summary>
+            public string pay_method { get; set; }
+
+            /// <summary>
+            /// 支付账号
+            /// </summary>
+            public string pay_account { get; set; }
+
+            /// <summary>
+            /// 支付状态
+            /// </summary>
+            public string pay_status { get; set; }
+
+            /// <summary>
+            /// 收款账号
+            /// </summary>
+            public string collection_account { get; set; }
+
+            /// <summary>
+            /// 平台订单类型
+            /// </summary>
+            public string platform_order_type { get; set; }
+
+            /// <summary>
+            /// 站点
+            /// </summary>
+            public string website { get; set; }
+
+            /// <summary>
+            /// 订单创建时间
+            /// </summary>
+            public DateTime? create_time { get; set; }
+
+            /// <summary>
+            /// 订单付款时间
+            /// </summary>
+            public DateTime? paid_time { get; set; }
+
+            /// <summary>
+            /// 订单退款时间
+            /// </summary>
+            public DateTime? refund_time { get; set; }
+
+            /// <summary>
+            /// 销售账号Id
+            /// </summary>
+            public string seller_id { get; set; }
+
+            /// <summary>
+            /// 账号id
+            /// </summary>
+            public int bailun_account_id { get; set; }
+
+            /// <summary>
+            /// 环球账号
+            /// </summary>
+            public string hq_account { get; set; }
+
+            /// <summary>
+            /// 销售账号
+            /// </summary>
+            public string seller_account { get; set; }
+
+            /// <summary>
+            /// 暂时不知道意思
+            /// </summary>
+            public string seller_order_id { get; set; }
+
+            /// <summary>
+            /// 销售账号邮箱
+            /// </summary>
+            public string seller_email { get; set; }
+
+            /// <summary>
+            /// 订单更新时间
+            /// </summary>
+            public DateTime? order_update_time { get; set; }
+
+            /// <summary>
+            /// 销售订单汇率-转人民币
+            /// </summary>
+            public decimal seller_order_exchange_rate { get; set; }
+
+            /// <summary>
+            /// 销售其他汇率-转人民币
+            /// </summary>
+            public decimal seller_other_exchange_rate { get; set; }
+
+            /// <summary>
+            /// 财务订单汇率-转人民币
+            /// </summary>
+            public decimal finance_order_exchange_rate { get; set; }
+
+            /// <summary>
+            /// 财务其他汇率-转人民币
+            /// </summary>
+            public decimal finance_other_exchange_rate { get; set; }
+
+            /// <summary>
+            /// 人民币转美元汇率
+            /// </summary>
+            public decimal cny_to_usd_exchange_rate { get; set; }
+
+            /// <summary>
+            /// Order币种转美元汇率
+            /// </summary>
+            public decimal order_to_usd_exchange_rate { get; set; }
+
+            /// <summary>
+            /// Other币种转美元汇率
+            /// </summary>
+            public decimal other_to_usd_exchange_rate { get; set; }
+
+            /// <summary>
+            /// 订单币种
+            /// </summary>
+            public string order_currency { get; set; }
+
+            /// <summary>
+            /// 其他币种e.g.平台费
+            /// </summary>
+            public string other_currency { get; set; }
+
+            /// <summary>
+            /// 销售员
+            /// </summary>
+            public string seller_name { get; set; }
+
+            /// <summary>
+            /// 百伦订单号
+            /// </summary>
+            public string bailun_order_id { get; set; }
+
+            /// <summary>
+            /// 平台订单状态
+            /// </summary>
+            public string platform_order_status { get; set; }
+
+            /// <summary>
+            /// 百伦订单状态
+            /// </summary>
+            public string bailun_order_status { get; set; }
+
+            /// <summary>
+            /// 百伦付款状态
+            /// </summary>
+            public string bailun_payment_status { get; set; }
+
+            /// <summary>
+            /// 百伦拦截状态
+            /// </summary>
+            public string bailun_interception_status { get; set; }
+
+            /// <summary>
+            /// 百伦发货状态
+            /// </summary>
+            public string shipping_status { get; set; }
+
+            /// <summary>
+            /// 百伦SKU
+            /// </summary>
+            public string bailun_sku { get; set; }
+
+            /// <summary>
+            /// 百伦SKU英文标题
+            /// </summary>
+            public string bailun_sku_title_en { get; set; }
+
+            /// <summary>
+            /// 百伦SKU中文标题
+            /// </summary>
+            public string bailun_sku_title_cn { get; set; }
+
+            /// <summary>
+            /// 百伦SKU订单数量
+            /// </summary>
+            public int bailun_sku_quantity_ordered { get; set; }
+
+            /// <summary>
+            /// 百伦SKU发货数量
+            /// </summary>
+            public int bailun_sku_quantity_shipped { get; set; }
+
+            /// <summary>
+            /// 百伦SKU退货数量
+            /// </summary>
+            public int bailun_sku_quantity_refund { get; set; }
+
+            /// <summary>
+            /// 百伦SKU配货数量
+            /// </summary>
+            public int bailun_sku_quantity_picked { get; set; }
+
+            /// <summary>
+            /// 百伦SKU仓库名称
+            /// </summary>
+            public string warehouse_name { get; set; }
+
+            /// <summary>
+            /// 百伦SKU仓库编码, FBA订单这里放接口拿到的仓库
+            /// </summary>
+            public string warehouse_code_fba { get; set; }
+
+            /// <summary>
+            /// 百伦SKU仓库编码,不是FBA订单照旧,FBA订单放最高优先级共享仓库
+            /// </summary>
+            public string warehouse_code { get; set; }
+
+            /// <summary>
+            /// 百伦SKU单价
+            /// </summary>
+            public decimal bailun_sku_unit_price { get; set; }
+
+            /// <summary>
+            /// 百伦SKU重量_g
+            /// </summary>
+            public decimal bailun_sku_weight { get; set; }
+
+            /// <summary>
+            /// 百伦SKU尺寸_cm
+            /// </summary>
+            public string bailun_sku_size { get; set; }
+
+            /// <summary>
+            /// 销售额-原币种
+            /// </summary>
+            public decimal amount_sales { get; set; }
+
+            /// <summary>
+            /// 收入总金额-原币种
+            /// </summary>
+            public decimal amount_total { get; set; }
+
+            /// <summary>
+            /// 运费收入金额-原币种
+            /// </summary>
+            public decimal amount_shipping { get; set; }
+
+            /// <summary>
+            /// 产品金额-原币种
+            /// </summary>
+            public decimal amount_product { get; set; }
+
+            /// <summary>
+            /// 税费收入金额-原币种
+            /// </summary>
+            public decimal amount_tax { get; set; }
+
+            /// <summary>
+            /// 调整金额-原币种
+            /// </summary>
+            public decimal amount_adjustment { get; set; }
+
+            /// <summary>
+            /// 礼品包装金额-原币种
+            /// </summary>
+            public decimal amount_gift_wrap { get; set; }
+
+            /// <summary>
+            /// 退款金额-原币种
+            /// </summary>
+            public decimal amount_refund { get; set; }
+
+            /// <summary>
+            /// 预付款-收钱没发货-原始币种
+            /// </summary>
+            public decimal amount_prepaid { get; set; }
+
+            /// <summary>
+            /// 总支出费用
+            /// </summary>
+            public decimal cost_total { get; set; }
+
+            /// <summary>
+            /// 促销费用-原币种
+            /// </summary>
+            public decimal cost_promotion { get; set; }
+
+            /// <summary>
+            /// 平台费用
+            /// </summary>
+            public decimal cost_platform_fee { get; set; }
+
+            /// <summary>
+            /// 产品成本费用-人民币
+            /// </summary>
+            public decimal cost_product { get; set; }
+
+            /// <summary>
+            /// 发货支出费用-已废弃
+            /// </summary>
+            public decimal cost_shipping { get; set; }
+
+            /// <summary>
+            /// 包装费用-已废弃
+            /// </summary>
+            public decimal cost_package { get; set; }
+
+            /// <summary>
+            /// fba费用
+            /// </summary>
+            public decimal cost_fba_fee { get; set; }
+
+            /// <summary>
+            /// paypal费用
+            /// </summary>
+            public decimal cost_paypal_fee { get; set; }
+
+            /// <summary>
+            /// 退款佣金费用
+            /// </summary>
+            public decimal cost_refund_commisson { get; set; }
+
+            /// <summary>
+            /// 处理费-百伦收取
+            /// </summary>
+            public decimal cost_handle_bailun { get; set; }
+
+            /// <summary>
+            /// 处理费-平台收取
+            /// </summary>
+            public decimal cost_handle_platform { get; set; }
+
+            /// <summary>
+            /// 尾程费-人民币-真实的费用
+            /// </summary>
+            public decimal cost_tail { get; set; }
+
+            /// <summary>
+            /// 头程费-根据LMS线路算出来的
+            /// </summary>
+            public decimal cost_first { get; set; }
+
+            /// <summary>
+            /// 物流费-根据LMS线路算出来的
+            /// </summary>
+            public decimal cost_logistics { get; set; }
+
+            /// <summary>
+            /// 利润=总收入-总支出
+            /// </summary>
+            public decimal profit_total { get; set; }
+
+            /// <summary>
+            /// 利润率
+            /// </summary>
+            public decimal profit_rate { get; set; }
+
+            /// <summary>
+            /// 收货国家
+            /// </summary>
+            public string receipt_country { get; set; }
+
+            /// <summary>
+            /// 收货城市
+            /// </summary>
+            public string receipt_city { get; set; }
+
+            /// <summary>
+            /// 收货州或区域
+            /// </summary>
+            public string receipt_area { get; set; }
+
+            /// <summary>
+            /// 收货街道
+            /// </summary>
+            public string receipt_address { get; set; }
+
+            /// <summary>
+            /// 收货门牌
+            /// </summary>
+            public string receipt_address_2 { get; set; }
+
+            /// <summary>
+            /// 收货邮编
+            /// </summary>
+            public string receipt_postal_code { get; set; }
+
+            /// <summary>
+            /// 收货人
+            /// </summary>
+            public string receiver { get; set; }
+
+            /// <summary>
+            /// 收货电话
+            /// </summary>
+            public string receiver_phone { get; set; }
+
+            /// <summary>
+            /// 买家账号Id
+            /// </summary>
+            public string buyer_id { get; set; }
+
+            /// <summary>
+            /// 买家账号
+            /// </summary>
+            public string buyer_name { get; set; }
+
+            /// <summary>
+            /// 买家邮箱
+            /// </summary>
+            public string buyer_email { get; set; }
+
+            /// <summary>
+            /// 是否FBA费用异常
+            /// </summary>
+            public int has_fba_exception { get; set; }
+
+            /// <summary>
+            /// 是否平台费用异常
+            /// </summary>
+            public int has_platform_exception { get; set; }
+
+            /// <summary>
+            /// 是否被平台取消-来自OMS
+            /// </summary>
+            public int has_cancle { get; set; }
+
+            /// <summary>
+            /// 区域Id
+            /// </summary>
+            public int area_id { get; set; }
+
+            /// <summary>
+            /// 百伦分类id
+            /// </summary>
+            public int bailun_category_id { get; set; }
+
+            /// <summary>
+            /// 百伦分类名称
+            /// </summary>
+            public string bailun_category_name { get; set; }
+
+            /// <summary>
+            /// 数据中心创建时间
+            /// </summary>
+            public DateTime gmt_create { get; set; }
+
+            /// <summary>
+            /// 数据中心更新时间
+            /// </summary>
+            public DateTime gmt_modified { get; set; }
+
+            /// <summary>
+            /// 按重量摊分费用比例
+            /// </summary>
+            public decimal ratio_weight { get; set; }
+
+            /// <summary>
+            /// 按采购价摊分费用比例
+            /// </summary>
+            public decimal ratio_price { get; set; }
+
+            /// <summary>
+            /// 百伦配货状态
+            /// </summary>
+            public string bailun_picking_status { get; set; }
+
+            /// <summary>
+            /// 订单指定的物流方式
+            /// </summary>
+            public string bailun_require_logistics { get; set; }
+
+            /// <summary>
+            /// 是否删除-数据中心判断
+            /// </summary>
+            public int has_delete { get; set; }
+
+            /// <summary>
+            /// 是否刷单订单
+            /// </summary>
+            public int has_scalp { get; set; }
+
+            /// <summary>
+            /// 配货线路-方式
+            /// </summary>
+            public string logistics_method_code { get; set; }
+
+            /// <summary>
+            /// 配货线路-方式
+            /// </summary>
+            public string logistics_method_name { get; set; }
+
+            /// <summary>
+            /// 是否内购订单
+            /// </summary>
+            public int has_innersale { get; set; }
+
+            /// <summary>
+            /// 公司Id, 默认0是无意义的
+            /// </summary>
+            public int company_id { get; set; }
+
+            /// <summary>
+            /// 百伦退款状态
+            /// </summary>
+            public string bailun_refund_status { get; set; }
+
+            /// <summary>
+            /// 退款对象
+            /// </summary>
+            public string refund_obj { get; set; }
+
+            /// <summary>
+            /// 退款类型
+            /// </summary>
+            public string refund_type { get; set; }
+
+            /// <summary>
+            /// 退款ReferenceID
+            /// </summary>
+            public string refund_reference_id { get; set; }
+
+            /// <summary>
+            /// 是否FBA-S0前缀的订单
+            /// </summary>
+            public int has_fba_s { get; set; }
+
+            /// <summary>
+            /// 百伦sku配货推送易仓数量
+            /// </summary>
+            public int bailun_sku_quantity_pushed { get; set; }
+
+            /// <summary>
+            /// 普货货值
+            /// </summary>
+            public decimal amount_general_cargo { get; set; }
+
+            /// <summary>
+            /// 是否手工单
+            /// </summary>
+            public int has_transfer_order { get; set; }
+
+        
+    }
+
+    public class dc_base_oms_sku_full_search_dto: page_search_dto
+    {
+        /// <summary>
+        /// 仓库编码
+        /// </summary>
+        public string warehouse_codes { get; set; }
+        public DateTime? btime { get; set; }
+
+        public DateTime? etime { get; set; }
+    }
+}

AutoTurnOver.Services/ApiServices.cs

@@ -10,6 +10,7 @@ using AutoTurnOver.Models;
 using AutoTurnOver.DB;
 using System.Text.RegularExpressions;
 using AutoTurnOver.Models.Base;
+using System.Threading.Tasks;
 
 namespace AutoTurnOver.Services
 {
@@ -714,5 +715,15 @@ namespace AutoTurnOver.Services
             return api_dao.GetOutStockPage(search);
         }
 
+        /// <summary>
+        /// 获取缺货数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public static async Task<IEnumerable<dc_base_oms_sku_full_dto>> GetOmsSkuFullPage(dc_base_oms_sku_full_search_dto search)
+        {
+            return await api_dao.GetOmsSkuFullPage(search);
+        }
+        
     }
 }

AutoTurnOver/Controllers/ApiController.cs

@@ -20,6 +20,19 @@ namespace AutoTurnOver.Controllers
             return new RequestResultDto { success = true, data = ApiServices.GetOutStockPage(search) };
         }
 
+        /// <summary>
+        /// 获取oms 订单数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        [HttpPost("GetOmsSkuFullPage")]
+        public ActionResult<RequestResultDto> GetOmsSkuFullPage([FromBody] dc_base_oms_sku_full_search_dto search)
+        {
+            return new RequestResultDto { success = true, data = ApiServices.GetOmsSkuFullPage(search) };
+        }
+
+        
+
         [HttpPost("Buys")]
         public JsonResult Buys([FromBody]AverageQueryDto queryDto)
         {