Commit 58a7ec53 authored by liudong1993's avatar liudong1993

1

parent 7eff8193
......@@ -5071,7 +5071,11 @@ namespace Mall.Module.Product
PaidCostMoney = 0,
LiveCommission = item.LiveCommission,
LiveFinanceIds = "",
LivePeopleNum = 1
LivePeopleNum = 1,
PayMoney = 0,
YFMoney = 0,
RealMoney = 0,
YSMoney = 0
}, trans);
item.Id = detailId;
if (detailId > 0 && SatisfiedGoodsList.Any())
......
......@@ -6,14 +6,13 @@ 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>
public partial class RB_FinanceRepository : BaseRepository<RB_Finance>
{
/// <summary>
......@@ -69,7 +68,7 @@ namespace Mall.Repository.Finance
}
string sql = $@"
select A.FrID,A.Status,A.Type,E.ECOrderId,E.ECOrderDetailId from RB_Finance A
select A.FrID,A.Status,A.Type,A.Is_Cashier,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
";
......
......@@ -97,13 +97,19 @@ namespace Mall.WebApi.Controllers.MallBase
y.IsBindExpress,
y.FreeShippingRemarks,
y.SmallShopsCostPrice,
y.YSMoney,
y.RealMoney,
y.YFMoney,
y.PayMoney,
SFinanceList = y.FinanceList.Where(z => z.Type == 1).Select(z => new {
z.FrID,
z.Status
z.Status,
z.Is_Cashier
}),
ZFinanceList = y.FinanceList.Where(z => z.Type == 2).Select(z => new {
z.FrID,
z.Status
z.Status,
z.Is_Cashier
})
}),
x.Consignee,
......
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