提交代码

Mall.Repository/Product/RB_GoodsRepository.cs

@@ -50,10 +50,10 @@ namespace Mall.Repository.Product
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
-            if (dmodel.RetailStore > -1)
-            {
-                where += $@" and g.{nameof(RB_Goods_Extend.RetailStore)}={dmodel.RetailStore}";
-            }
+            //if (dmodel.RetailStore > -1)
+            //{
+            //    where += $@" and g.{nameof(RB_Goods_Extend.RetailStore)}={dmodel.RetailStore}";
+            //}
             if (!string.IsNullOrEmpty(dmodel.StoresIds))
             {
                 where += $@" and FIND_IN_SET('{dmodel.StoresIds}',g.{nameof(RB_Goods_Extend.StoresIds)})";
@@ -1612,7 +1612,7 @@ where {where} group by g.Id order by col.Id desc";
         public List<RB_Goods_Extend> GetSynchroPageList(int pageIndex, int pageSize, out long rowCount, RB_Goods_Extend dmodel, bool IsAllClassify = false)
         {
             DynamicParameters parameters = new DynamicParameters();
-            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0 ";
+            string where = $" 1=1 and g.{nameof(RB_Goods_Extend.Status)}=0  and g.RetailStore=1";
             string sourceWhere = "";
             if (dmodel.GoodsClassify == 3)
             {//查询非司导商品
@@ -1638,10 +1638,7 @@ where {where} group by g.Id order by col.Id desc";
             {
                 where += $@" and g.{nameof(RB_Goods_Extend.MallBaseId)}={dmodel.MallBaseId}";
             }
-            if (dmodel.RetailStore > -1)
-            {
-                where += $@" and g.{nameof(RB_Goods_Extend.RetailStore)}={dmodel.RetailStore}";
-            }
+           
             if (!string.IsNullOrEmpty(dmodel.StoresIds))
             {
                 where += $@" and FIND_IN_SET('{dmodel.StoresIds}',g.{nameof(RB_Goods_Extend.StoresIds)})";
@@ -1658,7 +1655,7 @@ where {where} group by g.Id order by col.Id desc";
                 }
                 else if (dmodel.Isynchro == 2)
                 {
-                    where += $@" and synchro.{nameof(RB_Goods_Extend.Isynchro)}=0";
+                    where += $@" and IFNULL(synchro.{nameof(RB_Goods_Extend.Isynchro)},0)=0";
                 }
             }
             sourceWhere = $@"and TenantId={dmodel.SourceTenantId} and MallBaseId={dmodel.SourceMallBaseId}";

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -3082,8 +3082,8 @@ namespace Mall.WebApi.Controllers.MallBase
 
             };
 
-            demodel.SourceMallBaseId = parms.TenantId;
-            demodel.SourceTenantId = parms.MallBaseId;
+            demodel.SourceMallBaseId = parms.MallBaseId;
+            demodel.SourceTenantId = parms.TenantId;
             decimal MinProfitRate = 0;
             if (demodel.TenantId == 1)
             {

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -193,6 +193,25 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", oldLogisticsList);
         }
 
+
+
+
+        /// <summary>
+        /// 获取供应商下拉列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult GetAllSupplierList()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_Supplier_Extend>(RequestParm.msg.ToString());
+          //  query.TenantId = UserInfo.TenantId;
+           // query.MallBaseId = parms.MallBaseId;
+            var oldLogisticsList = supplierModule.GetList(query);
+            return ApiResult.Success("", oldLogisticsList);
+        }
+
         /// <summary>
         /// 获取分销商下拉列表
         /// </summary>