提交代码

Mall.Module.Product/ProductModule.cs

@@ -4349,7 +4349,6 @@ namespace Mall.Module.Product
                         { nameof(RB_Goods.EnjoyMember),demodel.EnjoyMember},
                         { nameof(RB_Goods.SeparateSetMember),demodel.SeparateSetMember},
                         { nameof(RB_Goods.IsQuickBuy),demodel.IsQuickBuy},
-                        { nameof(RB_Goods.SupplierId),demodel.SupplierId},
                        
                     };
                     }

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -520,13 +520,19 @@ where {where}
             {
                 where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
             }
+
             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
             {
-                where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
+                if (dmodel.IsZanYangUse == 1)
+                {
+                    where += $@" and {nameof(RB_Member_User.SmallShopId)}=0";
+                }
             }
 
             string sql = $@"
@@ -572,15 +578,23 @@ select * from RB_Member_User where {where} order by CreateDate desc
             {
                 where += $@" and {nameof(RB_Member_User.SuperiorId)}={dmodel.SuperiorId}";
             }
+
             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
             {
-                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))
             {
                 where += $@" and {nameof(RB_Member_User.Id)} in({dmodel.UserIds})";

Mall.WebApi/Controllers/MarketingCenter/CouponController.cs

@@ -206,7 +206,8 @@ namespace Mall.WebApi.Controllers.MarketingCenter
                 ResidueNum = x.ReceiveNum,
                 x.PickupCenter,
                 x.SmallShopName,
-                x.SmallShopId
+                x.SmallShopId,
+                x.IsZanYangUse
             });
             return ApiResult.Success("", pagelist);
         }