Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Entity/Product/RB_Groupbuy_Activity.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 拼团活动表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Groupbuy_Activity
+    {
+        /// <summary>
+        /// 活动编号[主键]
+        /// </summary>
+        public int ActivityId { get; set; }
+
+        /// <summary>
+        /// 活动开始时间
+        /// </summary>
+        public DateTime StartTime { get; set; }
+
+        /// <summary>
+        /// 活动结束时间
+        /// </summary>
+        public DateTime EndTime { get; set; }
+
+        /// <summary>
+        /// 商品编号
+        /// </summary>
+        public int GoodId { get; set; }
+
+        /// <summary>
+        /// 上架状态(1-未开始,2-进行中,3-已结束,4-下架中,5-删除)
+        /// </summary>
+        public int GoodsStatus { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+
+        /// <summary>
+        /// 售价
+        /// </summary>
+        public decimal SellingPrice { get; set; }
+
+        /// <summary>
+        /// 是否开启虚拟成团(1-开启)
+        /// </summary>
+        public int Is_Auto_Add_Robot { get; set; }
+
+        /// <summary>
+        /// 已团商品数
+        /// </summary>
+        public int Virtual_Sales { get; set; }
+
+        /// <summary>
+        /// 是否允许单独购买(1-开启)
+        /// </summary>
+        public int Is_Alone_Buy { get; set; }
+
+        /// <summary>
+        /// 是否默认商品服务(1是,2否)
+        /// </summary>
+        public int IsDefaultService { get; set; }
+
+        /// <summary>
+        /// 商品服务  json格式
+        /// </summary>
+        public string GoodsService { get; set; }
+
+        /// <summary>
+        /// 运费设置Id
+        /// </summary>
+        public int FreightId { get; set; }
+
+        /// <summary>
+        /// 自定义表单Id
+        /// </summary>
+        public int FormsId { get; set; }
+
+        /// <summary>
+        /// 商品限购数量
+        /// </summary>
+        public int Confine_Count { get; set; }
+
+        /// <summary>
+        /// 订单限购数量
+        /// </summary>
+        public int Confine_Order_Count { get; set; }
+
+        /// <summary>
+        /// 单品满件包邮
+        /// </summary>
+        public int Pieces { get; set; }
+
+        /// <summary>
+        /// 单品满额包邮
+        /// </summary>
+        public int Forehead { get; set; }
+
+        /// <summary>
+        /// 区域购买(1-开启)
+        /// </summary>
+        public int Is_Area_Limit { get; set; }
+
+        /// <summary>
+        /// 允许购买区域
+        /// </summary>
+        public string Area_limit { get; set; }
+
+        /// <summary>
+        /// 添加到快速购买(1-开启)
+        /// </summary>
+        public int Is_quick_shop { get; set; }
+
+        /// <summary>
+        /// 积分值
+        /// </summary>
+        public int Give_integral { get; set; }
+
+        /// <summary>
+        /// 积分类型(1-固定值,2-百分比)
+        /// </summary>
+        public int Give_integral_type { get; set; }
+
+        /// <summary>
+        /// 积分抵扣(1-开启)
+        /// </summary>
+        public int Is_forehead_integral { get; set; }
+
+        /// <summary>
+        /// 最多抵扣(1-固定值,2-百分比)
+        /// </summary>
+        public int Forehead_integral_type { get; set; }
+
+        /// <summary>
+        /// 允许多件累计抵扣(1-允许)
+        /// </summary>
+        public int Accumulative { get; set; }
+
+        /// <summary>
+        /// 卡卷编号
+        /// </summary>
+        public string CardIds { get; set; }
+
+        /// <summary>
+        /// 自定义分享标题
+        /// </summary>
+        public string App_share_title { get; set; }
+
+        /// <summary>
+        /// 自定义分享图片
+        /// </summary>
+        public string App_share_pic { get; set; }
+
+        /// <summary>
+        /// 商户小程序
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 商户编号
+        /// </summary>
+        public int TenantId { get; set; }
+    }
+}

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -627,6 +627,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 下边距
         /// </summary>
         public string bottom { get; set; }
+
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
+        public string background { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/Product/RB_Groupbuy_Activity_Extend.cs

+using Mall.Model.Entity.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联区域表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Groupbuy_Activity_Extend: RB_Groupbuy_Activity
+    {
+
+    }
+}

Mall.Module.Product/GroupBuyConfigActivityModule.cs

