页面修改

Mall.Module.Product/ProductModule.cs

@@ -18,6 +18,7 @@ using Mall.Repository.BaseSetUp;
 using Mall.Repository.Product;
 using Mall.Repository.User;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NPOI.SS.Formula.Functions;
 using VT.FW.DB;
 
@@ -231,8 +232,9 @@ namespace Mall.Module.Product
         /// <param name="pageSize"></param>
         /// <param name="count"></param>
         /// <param name="demodel"></param>
+        /// <param name="IsGetShare">1-获取分销佣金</param>
         /// <returns></returns>
-        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel)
+        public List<RB_Goods_Extend> GetAppletGoodsPageListForZY(int pageIndex, int pageSize, out long count, RB_Goods_Extend demodel,int IsGetShare=0)
         {
             var list = goodsRepository.GetAppletGoodsPageList(pageIndex, pageSize, out count, demodel);
             if (list.Any())
@@ -447,10 +449,16 @@ namespace Mall.Module.Product
                         item.FreeShippingModel = new RB_FreeShipping_Extend();
                     }
                     //2020-08-06 Add by:W End
-                }
-
-
+                    if (IsGetShare == 1)
+                    {
+                        var obj = GetAppletGoodsInfo_V2(item.Id, (demodel?.UserId ?? 0), (demodel?.SmallShopsId ?? 0), demodel.TenantId, demodel.MallBaseId);
+                        if (obj != null)
+                        {
+                            JObject jobj = JObject.Parse(obj.ToString());
 
+                        }
+                    }
+                }
             }
             return list;
         }

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -169,12 +169,14 @@ namespace Mall.WebApi.Controllers.MallBase
             }
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
             RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
-
+            JObject newParms = JObject.Parse(parms.msg.ToString());
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             demodel.GoodsStatus = 1;//只查询销售中的
             demodel.SmallShopsId = parms.SmallShopsId;
             int UserId = parms.UserId;
+            //HK2020-09-07新增
+            int IsGetShare = newParms.GetInt("IsGetShare");
             RB_Member_User_Extend userModel = new RB_Member_User_Extend();
             RB_Member_Grade_Extend memberGrade = new RB_Member_Grade_Extend();
             if (UserId > 0)
@@ -188,7 +190,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     demodel.SmallShopsId = userModel.SmallShopId;
                 }
             }
-            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            var list = productModule.GetAppletGoodsPageListForZY(pagelist.pageIndex, pagelist.pageSize, out long count, demodel,IsGetShare:IsGetShare);
             List<object> RList = new List<object>();
             if (list.Any())
             {