Commit f2c89104 authored by 吴春's avatar 吴春

提交代码

parent 65c689f8
...@@ -4349,7 +4349,6 @@ namespace Mall.Module.Product ...@@ -4349,7 +4349,6 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember}, { nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember},
{ nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember}, { nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember},
{ nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy}, { nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy},
{ nameof(RB_Goods.SupplierId),demodel.SupplierId},
}; };
} }
......
...@@ -520,13 +520,19 @@ where {where} ...@@ -520,13 +520,19 @@ where {where}
{ {
where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}"; where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
} }
if (dmodel.SmallShopId > 0) if (dmodel.SmallShopId > 0)
{ {
where += $@" and {nameof(RB_Member_User.SmallShopId)}={dmodel.SmallShopId} and {nameof(RB_Member_User_Extend.IsZanYangUse)}=0";
where += $@" and {nameof(RB_Member_User.SmallShopId)}={dmodel.SmallShopId} ";
} }
else else
{ {
where += $@" and {nameof(RB_Member_User.SmallShopId)}=0"; if (dmodel.IsZanYangUse == 1)
{
where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
}
} }
string sql = $@" string sql = $@"
...@@ -572,15 +578,23 @@ select * from RB_Member_User where {where} order by CreateDate desc ...@@ -572,15 +578,23 @@ select * from RB_Member_User where {where} order by CreateDate desc
{ {
where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}"; where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
} }
if (dmodel.SmallShopId > 0) if (dmodel.SmallShopId > 0)
{ {
where += $@" and {nameof(RB_Member_User.SmallShopId)}={dmodel.SmallShopId} and {nameof(RB_Member_User_Extend.IsZanYangUse)}=0";
where += $@" and {nameof(RB_Member_User.SmallShopId)}={dmodel.SmallShopId} ";
} }
else else
{ {
where += $@" and {nameof(RB_Member_User.SmallShopId)}=0"; if (dmodel.IsZanYangUse == 1)
{
where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
}
} }
if (!string.IsNullOrEmpty(dmodel.UserIds)) if (!string.IsNullOrEmpty(dmodel.UserIds))
{ {
where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})"; where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";
......
...@@ -206,7 +206,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter ...@@ -206,7 +206,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter
ResidueNum = x.ReceiveNum, ResidueNum = x.ReceiveNum,
x.PickupCenter, x.PickupCenter,
x.SmallShopName, x.SmallShopName,
x.SmallShopId x.SmallShopId,
x.IsZanYangUse
}); });
return ApiResult.Success("", pagelist); return ApiResult.Success("", pagelist);
} }
......
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