Skip to content

M
mall.oytour.com
Commit 4ccb2bf9 authored by liudong1993's avatar liudong1993
Browse files
Options

订单财务单据

parent 0d2f5ecb
Hide whitespace changes
Inline Side-by-side
Showing with 774 additions and 14 deletions
Mall.Common/Enum/Finance/WFAuditStatus.cs 0 → 100644
View file @ 4ccb2bf9
using Mall.Common.Plugin;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Mall.Common.Enum.Finance
{
#region OA
/// <summary>
/// 工作申请流审核状态
/// </summary>
public enum WFAuditStatus
{
/// <summary>
/// 审核中
/// </summary>
[EnumField("审核中")]
InReview = 1,
/// <summary>
/// 撤回
/// </summary>
[EnumField("撤回")]
ToWithdraw = 2,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 3,
/// <summary>
/// 不通过
/// </summary>
[EnumField("不通过")]
NotThrough = 4,
/// <summary>
/// 通过
/// </summary>
[EnumField("通过")]
Through = 5
}
/// <summary>
/// 流程审核状态
/// </summary>
public enum WFRrocessStatus
{
/// <summary>
/// 未审核
/// </summary>
[EnumField("未审核")]
NotAudit = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("审核通过")]
AuditThrough = 2,
/// <summary>
/// 不通过
/// </summary>
[EnumField("审核不通过")]
AuditNotThrough = 3,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 4,
/// <summary>
/// 他人已审核（仅限审核记录表）
/// </summary>
[EnumField("他人已审核")]
OtherHaveAudit = 5
}
/// <summary>
/// app筛选审核状态枚举
/// </summary>
public enum AppAuditStatusEnum
{
/// <summary>
/// 全部
/// </summary>
[EnumField("全部")]
All = 0,
/// <summary>
/// 审批完成
/// </summary>
[EnumField("审批完成")]
AuditComplete = 1,
/// <summary>
/// 审批中
/// </summary>
[EnumField("审批中")]
InComplete = 2,
/// <summary>
/// 已撤销
/// </summary>
[EnumField("已撤销")]
ToWithdraw = 3
}
/// <summary>
/// 申请单撤回状态
/// </summary>
public enum WFAuditCancelStatus
{
/// <summary>
/// 正常
/// </summary>
[EnumField("正常")]
Normal = 1,
/// <summary>
/// 撤回
/// </summary>
[EnumField("撤回")]
Cancel = 2
}
#endregion
#region 财务
/// <summary>
/// 财务审核状态
/// </summary>
public enum FinanceAuditStatus
{
/// <summary>
/// 暂存
/// </summary>
[EnumField("制单人暂存")]
Temporary = 0,
/// <summary>
/// 审核中
/// </summary>
[EnumField("审核中")]
InReview = 1,
/// <summary>
/// 通过
/// </summary>
[EnumField("通过")]
Pass = 2,
/// <summary>
/// 驳回
/// </summary>
[EnumField("驳回")]
Rejected = 3,
/// <summary>
/// 作废
/// </summary>
[EnumField("作废")]
Delete = 4,
/// <summary>
/// 出纳暂存
/// </summary>
[EnumField("出纳暂存")]
CTemporary = 5
}
#endregion
}
Mall.Model/Entity/Finance/RB_ECFinanceId_Relation.cs 0 → 100644
View file @ 4ccb2bf9
using VT.FW.DB;
using System;
namespace Mall.Model.Entity.Finance
{
/// <summary>
/// 电商
/// </summary>
[Serializable]
[DB(ConnectionName = "FinanceConnection")]
public class RB_ECFinanceId_Relation
{
/// <summary>
/// ID
/// </summary>
public int Id
{
get;
set;
}
/// <summary>
/// 电商订单Id
/// </summary>
public int? ECOrderId
{
get;
set;
}
/// <summary>
/// 电商订单明细Id
/// </summary>
public int? ECOrderDetailId
{
get;
set;
}
/// <summary>
/// 财务单据id
/// </summary>
public int? FinanceId
{
get;
set;
}
/// <summary>
/// 状态
/// </summary>
public Common.Enum.DateStateEnum? Status
{
get;
set;
}
/// <summary>
/// 期初应用时间
/// </summary>
public DateTime? CreateDate { get; set; }
}
}
\ No newline at end of file
Mall.Model/Entity/Finance/RB_Finance.cs 0 → 100644
View file @ 4ccb2bf9
using VT.FW.DB;
using System;
using Mall.Common.Enum.Finance;
namespace Mall.Model.Entity.Finance
{
/// <summary>
/// 财务单据实体
/// </summary>
[Serializable]
[DB(ConnectionName = "FinanceConnection")]
public class RB_Finance
{
/// <summary>
/// 主键
/// </summary>
public int FrID
{
get;
set;
}
/// <summary>
/// 团控编号
/// </summary>
public int? TCID
{
get;
set;
}
/// <summary>
/// 订单编号
/// </summary>
public int? OrderID
{
get;
set;
}
/// <summary>
/// 手续费
/// </summary>
public decimal? Fee
{
get;
set;
}
/// <summary>
/// 原币手续费
/// </summary>
public decimal? OriginalFee
{
get; set;
}
/// <summary>
/// 订单来源
/// </summary>
public int? OrderSource
{
get; set;
}
/// <summary>
/// 其他来源ID
/// </summary>
public int? SourceID
{
get; set;
}
/// <summary>
/// 客户类型
/// </summary>
public Common.Enum.Finance.ClientTypeEnum? ClientType
{
get;
set;
}
/// <summary>
/// 客户编号
/// </summary>
public int? ClientID
{
get;
set;
}
/// <summary>
/// 1-收入2-支出
/// </summary>
public int? Type
{
get; set;
}
/// <summary>
/// 客户ID
/// </summary>
public int? CustomerId
{
get; set;
}
/// <summary>
/// 流水号
/// </summary>
public string AccountNumber
{
get; set;
}
/// <summary>
/// 发起人
/// </summary>
public int? CreateBy
{
get;
set;
}
/// <summary>
/// 发起时间
/// </summary>
public DateTime? CreateDate
{
get;
set;
}
/// <summary>
/// 集团
/// </summary>
public int? RB_Group_Id
{
get;
set;
}
/// <summary>
/// 公司
/// </summary>
public int? RB_Branch_Id
{
get;
set;
}
/// <summary>
/// 部门ID
/// </summary>
public int? RB_Depart_Id
{
get;
set;
}
/// <summary>
///见枚举
/// </summary>
public FinanceAuditStatus? Status
{
get;
set;
}
/// <summary>
/// 模板ID
/// </summary>
public int? TemplateId
{
get; set;
}
/// <summary>
/// 模板工作流条件ID
/// </summary>
public int? ConditionId
{
get;
set;
}
/// <summary>
///类型Type=1汇款人 Type=2则为客户名称
/// </summary>
public string RemitterName
{
get;
set;
}
/// <summary>
/// 交易日期
/// </summary>
public DateTime? TradeDate
{
get;
set;
}
/// <summary>
/// 原币金额
/// </summary>
public decimal? WBMoney
{
get; set;
}
/// <summary>
/// 汇率
/// </summary>
public decimal? Rate
{
get; set;
}
/// <summary>
/// 应付金额
/// </summary>
public decimal? Money
{
get;
set;
}
/// <summary>
/// 实收实付金额
/// </summary>
public decimal? PayMoney
{
get;
set;
}
/// <summary>
/// 发起备注
/// </summary>
public string Description
{
get;
set;
}
/// <summary>
/// 组价URL用于呈现单据相关信息
/// </summary>
public string URL { get; set; }
/// <summary>
/// 0-私账1-公账2-人民币现金3-外币现金
/// </summary>
public int? IsPublic
{
get; set;
}
/// <summary>
/// 回调参数
/// </summary>
public string Callback { get; set; }
/// <summary>
/// 预计付款日期
/// </summary>
public DateTime? PayDate
{
get; set;
}
/// <summary>
/// 出纳是否审核0-未审核1-已审核
/// </summary>
public int? Is_Cashier
{
get; set;
}
/// <summary>
/// 是否自动生成0-否1-是
/// </summary>
public int? Is_Auto
{
get; set;
}
/// <summary>
///回调类型0-默认回调1-不回调
/// </summary>
public int? CallType
{
get; set;
}
/// <summary>
/// 地接批量审批的唯一编码
/// </summary>
public string DijieOnlyCode { get; set; }
private int? otherType = 0;
/// <summary>
/// 其他来源类型 1追加团款 2单机票（2019-11-20 机票管理里 只有机票不绑团，其财务单据 需要在简易报表那边排除）
/// 3 平台 4 外交平台 （2019-12-05）ld
/// 5 酒店折让单 2019-12-18 ld
/// 6 手配费收入 2019-12-30 ld
/// 7 预付款冲抵 2019-12-30 ld
/// 8 领队返款单据 2020-03-30 ld
/// 9 电商单据 2020-04-01 ld
/// 10 财务收据 2020-04-09 ld
/// 11 赞羊返佣 2020-06-09 ld
/// 12 赞羊已发货退货退款 2020-06-09 ld
/// 13 赞羊成本 2020-06-09 ld
/// 14 赞羊未发货退款 2020-06-09 ld
/// 15 电商采购 2020-07-07 ld
/// 16 电商出库 2020-07-09 ld
/// 17 电商报损/报溢单 2020-07-28 ld
/// 18 电商推荐返佣 2020-08-05 ld
/// 19 微店返佣 2020-08-05 ld
/// 20 直播返佣 2020-08-18 ld
/// 21 赞羊订单其他收入 2020-08-18 ld
/// 22 赞羊订单其他支出 2020-08-18 ld
/// </summary>
public int? OtherType { get => otherType; set => otherType = value; }
/// <summary>
/// 平台/外交平台id
/// </summary>
public int? PlatformAccountId { get; set; }
/// <summary>
/// 相关的财务单据id
/// </summary>
public int? ReFinanceId { get; set; }
/// <summary>
/// 冲抵金额 只能用于预付款冲抵，有统计 不能共用 会冲突
/// </summary>
public decimal? MatchMoney { get; set; }
/// <summary>
/// 关联信息2
/// </summary>
public int? ReFinanceId2 { get; set; }
}
}
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @ 4ccb2bf9
...@@ -250,5 +250,21 @@ namespace Mall.Model.Entity.Product ...@@ -250,5 +250,21 @@ namespace Mall.Model.Entity.Product
/// 主播数量 /// 主播数量
/// </summary> /// </summary>
public int? LivePeopleNum { get; set; } public int? LivePeopleNum { get; set; }
/// <summary>
/// 其他应收金额
/// </summary>
public decimal? YSMoney { get; set; }
/// <summary>
/// 其他实收金额
/// </summary>
public decimal? RealMoney { get; set; }
/// <summary>
/// 其他应付金额
/// </summary>
public decimal? YFMoney { get; set; }
/// <summary>
/// 其他实付金额
/// </summary>
public decimal? PayMoney { get; set; }
} }
} }
Mall.Model/Extend/Finance/RB_Finance_Extend.cs 0 → 100644
View file @ 4ccb2bf9
using VT.FW.DB;
using Mall.Model.Entity.Finance;
using System;
using System.Collections.Generic;
namespace Mall.Model.Extend.Finance
{
/// <summary>
/// 财务单据扩展实体
/// </summary>
[Serializable]
[DB(ConnectionName = "FinanceConnection")]
public class RB_Finance_Extend : RB_Finance
{
/// <summary>
/// 电商订单id
/// </summary>
public int ECOrderId { get; set; }
/// <summary>
/// 电商订单ids
/// </summary>
public string ECOrderIds { get; set; }
/// <summary>
/// 订单明细id
/// </summary>
public int ECOrderDetailId { get; set; }
}
}
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
View file @ 4ccb2bf9
...@@ -3,6 +3,7 @@ using System; ...@@ -3,6 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Extend.Finance;
namespace Mall.Model.Extend.Product namespace Mall.Model.Extend.Product
{ {
...@@ -13,6 +14,10 @@ namespace Mall.Model.Extend.Product ...@@ -13,6 +14,10 @@ namespace Mall.Model.Extend.Product
[DB(ConnectionName = "DefaultConnection")] [DB(ConnectionName = "DefaultConnection")]
public class RB_Goods_OrderDetail_Extend : RB_Goods_OrderDetail public class RB_Goods_OrderDetail_Extend : RB_Goods_OrderDetail
{ {
/// <summary>
/// 订单财务单据列表
/// </summary>
public List<RB_Finance_Extend> FinanceList { get; set; }
/// <summary> /// <summary>
/// 是否直播订单 /// 是否直播订单
/// </summary> /// </summary>
......
Mall.Module.Product/OrderModule.cs
View file @ 4ccb2bf9
...@@ -10,6 +10,7 @@ using Mall.Common.Enum.User; ...@@ -10,6 +10,7 @@ using Mall.Common.Enum.User;
using Mall.Common.Plugin; using Mall.Common.Plugin;
using Mall.Model.Entity.Product; using Mall.Model.Entity.Product;
using Mall.Model.Extend.BaseSetUp; using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.Finance;
using Mall.Model.Extend.Product; using Mall.Model.Extend.Product;
using Mall.Model.Extend.User; using Mall.Model.Extend.User;
using Mall.Module.User; using Mall.Module.User;
...@@ -233,42 +234,44 @@ namespace Mall.Module.Product ...@@ -233,42 +234,44 @@ namespace Mall.Module.Product
/// 推荐供应商返佣比例 /// 推荐供应商返佣比例
/// </summary> /// </summary>
private readonly RB_SupplierCommissionRepository supplierCommissionRepository = new RB_SupplierCommissionRepository(); private readonly RB_SupplierCommissionRepository supplierCommissionRepository = new RB_SupplierCommissionRepository();
private RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository(); private readonly RB_FreeShippingRepository freeShippingRepository = new RB_FreeShippingRepository();
/// <summary> /// <summary>
/// 全局包邮记录 /// 全局包邮记录
/// </summary> /// </summary>
private RB_Goods_OrderDetailFreeShippingRepository orderDetailFreeShippingRepository = new RB_Goods_OrderDetailFreeShippingRepository(); private readonly RB_Goods_OrderDetailFreeShippingRepository orderDetailFreeShippingRepository = new RB_Goods_OrderDetailFreeShippingRepository();
/// <summary> /// <summary>
/// 微店基础 /// 微店基础
/// </summary> /// </summary>
private RB_MicroShop_BasicsRepository microShop_BasicsRepository = new RB_MicroShop_BasicsRepository(); private readonly RB_MicroShop_BasicsRepository microShop_BasicsRepository = new RB_MicroShop_BasicsRepository();
/// <summary> /// <summary>
/// 微店基础 /// 微店基础
/// </summary> /// </summary>
private RB_SmallShops_CustomRepository smallShops_CustomRepository = new RB_SmallShops_CustomRepository(); private readonly RB_SmallShops_CustomRepository smallShops_CustomRepository = new RB_SmallShops_CustomRepository();
/// <summary> /// <summary>
/// 微店 /// 微店
/// </summary> /// </summary>
private RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository(); private readonly RB_SmallShops_InfoRepository smallShops_InfoRepository = new RB_SmallShops_InfoRepository();
/// <summary> /// <summary>
/// 微店商品价格 /// 微店商品价格
/// </summary> /// </summary>
private RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository(); private readonly RB_SmallShops_PriceRepository smallShops_PriceRepository = new RB_SmallShops_PriceRepository();
/// <summary> /// <summary>
/// 微店佣金 /// 微店佣金
/// </summary> /// </summary>
private RB_SmallShops_CommissionRepository smallShops_CommissionRepository = new RB_SmallShops_CommissionRepository(); private readonly RB_SmallShops_CommissionRepository smallShops_CommissionRepository = new RB_SmallShops_CommissionRepository();
/// <summary>
/// 财务单据
/// </summary>
private readonly RB_FinanceRepository financeRepository = new RB_FinanceRepository();
/// <summary> /// <summary>
/// 微店返佣 /// 微店返佣
/// </summary> /// </summary>
private RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository(); private readonly RB_SmallShops_CommissionRepository smallShopsCommissionRepository = new RB_SmallShops_CommissionRepository();
/// <summary> /// <summary>
/// 微店信息 /// 微店信息
/// </summary> /// </summary>
private RB_SmallShops_InfoRepository smallShopsInfoRepository = new RB_SmallShops_InfoRepository(); private readonly RB_SmallShops_InfoRepository smallShopsInfoRepository = new RB_SmallShops_InfoRepository();
#region 购物车 #region 购物车
...@@ -5870,6 +5873,13 @@ namespace Mall.Module.Product ...@@ -5870,6 +5873,13 @@ namespace Mall.Module.Product
//查询订单明细 //查询订单明细
var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) }); var dlist = goods_OrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) });
var erList = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) }); var erList = goods_ExpressRelevanceRepository.GetList(new RB_Goods_ExpressRelevance_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, OrderIds = string.Join(",", list.Select(x => x.OrderId)) });
List<RB_Finance_Extend> flist = new List<RB_Finance_Extend>();
if (pageSize != 10000 && demodel.TenantId == 1)
{
//查询所有财务单据
string detailIds = string.Join(",", dlist.Select(x => x.Id));
flist = financeRepository.GetList(new RB_Finance_Extend() { ECOrderIds = string.Join(",", list.Select(x => x.OrderId)) });
}
//查询图片 //查询图片
List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>(); List<RB_Material_Info_Extend> Mlist = new List<RB_Material_Info_Extend>();
if (dlist.Any()) if (dlist.Any())
...@@ -5883,7 +5893,9 @@ namespace Mall.Module.Product ...@@ -5883,7 +5893,9 @@ namespace Mall.Module.Product
item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2; item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2;
item.GoodsSubName = GList.Where(x => x.Id == item.GoodsId).FirstOrDefault()?.SubName ?? ""; item.GoodsSubName = GList.Where(x => x.Id == item.GoodsId).FirstOrDefault()?.SubName ?? "";
}
item.FinanceList = flist.Where(x => x.ECOrderDetailId == item.Id).ToList();// 2020-08-19 新增财务单据列表
}
} }
string areaIds1 = string.Join(",", list.Select(x => x.Province ?? 0).Distinct()); string areaIds1 = string.Join(",", list.Select(x => x.Province ?? 0).Distinct());
string areaIds2 = string.Join(",", list.Select(x => x.City ?? 0).Distinct()); string areaIds2 = string.Join(",", list.Select(x => x.City ?? 0).Distinct());
...@@ -8971,7 +8983,48 @@ namespace Mall.Module.Product ...@@ -8971,7 +8983,48 @@ namespace Mall.Module.Product
return flag; return flag;
} }
/// <summary>
/// 修改订单其他费用
/// </summary>
/// <param name="model"></param>
/// <param name="money"></param>
/// <param name="otherType"></param>
/// <param name="type"></param>
/// <param name="remark"></param>
/// <returns></returns>
public bool SetECUpdateOrderOtherMoney(RB_Goods_OrderDetail_Extend model, int money, int otherType, int type, string remark)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
if (type == 1)
{
if (otherType == 21)
{
keyValues.Add(nameof(RB_Goods_OrderDetail.YSMoney), (model.YSMoney ?? 0) + money);
}
else
{
keyValues.Add(nameof(RB_Goods_OrderDetail.RealMoney), (model.RealMoney ?? 0) + money);
}
}
else {
if (otherType == 21)
{
keyValues.Add(nameof(RB_Goods_OrderDetail.YFMoney), (model.YFMoney ?? 0) + money);
}
else
{
keyValues.Add(nameof(RB_Goods_OrderDetail.PayMoney), (model.PayMoney ?? 0) + money);
}
}
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_OrderDetail.Id),
FiledValue=model.Id,
OperatorEnum=OperatorEnum.Equal
}
};
return goods_OrderDetailRepository.Update(keyValues, wheres);
}
/// <summary> /// <summary>
......
Mall.Repository/Finance/RB_FinanceRepository.cs 0 → 100644
View file @ 4ccb2bf9
using Mall.Common.Enum;
using Mall.Model.Entity.Finance;
using Mall.Model.Extend.Finance;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using VT.FW.DB;
namespace Mall.Repository.Finance
{
/// <summary>
/// 财务单据仓储
/// </summary>
public partial class RB_FinanceRepository : RepositoryBase<RB_Finance>
{
/// <summary>
/// 获取电商订单所有财务单据
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public List<RB_Finance_Extend> GetList(RB_Finance_Extend model)
{
string where = "1=1 AND A.Is_Auto=0 ";
where += string.Format(" AND A." + nameof(RB_Finance.Status) + " <> 4");
where += string.Format(" AND E." + nameof(RB_Finance.Status) + " <> 4");
//集团
if (model.RB_Group_Id > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.RB_Group_Id) + " ={0}", model.RB_Group_Id);
}
//单据状态
if (model.Status >= 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.Status) + " ={0}", (int)model.Status);
}
if (model.Type > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.Type) + " ={0}", (int)model.Type);
}
//订单号
if (model.OrderID > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.OrderID) + " ={0}", model.OrderID);
}
//对象类型
if (model.ClientType > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.ClientType) + " ={0}", (int)model.ClientType);
}
//汇款人
if (!string.IsNullOrEmpty(model.RemitterName))
{
where += string.Format(" AND A." + nameof(RB_Finance.RemitterName) + " like '%{0}%' ", model.RemitterName);
}
//付款对象
if (model.ClientID > 0)
{
where += string.Format(" AND A." + nameof(RB_Finance.ClientID) + " ={0}", model.ClientID);
}
if (model.ECOrderId > 0) {
where += string.Format(" AND E." + nameof(RB_ECFinanceId_Relation.ECOrderId) + " ={0}", model.ECOrderId);
}
if (!string.IsNullOrEmpty(model.ECOrderIds)) {
where += string.Format(" AND E." + nameof(RB_ECFinanceId_Relation.ECOrderId) + " in({0})", model.ECOrderIds);
}
string sql = $@"
select A.FrID,A.Status,A.Type,E.ECOrderId,E.ECOrderDetailId from RB_Finance A
inner join RB_ECFinanceId_Relation E on A.FrID = E.FinanceId
where {where} order by FrID desc
";
return Get<RB_Finance_Extend>(sql).ToList();
}
}
}
Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs
View file @ 4ccb2bf9
...@@ -376,5 +376,44 @@ namespace Mall.WebApi.Controllers.Finance ...@@ -376,5 +376,44 @@ namespace Mall.WebApi.Controllers.Finance
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
#endregion #endregion
#region 电商其他费用
/// <summary>
/// 更新电商订单其他费用
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult SetECUpdateOrderOtherMoney(object request)
{
JObject parms1 = JObject.Parse(request.ToString());
string msg = EncryptionHelper.AesDecrypt(parms1.GetStringValue("msg"), Config.FinanceKey);
var parms = JObject.Parse(msg.ToString());
int OrderId = parms.GetInt("OrderId", 0);
int OrderDetailId = parms.GetInt("OrderDetailId", 0);
int Money = parms.GetInt("Money", 0);
int OtherType = parms.GetInt("OtherType", 0);//应收21 应付22
int Type = parms.GetInt("Type", 0);//应收1 实收2
string Remark = parms.GetStringValue("Remark");
if (OrderDetailId <= 0)
{
return ApiResult.ParamIsNull("请传递订单明细id");
}
var model = orderModule.GetOrderDetailInfo(OrderDetailId);
if (model.TenantId != 1) {
return ApiResult.ParamIsNull("只能修改和平的");
}
bool flag = orderModule.SetECUpdateOrderOtherMoney(model, Money, OtherType, Type, Remark);
if (flag)
{
return ApiResult.Success();
}
else {
return ApiResult.Failed();
}
}
#endregion
} }
} }
\ No newline at end of file
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ 4ccb2bf9
...@@ -96,7 +96,15 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -96,7 +96,15 @@ namespace Mall.WebApi.Controllers.MallBase
y.Number, y.Number,
y.IsBindExpress, y.IsBindExpress,
y.FreeShippingRemarks, y.FreeShippingRemarks,
y.SmallShopsCostPrice y.SmallShopsCostPrice,
SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new {
z.FrID,
z.Status
}),
ZFinanceList = y.FinanceList.Where(z => z.Type == 2).Select(z => new {
z.FrID,
z.Status
})
}), }),
x.Consignee, x.Consignee,
x.Mobile, x.Mobile,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment