Skip to content

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

页面修改

parent 1f9a6ad3
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 21 deletions
Mall.Module.Product/OrderModule.cs
View file @ 66b2ecb6
...@@ -511,10 +511,13 @@ namespace Mall.Module.Product ...@@ -511,10 +511,13 @@ namespace Mall.Module.Product
{ {
var sModel = speciList.Where(x => x.GoodsId == item.GoodsId).ToList()[i]; var sModel = speciList.Where(x => x.GoodsId == item.GoodsId).ToList()[i];
var svModel = speciVList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationId == sModel.Id && x.Sort == Convert.ToInt32(KeyArr[i])).FirstOrDefault(); var svModel = speciVList.Where(x => x.GoodsId == item.GoodsId && x.SpecificationId == sModel.Id && x.Sort == Convert.ToInt32(KeyArr[i])).FirstOrDefault();
item.SpecificationList.Add(sModel.Name + ":" + svModel.Name); if (sModel != null && svModel != null)
if (i == 0 && !string.IsNullOrEmpty(svModel.Image))
{ {
item.CoverImage = svModel.Image; item.SpecificationList.Add(sModel.Name + ":" + svModel.Name);
if (i == 0 && !string.IsNullOrEmpty(svModel.Image))
{
item.CoverImage = svModel.Image;
}
} }
} }
} }
......
Mall.Module.User/UserModule.cs
View file @ 66b2ecb6
...@@ -2503,6 +2503,7 @@ namespace Mall.Module.User ...@@ -2503,6 +2503,7 @@ namespace Mall.Module.User
}; };
item.IsPublic = 5;//默认平台虚拟账户 item.IsPublic = 5;//默认平台虚拟账户
#region 查询所有的订单 #region 查询所有的订单
List<Model.Entity.Finance.RB_ECFinanceId_Relation> ECList = new List<Model.Entity.Finance.RB_ECFinanceId_Relation>(); List<Model.Entity.Finance.RB_ECFinanceId_Relation> ECList = new List<Model.Entity.Finance.RB_ECFinanceId_Relation>();
if (!string.IsNullOrEmpty(remitModel.ReOrderIds) || !string.IsNullOrEmpty(remitModel.ReVipIds)) if (!string.IsNullOrEmpty(remitModel.ReOrderIds) || !string.IsNullOrEmpty(remitModel.ReVipIds))
...@@ -2604,12 +2605,15 @@ namespace Mall.Module.User ...@@ -2604,12 +2605,15 @@ namespace Mall.Module.User
LogHelper.WriteInfo("打款：" + apiResult); LogHelper.WriteInfo("打款：" + apiResult);
if (apir.resultCode == 1) if (apir.resultCode == 1)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Distributor_Remit.FinanceId), Convert.ToInt32(apir.data.ToString())}, { nameof(RB_Distributor_Remit.FinanceId), Convert.ToInt32(apir.data.ToString())},
{ nameof(RB_Distributor_Remit.AuditRemark), remark+" 自动生成财务单据:"+apir.data.ToString()}, { nameof(RB_Distributor_Remit.AuditRemark), remark+" 自动生成财务单据:"+apir.data.ToString()},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Distributor_Remit.Id), FiledName=nameof(RB_Distributor_Remit.Id),
FiledValue=remitId, FiledValue=remitId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -2620,11 +2624,14 @@ namespace Mall.Module.User ...@@ -2620,11 +2624,14 @@ namespace Mall.Module.User
else else
{ {
//记录自动生成失败，需手动新增财务单据 //记录自动生成失败，需手动新增财务单据
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Distributor_Remit.AuditRemark), remark+" 自动生成财务单据失败，请手动添加财务单据！"}, { nameof(RB_Distributor_Remit.AuditRemark), remark+" 自动生成财务单据失败，请手动添加财务单据！"},
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Distributor_Remit.Id), FiledName=nameof(RB_Distributor_Remit.Id),
FiledValue=remitId, FiledValue=remitId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -2636,10 +2643,8 @@ namespace Mall.Module.User ...@@ -2636,10 +2643,8 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, string.Format("OrderIncomeFinanceModule_remitId:{0} TenantId:{1} MallBaseId:{2} remark:{3} erpEmpId:{4}", remitId, TenantId, MallBaseId, remark, erpEmpId));
LogHelper.Write(ex);
} }
return flag; return flag;
} }
......
Mall.WebApi/Controllers/Product/AppletGoodsController.cs
View file @ 66b2ecb6
...@@ -1188,17 +1188,20 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1188,17 +1188,20 @@ namespace Mall.WebApi.Controllers.MallBase
int Sort = Convert.ToInt32(ssarr[0]); int Sort = Convert.ToInt32(ssarr[0]);
string pic_url = model.SpecificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath; string pic_url = model.SpecificationList[0].SpecificationValueList.Where(x => x.Sort == Sort).FirstOrDefault()?.ImagePath;
List<object> attr_list = new List<object>(); List<object> attr_list = new List<object>();
for (int i = 0; i < ssarr.Length; i++) if (ssarr != null && ssarr.Length > 0)
{ {
var smodel = model.SpecificationList[i]; for (int i = 0; i < ssarr.Length; i++)
var svmodel = smodel.SpecificationValueList.Where(x => x.Sort == Convert.ToInt32(ssarr[i])).FirstOrDefault();
attr_list.Add(new
{ {
attr_group_name = smodel.Name, var smodel = model.SpecificationList[i];
attr_group_id = smodel.Sort, var svmodel = smodel.SpecificationValueList.Where(x => x.Sort == Convert.ToInt32(ssarr[i])).FirstOrDefault();
attr_id = svmodel.Id, attr_list.Add(new
attr_name = svmodel.Name {
}); attr_group_name = smodel.Name,
attr_group_id = smodel.Sort,
attr_id = svmodel.Id,
attr_name = svmodel.Name
});
}
} }
decimal price_member = item.SellingPrice ?? 0;//未设会员价格的话 就为销售价格 decimal price_member = item.SellingPrice ?? 0;//未设会员价格的话 就为销售价格
if (model.EnjoyMember == 1 && model.SeparateSetMember == 1) if (model.EnjoyMember == 1 && model.SeparateSetMember == 1)
......
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