+using Mall.Model.Extend.Product;
+using Mall.Repository.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+using System.Linq;
+
+namespace Mall.Module.Product
+{
+    /// <summary>
+    /// 拼团活动处理类
+    /// </summary>
+    public class GroupBuyConfigActivityModule
+    {
+        /// <summary>
+        /// 拼团活动仓储层对象
+        /// </summary>
+        private readonly RB_Groupbuy_ActivityRepository groupbuy_ActivityRepository = new RB_Groupbuy_ActivityRepository();
+
+        /// <summary>
+        ///  获取拼团活动分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Groupbuy_Activity_Extend> GetGroupbuyActivityPageListModule(int pageIndex, int pageSize, out long rowsCount, RB_Groupbuy_Activity_Extend query)
+        {
+            var list= groupbuy_ActivityRepository.GetGroupbuyActivityPageListRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string Ids = string.Join(",", list.Select(qitem => qitem.ActivityId));
+                if (!string.IsNullOrEmpty(Ids))
+                { 
+                
+                }
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 获取活动实体类
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Groupbuy_Activity_Extend GetGroupbuyActivityEntityModule(RB_Groupbuy_Activity_Extend query)
+        {
+            var extModel = groupbuy_ActivityRepository.GetGroupbuyActivityEntityRepository(query);
+            return extModel;
+        }
+
+        /// <summary>
+        /// 新增修改拼团活动
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetGroupbuyActivityModule(RB_Groupbuy_Activity_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.ActivityId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_Groupbuy_Activity_Extend.StartTime),extModel.StartTime},
+                    { nameof(RB_Groupbuy_Activity_Extend.EndTime),extModel.EndTime},
+                    { nameof(RB_Groupbuy_Activity_Extend.GoodId),extModel.GoodId},
+                    { nameof(RB_Groupbuy_Activity_Extend.GoodsStatus),extModel.GoodsStatus},
+                    { nameof(RB_Groupbuy_Activity_Extend.Sort),extModel.Sort},
+                    { nameof(RB_Groupbuy_Activity_Extend.SellingPrice),extModel.SellingPrice},
+                    { nameof(RB_Groupbuy_Activity_Extend.Is_Auto_Add_Robot),extModel.Is_Auto_Add_Robot},
+                    { nameof(RB_Groupbuy_Activity_Extend.Virtual_Sales),extModel.Virtual_Sales},
+                    { nameof(RB_Groupbuy_Activity_Extend.Is_Alone_Buy),extModel.Is_Alone_Buy},
+                    { nameof(RB_Groupbuy_Activity_Extend.IsDefaultService),extModel.IsDefaultService},
+                    { nameof(RB_Groupbuy_Activity_Extend.GoodsService),extModel.GoodsService},
+                    { nameof(RB_Groupbuy_Activity_Extend.FreightId),extModel.FreightId},
+                    { nameof(RB_Groupbuy_Activity_Extend.FormsId),extModel.FormsId},
+                    { nameof(RB_Groupbuy_Activity_Extend.Confine_Count),extModel.Confine_Count},
+                    { nameof(RB_Groupbuy_Activity_Extend.Confine_Order_Count),extModel.Confine_Order_Count},
+                    { nameof(RB_Groupbuy_Activity_Extend.Pieces),extModel.Pieces},
+                    { nameof(RB_Groupbuy_Activity_Extend.Forehead),extModel.Forehead},
+                    { nameof(RB_Groupbuy_Activity_Extend.Is_Area_Limit),extModel.Is_Area_Limit},
+                    { nameof(RB_Groupbuy_Activity_Extend.Area_limit),extModel.Area_limit},
+                    { nameof(RB_Groupbuy_Activity_Extend.Is_quick_shop),extModel.Is_quick_shop},
+                    { nameof(RB_Groupbuy_Activity_Extend.Give_integral),extModel.Give_integral},
+                    { nameof(RB_Groupbuy_Activity_Extend.Give_integral_type),extModel.Give_integral_type},
+                    { nameof(RB_Groupbuy_Activity_Extend.Is_forehead_integral),extModel.Is_forehead_integral},
+                    { nameof(RB_Groupbuy_Activity_Extend.Forehead_integral_type),extModel.Forehead_integral_type},
+                    { nameof(RB_Groupbuy_Activity_Extend.Accumulative),extModel.Accumulative},
+                    { nameof(RB_Groupbuy_Activity_Extend.CardIds),extModel.CardIds},
+                    { nameof(RB_Groupbuy_Activity_Extend.App_share_title),extModel.App_share_title},
+                    { nameof(RB_Groupbuy_Activity_Extend.App_share_pic),extModel.App_share_pic},
+                };
+                flag = groupbuy_ActivityRepository.Update(fileds, new WhereHelper(nameof(RB_Groupbuy_Activity_Extend.ActivityId), extModel.ActivityId));
+            }
+            else
+            {
+                var newId = groupbuy_ActivityRepository.Insert(extModel);
+                extModel.ActivityId = newId;
+                flag = newId > 0;
+            }
+            return flag;
+        }
+    }
+}

