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

Mall.Model/Entity/User/RB_Distributor_Basics.cs

@@ -215,5 +215,9 @@ namespace Mall.Model.Entity.User
         /// 是否启用粉象返佣   1是  2否
         /// </summary>
         public int? IsEnableFXGrade { get; set; }
+        /// <summary>
+        /// 是否启用无上级返佣
+        /// </summary>
+        public int? IsEnableNoSuperiorFY { get; set; }
     }
 }

Mall.Module.Product/OrderModule.cs

@@ -3276,7 +3276,7 @@ namespace Mall.Module.Product
             try
             {
                 var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
-                if ((basicModel?.IsEnableFXGrade ?? 2) == 1)
+                if ((basicModel?.IsEnableFXGrade ?? 2) == 1 && (((basicModel?.IsEnableNoSuperiorFY ?? 1) == 1) || ((basicModel?.IsEnableNoSuperiorFY ?? 1) == 2 && (umodel.SuperiorId ?? 0) > 0)))
                 {
                     //粉象返佣
                     var FXList = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });

Mall.Module.User/UserCommonModule.cs

@@ -129,7 +129,8 @@ namespace Mall.Module.User
                     IsCommissionResidue = 2,
                     HpReferralsGradeAudit = 2,
                     IsWithdrawAll = 2,
-                    IsEnableFXGrade = 2
+                    IsEnableFXGrade = 2,
+                    IsEnableNoSuperiorFY = 1
                 }) > 0;
             }
             else

Mall.Module.User/UserModule.cs

@@ -933,6 +933,7 @@ namespace Mall.Module.User
                     { nameof(RB_Distributor_Basics.IsCommissionResidue),demodel.IsCommissionResidue},
                     { nameof(RB_Distributor_Basics.IsWithdrawAll),demodel.IsWithdrawAll},
                     { nameof(RB_Distributor_Basics.IsEnableFXGrade),demodel.IsEnableFXGrade},
+                    { nameof(RB_Distributor_Basics.IsEnableNoSuperiorFY),demodel.IsEnableNoSuperiorFY},
                 };
                 List<WhereHelper> whereHelpers = new List<WhereHelper>() {
                     new WhereHelper(){
@@ -2456,7 +2457,7 @@ namespace Mall.Module.User
                             Number = 1,
                             OriginalMoney = unitmoney,
                             UnitPrice = unitmoney,
-                            Remark = "订单号：" + (qitem == "" ? "暂无" : qitem)
+                            Remark = "推荐返佣：" + (qitem == "" ? "暂无" : qitem)
                         });
                     }
                     item.IsPublic = 5;//默认平台虚拟账户
@@ -2474,7 +2475,7 @@ namespace Mall.Module.User
                         OrderSource = 16,
                         OtherType = 18,
                         ReFinanceId = BillId,
-                        Remark = "名称:" + umodel.Name + "（" + umodel.Id + "）" + "  姓名:" + DisModel.Name + "  手机:" + DisModel.Mobile + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
+                        Remark = "名称:" + umodel.Name + "（" + umodel.Id + "）" + "  姓名:" + DisModel.Name + "  手机:" + DisModel.Mobile + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据(推荐供应商返佣)",
                         detailList,
                         RB_Depart_Id = Config.ExpendDepartment
                     };

Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs

@@ -244,7 +244,7 @@ namespace Mall.WebApi.Controllers.Finance
             }
             else
             {
-                string msg = userModule.SetRecommendOrdersBillRemit(BillId, TenantId, MallBaseId, 0,, "单据审核通过，已自动打款");
+                string msg = userModule.SetRecommendOrdersBillRemit(BillId, TenantId, MallBaseId, 0, "单据审核通过，已自动打款");
                 if (msg == "")
                 {
                     return ApiResult.Success();

Mall.WebApi/Controllers/User/UserController.cs

@@ -785,6 +785,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.HpReferralsGradeAudit ??= 2;
             demodel.IsWithdrawAll ??= 2;
             demodel.IsEnableFXGrade ??= 2;
+            demodel.IsEnableNoSuperiorFY ??= 1;
             demodel.TenantId = Convert.ToInt32(requestParm.uid);
             demodel.MallBaseId = requestParm.MallBaseId;
             demodel.CreateDate = DateTime.Now;
@@ -838,6 +839,7 @@ namespace Mall.WebApi.Controllers.User
                 model.HpReferralsGradeAudit,
                 model.IsWithdrawAll,
                 model.IsEnableFXGrade,
+                model.IsEnableNoSuperiorFY,
                 UpdateDate = model.UpdateDate.HasValue ? model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
             });
         }