Skip to content

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

页面修改

parent d72c618e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 141 deletions
Mall.Model/Extend/Product/RB_Goods_OrderDetail_Extend.cs
View file @ 71a37d5e
......@@ -380,5 +380,15 @@ namespace Mall.Model.Extend.Product
/// 进阶小课堂扩展JSON对象
/// </summary>
public string EduJsonData { get; set; }
/// <summary>
/// 进阶小课堂扩展对象
/// </summary>
public GoodsJsonItem EduData { get; set; }
/// <summary>
/// 绑定物品列表
/// </summary>
public List<RB_Goods_Relevance_Extend> GoodsRelevanceList { get; set; }
}
}
Mall.Module.Product/OrderModule_Part.cs
View file @ 71a37d5e
......@@ -1700,22 +1700,33 @@ namespace Mall.Module.Product
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>();
if (dlist.Any())
{
//剑鱼兄需求 2020=07-30 再查询一次商品表
string GoodsIds = string.Join(",", dlist.Select(x => x.GoodsId).Distinct());
//获取绑定物品列表
var goodsRelevanceList = goods_RelevanceRepository.GetGoodsRelevanceListRepository(new RB_Goods_Relevance_Extend()
{
TenantId = demodel.TenantId,
MallBaseId = demodel.MallBaseId,
QGoodsIds=GoodsIds
});
var GList = goodsRepository.GetSingleListForGoodsSubName(new RB_Goods_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, GoodsIds = GoodsIds }, true);
#region 查询商品申请售后
string OrderDetialIds = string.Join(",", dlist.Select(x => x.Id));
var afterSaleList = goods_OrderAfterSaleRepository.GetList(new RB_Goods_OrderAfterSale_Extend() { OrderDetailIds = OrderDetialIds, Type = 1, MallBaseId = demodel.MallBaseId, TenantId = demodel.TenantId });
#endregion
foreach (var item in dlist)
{
item.EduData = goodsRepository.ParsingEduJsonRepository(item.EduJsonData);
item.CoverImagePath = item.CoverImage;
item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2;
item.GoodsRelevanceList = goodsRelevanceList?.Where(qitem => qitem.GoodsId == item.GoodsId)?.ToList() ?? new List<RB_Goods_Relevance_Extend>();
item.GoodsSubName = GList.Where(x => x.Id == item.GoodsId).FirstOrDefault()?.SubName ?? "";
item.FinanceList = flist.Where(x => x.ECOrderDetailId == item.Id).ToList();// 2020-08-19 新增财务单据列表
......@@ -1747,7 +1758,6 @@ namespace Mall.Module.Product
var arealist = destinationRepository.GetDictvalueListForIds(areaIds);
//2020-08-25 Add By:W Start
List<RB_Member_DiscountCoupon_Extend> memberCouponList = new List<RB_Member_DiscountCoupon_Extend>();
if (list.Any(x => !string.IsNullOrWhiteSpace(x.CouponsIds)))
{
......@@ -1762,7 +1772,6 @@ namespace Mall.Module.Product
item.MemberDiscountCouponList = new List<RB_Member_DiscountCoupon_Extend>();
if (!string.IsNullOrWhiteSpace(item.CouponsIds))
{
foreach (var itemCoupons in item.CouponsIds.Split(','))
{
item.MemberDiscountCouponList.AddRange(memberCouponList.Where(x => itemCoupons == x.Id.ToString()));
......@@ -6770,8 +6779,17 @@ namespace Mall.Module.Product
{
educationCouponList = reserveMemberCouponRepository.GetList(new RB_Reserve_MemberCoupon_Extend { TenantId = tenantId, MallBaseId = mallBaseId, Ids = educationCouponIds });
}
string goodsIds = string.Join(",", dlist.Select(qitem => qitem.GoodsId));
var goodsRelevanceList = goods_RelevanceRepository.GetGoodsRelevanceListRepository(new RB_Goods_Relevance_Extend()
{
TenantId = tenantId,
MallBaseId = mallBaseId,
QGoodsIds = goodsIds
});
foreach (var item in dlist)
{
item.GoodsRelevanceList = goodsRelevanceList?.Where(qitem => qitem.GoodsId == item.GoodsId)?.ToList() ?? new List<RB_Goods_Relevance_Extend>();
item.EduData = goodsRepository.ParsingEduJsonRepository(item.EduJsonData);
item.CoverImagePath = item.CoverImage;
item.IsBindExpress = erList.Where(x => x.OrderDetailId == item.Id).Any() ? 1 : 2;
item.ServicepersonalName = serviceList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
......@@ -6916,6 +6934,42 @@ namespace Mall.Module.Product
}
#endregion 2020-08-25 Add By:W End
List<object> infoList = new List<object>();
foreach (var item in model.DetailList)
{
infoList.Add(new
{
item.Id,
item.GoodsName,
item.CoverImage,
item.CoverImagePath,
SpecificationList = JsonConvert.DeserializeObject<List<string>>((item?.Specification ?? "")),
item.Unit_Price,
item.Number,
item.Original_Price,
item.Final_Price,
item.IsBindExpress,
item.FreeShippingRemarks,
item.SmallShopsCostPrice,
item.DeductionCommission,
CouponMoney = item.CouponMoney ?? 0,
InsuranceMoney = item.InsuranceMoney ?? 0,
IntegralMoney = item.IntegralMoney ?? 0,
IntegralNumber = item.IntegralNumber ?? 0,
item.ServiceTime,
item.ServiceDate,
item.ServicepersonalName,
MemberEducationCouponList = item?.ReserveCouponList.Select(z => new
{
z.Name,
z.UseHeXiao,
z.HeXiao
}),
item.EduData,
item.GoodsRelevanceList,
});
}
return ApiResult.Success("", new
{
......@@ -7019,35 +7073,7 @@ namespace Mall.Module.Product
SmallShopsName = x.Name,
x.Commission
}),
DetailList = model.DetailList.Select(x => new
{
x.Id,
x.GoodsName,
x.CoverImage,
x.CoverImagePath,
SpecificationList = JsonConvert.DeserializeObject<List<string>>((x?.Specification ?? "")),
x.Unit_Price,
x.Number,
x.Original_Price,
x.Final_Price,
x.IsBindExpress,
x.FreeShippingRemarks,
x.SmallShopsCostPrice,
x.DeductionCommission,
CouponMoney = x.CouponMoney ?? 0,
InsuranceMoney = x.InsuranceMoney ?? 0,
IntegralMoney = x.IntegralMoney ?? 0,
IntegralNumber = x.IntegralNumber ?? 0,
x.ServiceTime,
x.ServiceDate,
x.ServicepersonalName,
MemberEducationCouponList = x?.ReserveCouponList.Select(z => new
{
z.Name,
z.UseHeXiao,
z.HeXiao
}),
}),
DetailList = infoList,
});
}
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 71a37d5e
......@@ -155,11 +155,12 @@ namespace Mall.Repository.Product
}
string sql = $@"SELECT o.*,u.Name as UserName,sshop.`Name` as SmallShopsName FROM rb_goods_order o
INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId
INNER JOIN rb_member_user u on o.UserId=u.Id
LEFT JOIN rb_smallshops_info as sshop on o.SmallShopsId=sshop.Id
where {where} group by o.OrderId order by o.CreateDate desc";
string sql = $@"
SELECT o.*,u.Name as UserName,sshop.`Name` as SmallShopsName
FROM rb_goods_order o INNER JOIN rb_goods_orderdetail od on o.OrderId=od.OrderId
INNER JOIN rb_member_user u on o.UserId=u.Id
LEFT JOIN rb_smallshops_info as sshop on o.SmallShopsId=sshop.Id
WHERE {where} group by o.OrderId order by o.CreateDate desc";
return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
......@@ -1127,10 +1128,13 @@ LEFT JOIN rb_goods as c on a.GoodsId=c.Id {where}
{
where += $" AND DATE_FORMAT(b.{nameof(RB_Goods_Order.CreateDate)},'%Y-%m-%d' )<= DATE_FORMAT('{dmodel.EndDate}','%Y-%m-%d' )";
}
string sql = $@" SELECT MAX(c.`Name`) as Name,SUM(a.Final_Price) as PayMoney ,SUM(a.Number) as BuyNum from rb_goods_orderdetail as a
LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
LEFT JOIN rb_member_user as c on b.UserId=c.Id
GROUP BY c.Id ORDER BY SUM(a.Final_Price) desc LIMIT 100 ";
string sql = $@"
SELECT MAX(c.`Name`) as Name,SUM(a.Final_Price) as PayMoney ,SUM(a.Number) as BuyNum
from rb_goods_orderdetail as a LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
LEFT JOIN rb_member_user as c on b.UserId=c.Id
GROUP BY c.Id
ORDER BY SUM(a.Final_Price) desc
LIMIT 100 ";
return Get<DataStatistics_Query>(sql).ToList();
}
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ 71a37d5e
......@@ -722,8 +722,6 @@ namespace Mall.WebApi.Controllers.MallBase
{
openId = Common.Plugin.WeiXinHelper.GetWeChatOpenId(miniProgram.MiniAppId, miniProgram.MiniAppSecret, code);
}
//string newOpenId = "oyEzY5J8llEXYMeC2O7Y06g2SO4M";
//Common.Plugin.WeiXinHelper.GetWeChat(miniProgram.MiniAppId, miniProgram.MiniAppSecret, newOpenId);
}
var newGuid ="MiniAppOpenId_"+Guid.NewGuid().ToString();
var miniAppUserCache = new MiniAppUserCache()
......
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