Mall.Module.Property/PropertyModule.cs

@@ -1305,6 +1305,18 @@ namespace Mall.Module.Property
         {
             return supplies_MaterialRepository.GetList(dmodel);
         }
+
+
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_Material_Extend> GetHaveInventory(RB_Supplies_Material_Extend dmodel)
+        {
+            return supplies_MaterialRepository.GetHaveInventory(dmodel);
+        }
         #endregion
 
 

Mall.Repository/Product/RB_Groupbuy_ActivityRepository.cs

+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 拼团活动仓储层
+    /// </summary>
+    public class RB_Groupbuy_ActivityRepository : BaseRepository<RB_Groupbuy_Activity>
+    {
+        /// <summary>
+        ///  获取拼团活动分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowsCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Groupbuy_Activity_Extend> GetGroupbuyActivityPageListRepository(int pageIndex, int pageSize, out long rowsCount, RB_Groupbuy_Activity_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Groupbuy_Activity
+WHERE 1=1 
+");
+            return GetPage<RB_Groupbuy_Activity_Extend>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取活动实体类
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Groupbuy_Activity_Extend GetGroupbuyActivityEntityRepository(RB_Groupbuy_Activity_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT * 
+FROM RB_Groupbuy_Activity
+WHERE 1=1 
+");
+            return Get<RB_Groupbuy_Activity_Extend>(builder.ToString()).FirstOrDefault();
+        }
+
+    }
+}

Mall.Repository/Property/RB_Supplies_InventoryRepository.cs

@@ -24,8 +24,9 @@ namespace Mall.Repository.Property
         {
             string where = " where 1=1 ";
             where += string.Format(" AND {0}={1}", nameof(RB_Supplies_Inventory_Extend.Status), 0);
-            where += $@" and RB_Group_Id={dmodel.RB_Group_Id}";            
-            if (dmodel.WarehouseId > 0) {
+            where += $@" and RB_Group_Id={dmodel.RB_Group_Id}";
+            if (dmodel.WarehouseId > 0)
+            {
                 where += " and " + nameof(RB_Supplies_Inventory_Extend.WarehouseId) + $" ={dmodel.WarehouseId}";
             }
             if (dmodel.SuppliesId > 0)
@@ -56,7 +57,8 @@ namespace Mall.Repository.Property
             {
                 where += " and " + nameof(RB_Supplies_Inventory_Extend.SuppliesId) + $" ={dmodel.SuppliesId}";
             }
-            if (!string.IsNullOrEmpty(dmodel.WarehouseIdStr)) {
+            if (!string.IsNullOrEmpty(dmodel.WarehouseIdStr))
+            {
                 where += " and " + nameof(RB_Supplies_Inventory_Extend.WarehouseId) + $" in({dmodel.WarehouseIdStr})";
             }
             if (!string.IsNullOrEmpty(dmodel.SuppliesIdStr))
@@ -87,6 +89,11 @@ left join rb_supplies_material sm on si.SuppliesId=sm.Id
             return Get<RB_Supplies_Inventory_Extend>(sql).FirstOrDefault()?.Number ?? 0;
         }
 
+
+
+
+       
+
         /// <summary>
         /// 获取库存日志
         /// </summary>

Mall.Repository/Property/RB_Supplies_MaterialRepository.cs

@@ -116,5 +116,37 @@ left join rb_property_category pc on sm.CategoryId=pc.Id
             return Get<RB_Supplies_Material_Extend>(sql).ToList();
         }
 
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Supplies_Material_Extend> GetHaveInventory(RB_Supplies_Material_Extend dmodel)
+        {
+            string where = " where 1=1 ";
+           
+            where += string.Format(" AND sm.{0}={1}", nameof(RB_Supplies_Material.Status), 0);
+            where += $@" and sm.RB_Group_Id={dmodel.RB_Group_Id}";
+
+           
+            if (!string.IsNullOrWhiteSpace(dmodel.GoodsIds))
+            {
+                where += $@" and sm.{nameof(RB_Supplies_Material.GoodsId)} in ({dmodel.GoodsIds})";
+            }
+            if (dmodel.TenantId > 0)
+            {
+                where += " and sm." + nameof(RB_Supplies_Material_Extend.TenantId) + "=" + dmodel.TenantId;
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += " and sm." + nameof(RB_Supplies_Material_Extend.MallBaseId) + "=" + dmodel.MallBaseId;
+            }
+            string sql = $@" select sm.*,si.Number as InventoryNum
+from rb_supplies_material sm
+LEFT join RB_Supplies_Inventory si on si.SuppliesId=sm.Id  AND si.Status=0
+{where} order by si.Id desc";
+            return Get<RB_Supplies_Material_Extend>(sql).ToList();
+        }
     }
 }

