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

.gitignore

@@ -2,4 +2,6 @@ bin/
 obj/
 .vs/
 packages/
-/Properties
+/Properties
\ No newline at end of file
+Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml
+Mall.Model/Entity/Sign/RB_Sign_Setting.cs

Mall.Model/Entity/Product/RB_GroupBuy_Area.cs

+using System;
+using VT.FW.DB;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品关联区域表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_GroupBuy_Area
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品id
+        /// </summary>        
+        public int? GoodsId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区域id
+        /// </summary>        
+        public int? AreaId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区域类型  1国家  2省  3市  4区
+        /// </summary>        
+        public int? AreaType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/Product/RB_GroupBuy_Area_Extend.cs

+
+
+using VT.FW.DB;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品关联区域表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_GroupBuy_Area_Extend : RB_GroupBuy_Area
+    {
+        /// <summary>
+        /// 区域名称
+        /// </summary>
+        public string AreaName { get; set; }
+        /// <summary>
+        /// 商品ids
+        /// </summary>
+        public string GoodsIds { get; set; }
+    }
+}
\ No newline at end of file

Mall.Model/Extend/Product/RB_Groupbuy_Activity_Extend.cs

@@ -131,5 +131,10 @@ namespace Mall.Model.Extend.Product
         /// 服务列表
         /// </summary>
         public List<RB_ImageCommonModel> ServiceList { get; set; }
+
+        /// <summary>
+        /// 区域列表
+        /// </summary>
+        public List<RB_GroupBuy_Area_Extend> AreaList { get; set; }
     }
 }

Mall.Model/Query/OrderStatistics_Query.cs

@@ -248,5 +248,15 @@ namespace Mall.Model.Query
         /// </summary>
         public decimal RemitFXCommission { get; set; }
 
+
+        /// <summary>
+        /// 主播佣金
+        /// </summary>
+        public decimal LiveCommission { get; set; }
+        /// <summary>
+        /// 主播佣金生成的财务单据   逗号分隔
+        /// </summary>
+        public string LiveFinanceIds { get; set; }
+
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -8813,6 +8813,63 @@ namespace Mall.Module.Product
             return flag;
         }
 
+
+
+        /// <summary>
+        /// 修改商品订单成本价
+        /// </summary>
+        /// <param name="orderId"></param>
+        /// <param name="income"></param>
+        /// <param name="freightMoney"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public bool SetOrderSupplierId(int orderId, int SupplierId, int tenantId, int mallBaseId)
+        {
+            var orderModel = goods_OrderDetailRepository.GetEntity(orderId);
+            if (orderModel == null)
+            {
+                return false;
+            }
+            Dictionary<string, object> keyValues1 = new Dictionary<string, object>() {
+                { nameof(RB_Goods_OrderDetail.SupplierId),SupplierId }
+            };
+            List<WhereHelper> wheres1 = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Goods_OrderDetail.Id),
+                        FiledValue=orderModel.Id,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Goods_OrderDetail.TenantId),
+                        FiledValue=tenantId,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Goods_OrderDetail.MallBaseId),
+                        FiledValue=mallBaseId,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            var flag = goods_OrderDetailRepository.Update(keyValues1, wheres1);
+            if (flag)
+            {
+                //记录日志
+                Task.Run(() => goods_LogRepository.Insert(new RB_Goods_Log()
+                {
+                    Content = "修改订单商品：" + orderModel.GoodsName + "供应商ID:" + SupplierId + ";供应商历史ID:" + orderModel.SupplierId.ToString(),
+                    CreateDate = DateTime.Now,
+                    Id = 0,
+                    MallBaseId = mallBaseId,
+                    SourceId = orderModel.OrderId,
+                    TenantId = tenantId,
+                    Type = 1
+                }));
+            }
+            return flag;
+        }
+
+
         /// <summary>
         /// 根据订单好获取物流id
         /// </summary>

Mall.Module.User/SmallShopsModule.cs

@@ -288,6 +288,8 @@ namespace Mall.Module.User
                 CanRemitMoney,
                 basicsModel.MaxWithdrawal,
                 basicsModel.WithdrawalFree,
+                basicsModel.IsAllCommission,
+                basicsModel.MinWithdrawal,
                 IsWithdrawAll = 1,
                 WithdrawWayList = WayList.Select(x => new
                 {

Mall.Module.User/SupplierModule.cs

@@ -305,5 +305,19 @@ namespace Mall.Module.User
             }
             return clientBankAccountRepository.Exists(where);
         }
-    }
+
+
+
+        #region 获取财务单据付款人信息
+        /// <summary>
+        /// 根据查询条件获取客户账户列表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<RB_ClientBankAccount> GetClientBankAccountList(Model.Extend.Finance.RB_ClientBankAccount_Extend model)
+        {
+            return clientBankAccountRepository.GetList(model);
+        }
+            #endregion
+        }
 }

Mall.Repository/Finance/RB_ClientBankAccountRepository.cs

@@ -157,7 +157,7 @@ namespace Mall.Repository.Finance
             {
                 where += string.Format(" AND a." + nameof(RB_ClientBankAccount.CardNum) + " like '%{0}%' ", model.CardNum);
             }
-            string sql = $@"select a.* from {TableName} as a   {TableName}";
+            string sql = $@"select a.* from {TableName} as a   {where}";
             return Get<RB_ClientBankAccount>(sql).ToList();
         }
 

