更新一大堆代码
This commit is contained in:
@@ -0,0 +1,176 @@
|
||||
|
||||
using MyCode.Project.Infrastructure.JackYun;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using static System.Net.Mime.MediaTypeNames;
|
||||
|
||||
namespace MyCode.Project.Domain.Message.Request.JackYun
|
||||
{
|
||||
public class ReturnChangeGetRequestBizData : BaseRequestBizData
|
||||
{
|
||||
/// <summary>
|
||||
/// 每页显示数据量
|
||||
/// </summary>
|
||||
public int? PageSize { get; set; } = 50;
|
||||
|
||||
/// <summary>
|
||||
/// 当前页码
|
||||
/// </summary>
|
||||
public int? PageIndex { get; set; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// 最后修改时间（起始）
|
||||
/// </summary>
|
||||
public string StartModified { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 最后修改时间（截止）
|
||||
/// </summary>
|
||||
public string EndModified { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退换单号，多个单号用逗号分隔
|
||||
/// </summary>
|
||||
public string ReturnChangeNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 订单号，多个单号用逗号分隔
|
||||
/// </summary>
|
||||
public string TradeNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间（起始）
|
||||
/// </summary>
|
||||
public string StartGmtCreate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 创建时间（结束）
|
||||
/// </summary>
|
||||
public string EndGmtCreate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 审核时间（起始）
|
||||
/// </summary>
|
||||
public string StartAuditDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 审核时间（结束）
|
||||
/// </summary>
|
||||
public string EndAuditDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 收货时间（起始）
|
||||
/// </summary>
|
||||
public string StartDeliveryDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 收货时间（结束）
|
||||
/// </summary>
|
||||
public string EndDeliveryDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结算时间（起始）
|
||||
/// </summary>
|
||||
public string StartSettlementDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 结算时间（结束）
|
||||
/// </summary>
|
||||
public string EndSettlementDate { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 处理状态（1000：异常件待处理；1001：待审核；1002：待收货；1003：待结算；1004：已结算待收货；1005：已收货待结算；1007：已完成；1008：已取消；1009：已拒绝；1010：待支付；1014：待退货-待通知退货；1015：待退货-已通知退货；10081：已取消-被合并；10082：已取消-被拆分）
|
||||
/// </summary>
|
||||
public string ProcessStatusList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 销售渠道
|
||||
/// </summary>
|
||||
public string ShopName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退货仓库名称
|
||||
/// </summary>
|
||||
public string WarehouseName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退货仓库ID集合
|
||||
/// </summary>
|
||||
public List<string> WarehouseIdList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 退换原因
|
||||
/// </summary>
|
||||
public string ReasonDesc { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否获取总记录数（1：是；0：否）
|
||||
/// </summary>
|
||||
public int? HasTotal { get; set; } = 1;
|
||||
|
||||
/// <summary>
|
||||
/// 网店订单号
|
||||
/// </summary>
|
||||
public string SourceTradeNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 网店售后单号
|
||||
/// </summary>
|
||||
public string SourceTradeAfterNo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否软删除
|
||||
/// </summary>
|
||||
public bool? Deleted { get; set; } = false;
|
||||
|
||||
/// <summary>
|
||||
/// 店铺ID集合
|
||||
/// </summary>
|
||||
public List<string> ShopIds { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否查询组合装子件信息（1：是；0：否）
|
||||
/// </summary>
|
||||
public string SelectSubParts { get; set; } = "1";
|
||||
|
||||
/// <summary>
|
||||
/// 是否同时返回未删除和回收站中的数据
|
||||
/// </summary>
|
||||
public bool? AllDeleteStatus { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// 完成时间开始时间
|
||||
/// </summary>
|
||||
public string StartCompleteTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 完成时间结束时间
|
||||
/// </summary>
|
||||
public string EndCompleteTime { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否归档（0：未归档；1：已归档）
|
||||
/// </summary>
|
||||
public string QueryHistory { get; set; } = "0";
|
||||
|
||||
/// <summary>
|
||||
/// 销售平台
|
||||
/// </summary>
|
||||
public string PlatName { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 申请时间开始时间
|
||||
/// </summary>
|
||||
public string ApplyTimeBegin { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 申请时间结束时间
|
||||
/// </summary>
|
||||
public string ApplyTimeEnd { get; set; }
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
286
Reportapi/MyCode.Project.Domain/Model/ReturnChangeGoodsDetail.cs
Normal file
286
Reportapi/MyCode.Project.Domain/Model/ReturnChangeGoodsDetail.cs
Normal file
@@ -0,0 +1,286 @@
|
||||
using System;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using SqlSugar;
|
||||
|
||||
namespace MyCode.Project.Domain.Model
|
||||
{
|
||||
///<summary>
|
||||
///退换货商品明细表（记录售后订单中的商品变更详情）
|
||||
///</summary>
|
||||
[SugarTable("ReturnChangeGoodsDetail")]
|
||||
public partial class ReturnChangeGoodsDetail
|
||||
{
|
||||
public ReturnChangeGoodsDetail(){
|
||||
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// Desc:主键（GUID格式）
|
||||
/// Default:newid()
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
[SugarColumn(IsPrimaryKey=true)]
|
||||
public Guid Id {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:售后订单ID（关联售后主表）
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public long TradeAfterId {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:子订单ID（关联销售明细）
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public long SubTradeId {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品基础信息ID（关联商品主表）
|
||||
/// Default:
|
||||
/// Nullable:False
|
||||
/// </summary>
|
||||
public long GoodsId {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品系统编号（唯一业务标识）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GoodsNo {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品全称（显示名称）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GoodsName {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:规格ID（关联规格表）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public long? SpecId {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:规格组合名称（如：颜色:红;尺寸:XL）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string SpecName {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:计量单位（如：件、KG等）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string Unit {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:销售单价（含税，单位：元）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? Price {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:原始销售数量（单位与Unit字段一致）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? SellCount {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:售后原因详细描述
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string ReasonDesc {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:申请退货数量（可含小数）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ReturnCount {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:实际退货金额（=退货数量*单价-退货优惠）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ReturnFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:补发商品数量
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? SendCount {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:退货部分享受的优惠金额
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ReturnDiscounts {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:补发部分享受的优惠金额
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? SendDiscounts {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:补发商品总金额
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? SendFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:理论应退金额（未计算分摊）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ShouldReturnFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:处理备注信息
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string Remark {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品特性标记（1-7分别对应定制/虚拟/卡券/代销/预售/序列号/需安装）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? GoodsAttribute {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:最后修改时间（格式：yyyy-MM-dd HH:mm:ss）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GmtModified {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:记录创建时间（格式：yyyy-MM-dd HH:mm）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GmtCreate {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品条码（国际标准条码）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string Barcode {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:销售总金额（=单价*数量）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? SellTotal {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:实际退货数量（仓库验收后）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? DeliveryCount {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:组合装标识（1=是组合装子商品）
|
||||
/// Default:0
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? IsFit {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:赠品标识（1=是赠品 0=正常商品）
|
||||
/// Default:0
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public int? IsGift {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:分摊后退货金额（含订单级优惠分摊）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ShareReturnFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:分摊后补发金额（含订单级优惠分摊）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ShareSendFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:最终应退金额（含所有优惠和运费分摊）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public decimal? ShareShouldReturnFee {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:货品批次信息（JSON格式存储）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GoodsBatchInfoList {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:电商平台子订单编号（如淘宝子订单号）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string SourceSubtradeNo {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:次品数量描述（如：5件破损）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string DefectiveAmount {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:品牌名称
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string BrandName {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:商品唯一序列号（用于高端商品追踪）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string GoodsSerial {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:平台商品ID（第三方平台商品编码）
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public string PlatGoodsId {get;set;}
|
||||
|
||||
/// <summary>
|
||||
/// Desc:
|
||||
/// Default:
|
||||
/// Nullable:True
|
||||
/// </summary>
|
||||
public Guid? JackOrdersId {get;set;}
|
||||
|
||||
}
|
||||
}
|
||||
@@ -67,6 +67,7 @@
|
||||
<Compile Include="Message\Act\Common\RequestModel.cs" />
|
||||
<Compile Include="Message\Request\JackYun\CreateAndStockinGetRequestBizData.cs" />
|
||||
<Compile Include="Message\Request\JackYun\CreateAndStockoutGetRequestBizData.cs" />
|
||||
<Compile Include="Message\Request\JackYun\ReturnChangeGetRequestBizData.cs" />
|
||||
<Compile Include="Message\Request\JackYun\OrderTradeFullInfoGetRequestBizData.cs" />
|
||||
<Compile Include="Message\Request\KingDee\BillDelete.cs" />
|
||||
<Compile Include="Message\Request\KingDee\BillSave.cs" />
|
||||
@@ -98,6 +99,7 @@
|
||||
<Compile Include="Model\JackOrdersItem.cs" />
|
||||
<Compile Include="Model\PushKingDeeOrder.cs" />
|
||||
<Compile Include="Model\PushKingDeeOrderItem.cs" />
|
||||
<Compile Include="Model\ReturnChangeGoodsDetail.cs" />
|
||||
<Compile Include="Model\SysWorkprocess.cs" />
|
||||
<Compile Include="Model\WMStoJackyunInventoryMovementView1.cs" />
|
||||
<Compile Include="Model\YTKJTShopParameter.cs" />
|
||||
@@ -109,6 +111,7 @@
|
||||
<Compile Include="Repositories\IPushKingDeeOrderRepository.cs" />
|
||||
<Compile Include="Repositories\IRepository.cs" />
|
||||
<Compile Include="Repositories\IRepository`.cs" />
|
||||
<Compile Include="Repositories\IReturnChangeGoodsDetailRepository.cs" />
|
||||
<Compile Include="Repositories\ISysWorkprocessRepository.cs" />
|
||||
<Compile Include="Repositories\IWMStoJackyunInventoryMovementView1Repository.cs" />
|
||||
<Compile Include="Repositories\IYTKJTShopParameterRepository.cs" />
|
||||
|
||||
@@ -20,5 +20,11 @@ namespace MyCode.Project.Domain.Repositories
|
||||
/// <returns></returns>
|
||||
List<PushOrderListResp> GetPushOrder();
|
||||
|
||||
/// <summary>
|
||||
/// 获取合并后的吉客云订单
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
List<PushOrderListResp> GetPushReturnOrder();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using MyCode.Project.Infrastructure;
|
||||
using MyCode.Project.Domain;
|
||||
using MyCode.Project.Domain.Model;
|
||||
using MyCode.Project.Infrastructure.Common;
|
||||
using MyCode.Project.Domain.Message;
|
||||
|
||||
namespace MyCode.Project.Domain.Repositories
|
||||
{
|
||||
public interface IReturnChangeGoodsDetailRepository : IRepository<ReturnChangeGoodsDetail>
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user