Skip to content

M
mall.oytour.com
Commit c5028a10 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 14c0f9ca
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 19 deletions
Mall.Model/Extend/Product/RB_Goods_Extend.cs
View file @ c5028a10
......@@ -206,5 +206,10 @@ namespace Mall.Model.Extend.Product
/// </summary>
public int IsVideo { get; set; }
/// <summary>
/// ERP商品对象
/// </summary>
public object ERPGoodObj { get; set; }
}
}
Mall.Module.Product/ProductModule.cs
View file @ c5028a10
......@@ -449,13 +449,13 @@ namespace Mall.Module.Product
item.FreeShippingModel = new RB_FreeShipping_Extend();
}
//2020-08-06 Add by:W End
//HK 2020-09-08新增
if (IsGetShare == 1)
{
var obj = GetAppletGoodsInfo_V2(item.Id, (demodel?.UserId ?? 0), (demodel?.SmallShopsId ?? 0), demodel.TenantId, demodel.MallBaseId);
if (obj != null)
{
JObject jobj = JObject.Parse(obj.ToString());
item.ERPGoodObj = obj;
}
}
}
......
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @ c5028a10
......@@ -159,7 +159,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = 0;
item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice;
}
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
// item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
......@@ -173,11 +174,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{
item.GrossProfitRate = ((item.AllPrice + item.YSMoney) == 0 ? 0 : Math.Round((item.GrossProfit / (item.AllPrice + item.YSMoney)), 4, MidpointRounding.AwayFromZero) * 100);
}
// item.Paid = item.PaidCostMoney + item.RemitFXCommission;
//item.GrossProfit = (item.AllPrice + item.RealMoney) - item.CouponMoney - item.RefundActual - item.ALLCommission - item.PayMoney;
//item.GrossProfitRate = (item.AllPrice + item.RealMoney - item.RefundActual) == 0 ? 0 : Math.Round((item.GrossProfit / ((item.AllPrice + item.RealMoney - item.RefundActual) == 0 ? 1 : (item.AllPrice + item.RealMoney - item.RefundActual))), 2, MidpointRounding.AwayFromZero);
}
pagelist.count = Convert.ToInt32(count);
pagelist.pageData = list;
......@@ -378,7 +374,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = 0;
item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice;
}
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
// item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
......@@ -392,13 +389,6 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{
item.GrossProfitRate = ((item.AllPrice + item.YSMoney) == 0 ? 0 : Math.Round((item.GrossProfit / (item.AllPrice + item.YSMoney)), 4, MidpointRounding.AwayFromZero) * 100);
}
//item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
//item.NoPaid = item.ALLCommission;
//item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
//item.Paid = item.PaidCostMoney + item.RemitFXCommission;
//item.GrossProfit = (item.AllPrice + item.RealMoney) - item.CouponMoney - item.RefundActual - item.ALLCommission - item.PayMoney;
//item.GrossProfitRate = (item.AllPrice + item.RealMoney - item.RefundActual) == 0 ? 0 : Math.Round((item.GrossProfit / ((item.AllPrice + item.RealMoney - item.RefundActual) == 0 ? 1 : (item.AllPrice + item.RealMoney - item.RefundActual))), 2, MidpointRounding.AwayFromZero);
}
#region 组装数据
int Num = 0;
......@@ -587,7 +577,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = 0;
item.RefundActual = item.RefundActual > 0 ? item.RefundActual : item.AllPrice;
}
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.RefundActual + item.YFMoney;
// item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ c5028a10
......@@ -170,11 +170,16 @@ namespace Mall.WebApi.Controllers.MallBase
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
JObject newParms = JObject.Parse(parms.msg.ToString());
int UserId = parms.UserId;
if (newParms.GetInt("ERPUserId") > 0)
{
UserId = newParms.GetInt("ERPUserId");
}
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
demodel.GoodsStatus = 1;//只查询销售中的
demodel.SmallShopsId = parms.SmallShopsId;
int UserId = parms.UserId;
demodel.UserId = UserId;
//HK2020-09-07新增
int IsGetShare = newParms.GetInt("IsGetShare");
RB_Member_User_Extend userModel = new RB_Member_User_Extend();
......@@ -351,7 +356,8 @@ namespace Mall.WebApi.Controllers.MallBase
goods_stock = model.InventoryNum,
goods_num = model.InventoryNum,
marketingLogo= model.MarketingLogo,
video_type=model.VideoType
video_type=model.VideoType,
erpgoodobj=model.ERPGoodObj
});
}
}
......
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