Mall.Repository/Product/RB_GroupBuy_AreaRepository.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_AreaRepository : BaseRepository<RB_GroupBuy_Area>
+    {
+        /// <summary>
+        /// 根据查询条件获取地区信息
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_GroupBuy_Area_Extend> GetGroupBuyAreaRepository(RB_GroupBuy_Area_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT ga.*,d.Name as AreaName 
+FROM rb_groupbuy_area ga INNER JOIN rb_destination d ON ga.AreaId=d.ID
+WHERE 1=1 
+");
+            builder.Append($"   and ga.{nameof(RB_GroupBuy_Area_Extend.Status)}=0 ");
+
+            if (query.TenantId > 0)
+            {
+                builder.Append($@" and ga.{nameof(RB_GroupBuy_Area_Extend.TenantId)}={query.TenantId}");
+            }
+            if (query.MallBaseId > 0)
+            {
+                builder.Append($@" and ga.{nameof(RB_GroupBuy_Area_Extend.MallBaseId)}={query.MallBaseId}");
+            }
+            if (query.Id > 0)
+            {
+                builder.Append($@" and ga.{nameof(RB_GroupBuy_Area_Extend.Id)}={query.Id}");
+            }
+            if (query.GoodsId > 0)
+            {
+                builder.Append($@" and ga.{nameof(RB_GroupBuy_Area_Extend.GoodsId)}={query.GoodsId}");
+            }
+            if (!string.IsNullOrEmpty(query.GoodsIds))
+            {
+                builder.Append($@" and ga.{nameof(RB_GroupBuy_Area_Extend.GoodsId)} in({query.GoodsIds})");
+            }
+
+            builder.AppendFormat("  order by ga.Id desc  ");
+            return Get<RB_GroupBuy_Area_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/CAP/TestController.cs

@@ -45,8 +45,7 @@ namespace Mall.WebApi.Controllers.CAP
         [DotNetCore.CAP.CapSubscribe("show.time")]
         public void CheckReceiveMessage(string result)
         {
-            string str = "";
-            
+            //string str = "";
             Console.WriteLine(result);
         }
     }

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -79,6 +79,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 PaymentWayName = x.PaymentWay.GetEnumName(),
                 DetailList = x.DetailList.Select(y => new
                 {
+                    y.SupplierId,
                     y.SupplierName,
                     y.FreightCostMoney,
                     y.FreightMoney,
@@ -944,7 +945,7 @@ namespace Mall.WebApi.Controllers.MallBase
 
 
 
-        #region 修改运费成本以及商品成本
+        #region 修改运费成本以及商品成本、供应商
         /// <summary>
         /// 修改订单商品成本运费
         /// </summary>
@@ -1007,7 +1008,35 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
-
+        /// <summary>
+        /// 修改订单供应商
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetOrderSupplierId()
+        {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("Id", 0);
+            int SupplierId = parms.GetInt("SupplierId", 0);
+            if (OrderId <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递订单明细id");
+            }
+            if (SupplierId < 0)
+            {
+                return ApiResult.ParamIsNull("请传递供应商信息");
+            }
+            bool flag = orderModule.SetOrderSupplierId(OrderId, SupplierId, req.TenantId, req.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
         #endregion
 
         #endregion

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -332,7 +332,7 @@ namespace Mall.WebApi.Controllers.User
                             result.Add(newOrderGoods);
                         }
                     }
-                     if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
+                    if (demodel.IsSelectAll == 0 || demodel.IsSelectAll == 2)
                     {
                         if (orderGoodsItem.FreightCostMoney.HasValue && orderGoodsItem.FreightCostMoney.Value > 0 && orderGoodsItem.FreightFinanceId <= 0)
                         {
@@ -450,5 +450,37 @@ namespace Mall.WebApi.Controllers.User
         }
         #endregion
 
+
+
+
+        #region 获取付款对象的列表
+
+
+        [HttpPost]
+        public ApiResult GetClientBankAccountList()
+        {
+            var parms = RequestParm;
+            Model.Extend.Finance.RB_ClientBankAccount_Extend demodel = JsonConvert.DeserializeObject<Model.Extend.Finance.RB_ClientBankAccount_Extend>(RequestParm.msg.ToString());
+            demodel.RB_Group_Id = 2;
+            demodel.RB_Branch_Id = -1;
+            demodel.Type = Common.Enum.Finance.ClientTypeEnum.Other;
+            var list = supplierModule.GetClientBankAccountList(demodel);
+
+            var result = list.Select(x => new
+            {
+                x.ID,
+                x.OpenBankName,
+                x.AccountAlias,
+                x.AccountClassify,
+                x.AccountHolder,
+                x.AccountType,
+                x.BankId,
+                x.CardNum,
+                x.RB_Branch_Id,
+                x.RB_Group_Id
+            });
+            return ApiResult.Success("", result);
+        }
+        #endregion
     }
 }
\ No newline at end of file

Mall.WindowsService/Mall.WindowsService.csproj.user

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <_LastSelectedProfileId>F:\工作\微途\外网代码\mall.oytour.com_2\Mall.WindowsService\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Update="WindowsService.cs">
+      <SubType>Component</SubType>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishProtocol>FileSystem</PublishProtocol>
+    <Configuration>Release</Configuration>
+    <Platform>Any CPU</Platform>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <PublishDir>F:\mallservices</PublishDir>
+    <SelfContained>true</SelfContained>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishTrimmed>False</PublishTrimmed>
+  </PropertyGroup>
+</Project>
\ No newline at end of file

Mall.WindowsService/Properties/PublishProfiles/FolderProfile.pubxml.user

+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121. 
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file