Mall.WebApi/Controllers/Mall/MallHelper.cs

@@ -180,9 +180,10 @@ namespace Mall.WebApi.Controllers
                                             });
 
                                             List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
-                                            foreach (var tempGood in tempGoodsList)
+                                            foreach (var goodItem in childItem.goodsList)
                                             {
                                                 var lastItem = new GoodsDetailsItem2();
+                                                var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
                                                 if (tempGood != null && tempGood.Id > 0)
                                                 {
                                                     lastItem.id = tempGood.Id;
@@ -267,9 +268,10 @@ namespace Mall.WebApi.Controllers
                                         GoodsStatus = 1
                                     });
                                     List<GoodsDetailsItem2> newGoodsList = new List<GoodsDetailsItem2>();
-                                    foreach (var tempGood in tempGoodsList)
+                                    foreach (var goodItem in goodsData.list)
                                     {
                                         var childItem = new GoodsDetailsItem2();
+                                        var tempGood = tempGoodsList?.Where(qitem => qitem.Id == goodItem.id)?.FirstOrDefault();
                                         if (tempGood != null && tempGood.Id > 0)
                                         {
                                             childItem.id = tempGood.Id;

Mall.WebApi/Controllers/Product/GroupBuyController.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Mall.Common.API;
+using Mall.Model.Extend.Product;
 using Mall.Model.Extend.User;
+using Mall.Module.Product;
 using Mall.Module.User;
 using Mall.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -23,6 +25,12 @@ namespace Mall.WebApi.Controllers.Product
         /// </summary>
         private readonly GroupBuyConfigModule groupBuyConfigModule = new GroupBuyConfigModule();
 
+        /// <summary>
+        /// 拼团活动
+        /// </summary>
+        private readonly GroupBuyConfigActivityModule groupBuyConfigActivityModule = new GroupBuyConfigActivityModule();
+
+        #region 拼团配置设置
         /// <summary>
         /// 添加修改拼团配置
         /// </summary>
@@ -69,7 +77,7 @@ namespace Mall.WebApi.Controllers.Product
         /// 获取拼团配置实体
         /// </summary>
         /// <returns></returns>
-        public ApiResult GetGroupBuyConfigModule()
+        public ApiResult GetGroupBuyConfig()
         {
             var query = Common.Plugin.JsonHelper.DeserializeObject<RB_GroupBuyConfig_Extend>(RequestParm.msg.ToString());
             query.MallBaseId = RequestParm.MallBaseId;
@@ -77,5 +85,48 @@ namespace Mall.WebApi.Controllers.Product
             var extModel = groupBuyConfigModule.GetGroupBuyConfigModule(query);
             return ApiResult.Success(data: extModel);
         }
+        #endregion
+
+        /// <summary>
+        /// 获取拼团活动列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGroupbuyActivityPageList()
+        {
+            ResultPageModel pageModel  =Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var list = groupBuyConfigActivityModule.GetGroupbuyActivityPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); ;
+            pageModel.pageData = list;
+            pageModel.count = Convert.ToInt32(rowsCount);
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 获取拼团活动实体类
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetGroupbuyActivity()
+        {
+            var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            query.MallBaseId = RequestParm.MallBaseId;
+            query.TenantId = RequestParm.TenantId;
+            var extModel = groupBuyConfigActivityModule.GetGroupbuyActivityEntityModule(query);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 新增修改拼团活动
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetGroupbuyActivity()
+        {
+            var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Groupbuy_Activity_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            bool flag = groupBuyConfigActivityModule.SetGroupbuyActivityModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1159,8 +1159,22 @@ namespace Mall.WebApi.Controllers.MallBase
         {
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
-            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString());
-
+            JObject parameters = JObject.Parse(parms.msg.ToString());
+            RB_Goods_Order_Extend demodel = new RB_Goods_Order_Extend()
+            {
+                OrderSource = (UserSourceEnum)parameters.GetInt("OrderSource"),
+                OrderType = parameters.GetInt("OrderType"),
+                DeliveryMethod = (OrderDeliveryMethodEnum)parameters.GetInt("DeliveryMethod"),
+                OrderId = parameters.GetInt("OrderId"),
+                StartTime = parameters.GetStringValue("StartTime"),
+                EndTime = parameters.GetStringValue("EndTime"),
+                OrderStatus = (OrderStatusEnum)parameters.GetInt("OrderStatus"),
+                OrderNo = parameters.GetStringValue("OrderNo"),
+                UserName = parameters.GetStringValue("UserName"),
+                UserId = parameters.GetInt("UserId"),
+                GoodsName = parameters.GetStringValue("GoodsName"),
+                DistributionUserId = parameters.GetInt("DistributionUserId")
+            };
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;
             demodel.Recycled = 2;

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1125,7 +1125,18 @@ namespace Mall.WebApi.Controllers.MallBase
         {
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
-            RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
+            JObject parameters = JObject.Parse(RequestParm.msg.ToString());
+            RB_Goods_Extend demodel = new RB_Goods_Extend()
+            {
+                Name=parameters.GetStringValue("Name"),
+                GoodsStatus=parameters.GetInt("GoodsStatus"),
+                IsSelectSellOut=parameters.GetInt("IsSelectSellOut"),
+                CategoryIds=parameters.GetStringValue("CategoryIds"),
+                Id=parameters.GetInt("Id"),
+                StartTime=parameters.GetStringValue("StartTime"),
+                EndTime=parameters.GetStringValue("EndTime"),
+                OrderBy=parameters.GetInt("OrderBy")
+            };
 
             demodel.TenantId = parms.TenantId;
             demodel.MallBaseId = parms.MallBaseId;

Mall.WebApi/Controllers/Property/WarehouseOutController.cs

@@ -146,8 +146,8 @@ namespace Mall.WebApi.Controllers.Property
 
             //获取商品的出库规格物料信息
             var goodsIds = string.Join(",", demodel.WarehouseOutGoodsList.Select(x => x.NewGoodsId));
-            var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
-
+             var materialList = propertyModule.GetSuppliesMaterialList(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
+            // var materialList = propertyModule.GetHaveInventory(new RB_Supplies_Material_Extend { GoodsIds = goodsIds, RB_Group_Id = requestParm.ERPGroupId, TenantId = requestParm.TenantId, MallBaseId = requestParm.MallBaseId });
             foreach (var item in demodel.WarehouseOutGoodsList)
             {
                 if (item.NewNumber <= 0)
@@ -164,6 +164,10 @@ namespace Mall.WebApi.Controllers.Property
                     {
                         return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "不存在物料请先同步");
                     }
+                    //if (!materialModel.InventoryNum.HasValue || (materialModel.InventoryNum ?? 0) <= 0)
+                    //{
+                    //    return ApiResult.Failed("订单号：" + orderGoodsDetail?.OrderNo + "的商品：" + orderGoodsDetail?.GoodsName + "库存不足");
+                    //}
                     item.NewSpecificationSort = materialModel.SpecificationKey;
                     item.NewSpecification = materialModel.SpecificationName;
                 }

Mall.WebApi/Controllers/User/UserController.cs

@@ -1420,7 +1420,17 @@ namespace Mall.WebApi.Controllers.User
         {
             var parms = RequestParm;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
-            RB_Distributor_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Info_Extend>(parms.msg.ToString());
+            var parameters = JObject.Parse(RequestParm.msg.ToString());
+            RB_Distributor_Info_Extend demodel = new RB_Distributor_Info_Extend()
+            {
+                UserId = parameters.GetInt("UserId"),
+                AuditStatus = (DistributorAuditStatusEnum)parameters.GetInt("AuditStatus"),
+                GradeId = parameters.GetInt("GradeId"),
+                Name = parameters.GetStringValue("Name"),
+                Source = (UserSourceEnum)parameters.GetInt("Source"),
+                NickName = parameters.GetStringValue("NickName"),
+                Mobile = parameters.GetStringValue("Mobile")
+            };
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;