Skip to content

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

页面修改

parent f680ba76
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 70 deletions
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ f5a1dfa9
......@@ -7,6 +7,7 @@ using System.Linq;
using Mall.Model.Entity.User;
using Mall.Common.Enum.Goods;
using Mall.Model.Query;
using VT.FW.DB.Dapper;
namespace Mall.Repository.Product
{
......@@ -26,6 +27,7 @@ namespace Mall.Repository.Product
/// <returns></returns>
public List<RB_Goods_Order_Extend> GetOrderPageList(int pageIndex, int pageSize, out long count, RB_Goods_Order_Extend dmodel)
{
var parameters = new DynamicParameters();
string where = $" 1=1 and o.{nameof(RB_Goods_Order.Status)}=0";
if (dmodel.TenantId > 0)
{
......@@ -74,15 +76,18 @@ namespace Mall.Repository.Product
}
if (!string.IsNullOrEmpty(dmodel.OrderNo))
{
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like '%{dmodel.OrderNo}%'";
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like @OrderNo ";
parameters.Add("OrderNo", "%" + dmodel.OrderNo.Trim() + "%");
}
if (!string.IsNullOrEmpty(dmodel.MerchantsNo))
{
where += $@" and o.{nameof(RB_Goods_Order.MerchantsNo)} like '%{dmodel.MerchantsNo}%'";
where += $@" and o.{nameof(RB_Goods_Order.MerchantsNo)} like @MerchantsNo ";
parameters.Add("MerchantsNo", "%" + dmodel.MerchantsNo.Trim() + "%");
}
if (!string.IsNullOrEmpty(dmodel.UserName))
{
where += $@" and u.{nameof(RB_Member_User.Name)} like '%{dmodel.UserName}%'";
where += $@" and u.{nameof(RB_Member_User.Name)} like @UserName ";
parameters.Add("UserName", "%" + dmodel.UserName.Trim() + "%");
}
if (dmodel.UserId > 0)
{
......@@ -122,7 +127,7 @@ 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).ToList();
return GetPage<RB_Goods_Order_Extend>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
/// <summary>
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ f5a1dfa9
......@@ -1424,64 +1424,64 @@ namespace Mall.WebApi.Controllers.MallBase
var model = productModule.GetProductGoodsInfo(GoodsId, req.TenantId, req.MallBaseId);
return ApiResult.Success("", new
{
model.Id,
model.Name,
model.CarouselImage,
model.VideoAddress,
model.CustomShareTitles,
model.CustomShareImage,
model.CustomShareImagePath,
model.GoodsStatus,
model.InventoryNum,
model.DefaultSpecificationName,
model.IsCustomSpecification,
model.Sort,
model.SellingPrice,
model.OriginalPrice,
model.Unit,
model.CostPrice,
model.IsGoodsNegotiable,
model.SalesNum,
model.GoodsNumbers,
model.GoodsWeight,
model.IsDefaultService,
model.GoodsService,
model.FreightId,
model.FreightName,
model.FormsId,
model.FormsName,
model.LimitBuyGoodsNum,
model.LimitBuyOrderNum,
model.FullNumPinkage,
model.FullMoneyPinkage,
model.IsAreaBuy,
model.IntegralPresent,
model.IntegralPresentType,
model.PointsDeduction,
model.PointsDeductionType,
model.IsMultipleDeduction,
model.GoodsDetails,
model.SeparateDistribution,
model.SeparateDistributionType,
model.SeparateDistributionMoneyType,
model.EnjoyMember,
model.SeparateSetMember,
model.IsQuickBuy,
model.SupplierId,
model.IsProxy,
model.ProxyType,
model.ProxyRises,
model.ProxyMoney,
model.IsProcurement,
model.Commission,
model.IsLiveGoods,
CategoryList = model.CategoryList.Select(x => new
model?.Id,
model?.Name,
model?.CarouselImage,
model?.VideoAddress,
model?.CustomShareTitles,
model?.CustomShareImage,
model?.CustomShareImagePath,
model?.GoodsStatus,
model?.InventoryNum,
model?.DefaultSpecificationName,
model?.IsCustomSpecification,
model?.Sort,
model?.SellingPrice,
model?.OriginalPrice,
model?.Unit,
model?.CostPrice,
model?.IsGoodsNegotiable,
model?.SalesNum,
model?.GoodsNumbers,
model?.GoodsWeight,
model?.IsDefaultService,
model?.GoodsService,
model?.FreightId,
model?.FreightName,
model?.FormsId,
model?.FormsName,
model?.LimitBuyGoodsNum,
model?.LimitBuyOrderNum,
model?.FullNumPinkage,
model?.FullMoneyPinkage,
model?.IsAreaBuy,
model?.IntegralPresent,
model?.IntegralPresentType,
model?.PointsDeduction,
model?.PointsDeductionType,
model?.IsMultipleDeduction,
model?.GoodsDetails,
model?.SeparateDistribution,
model?.SeparateDistributionType,
model?.SeparateDistributionMoneyType,
model?.EnjoyMember,
model?.SeparateSetMember,
model?.IsQuickBuy,
model?.SupplierId,
model?.IsProxy,
model?.ProxyType,
model?.ProxyRises,
model?.ProxyMoney,
model?.IsProcurement,
model?.Commission,
model?.IsLiveGoods,
CategoryList = model?.CategoryList.Select(x => new
{
x.Id,
x.CategoryId,
x.CategoryName
}),
SpecificationList = model.SpecificationList.Select(x => new
SpecificationList = model?.SpecificationList.Select(x => new
{
x.Id,
x.EnabledImage,
......@@ -1496,7 +1496,7 @@ namespace Mall.WebApi.Controllers.MallBase
y.Sort
})
}),
SpecificationPriceList = model.SpecificationPriceList.Select(x => new
SpecificationPriceList = model?.SpecificationPriceList.Select(x => new
{
x.Id,
x.GoodsNumbers,
......@@ -1508,14 +1508,14 @@ namespace Mall.WebApi.Controllers.MallBase
x.Commission,
x.CostMoney
}),
AreaList = model.AreaList.Select(x => new
AreaList = model?.AreaList.Select(x => new
{
x.Id,
x.AreaId,
x.AreaName,
x.AreaType
}),
DistributionCommissionList = model.DistributionCommissionList.Select(x => new
DistributionCommissionList = model?.DistributionCommissionList.Select(x => new
{
x.Id,
x.DistributorGrade,
......@@ -1524,7 +1524,7 @@ namespace Mall.WebApi.Controllers.MallBase
x.ThreeCommission,
x.TwoCommission
}),
DistributionCommissionTreeList = model.DistributionCommissionTreeList.Select(x => new
DistributionCommissionTreeList = model?.DistributionCommissionTreeList.Select(x => new
{
x.Id,
x.SpecificationSort,
......@@ -1537,14 +1537,14 @@ namespace Mall.WebApi.Controllers.MallBase
y.TwoCommission
})
}),
MemberPriceList = model.MemberPriceList.Select(x => new
MemberPriceList = model?.MemberPriceList.Select(x => new
{
x.Id,
x.MemberGrade,
x.MemberPrice,
x.SpecificationSort
}),
MemberPriceTreeList = model.MemberPriceTreeList.Select(x => new
MemberPriceTreeList = model?.MemberPriceTreeList.Select(x => new
{
x.Id,
x.SpecificationSort,
......@@ -1555,13 +1555,13 @@ namespace Mall.WebApi.Controllers.MallBase
y.MemberPrice
})
}),
model.CarouselImageList,
model.ServiceList,
model.PresentFXGrade,
model.PresentFXMonth,
model.Advertising,
model.SubName,
model.MarketingLogo
model?.CarouselImageList,
model?.ServiceList,
model?.PresentFXGrade,
model?.PresentFXMonth,
model?.Advertising,
model?.SubName,
model?.MarketingLogo
});
}
......
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