粉象返佣调整

Mall.Model/Entity/User/RB_Vip_Buy.cs

@@ -94,5 +94,14 @@ namespace Mall.Model.Entity.User
         /// 创建时间
         /// </summary>
         public DateTime CreateDate { get; set; }
+
+        /// <summary>
+        /// 关联订单id
+        /// </summary>
+        public int? ReOrderId { get; set; }
+        /// <summary>
+        /// 关联订单号
+        /// </summary>
+        public string ReOrderNum { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -1268,7 +1268,7 @@ namespace Mall.Module.Product
                 var disModel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, UserId = UserId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }).FirstOrDefault();
                 if (disModel != null)
                 {
-                    if ((BasicsModel?.IsEnableFXGrade??2) == 1)
+                    if ((BasicsModel?.IsEnableFXGrade??2) == 1 && (model.PresentFXGrade ?? 0) == 0)
                     {
                         var FXList = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { TenantId = TenantId, MallBaseId = MallBaseId });
                         if (FXList.Any() && FXList.Where(x => x.IsGuest == 1).Any())

Mall.Repository/User/RB_Vip_BuyRepository.cs

@@ -81,6 +81,10 @@ namespace Mall.Repository.User
                 {
                     builder.Append($" AND {nameof(RB_Vip_Buy_Extend.UserId)}={query.UserId}");
                 }
+                if (query.ReOrderId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Vip_Buy_Extend.ReOrderId)}={query.ReOrderId}");
+                }
             }
             return Get<RB_Vip_Buy_Extend>(builder.ToString()).ToList();
         }
@@ -127,6 +131,14 @@ WHERE a.{nameof(RB_Vip_Buy_Extend.Status)}=0 ");
                 {
                     builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.OrderNo)} like '%{query.OrderNo}%'");
                 }
+                if (query.ReOrderId > 0)
+                {
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.ReOrderId)}={query.ReOrderId}");
+                }
+                if (!string.IsNullOrEmpty(query.ReOrderNum))
+                {
+                    builder.Append($" AND a.{nameof(RB_Vip_Buy_Extend.ReOrderNum)} like '%{query.ReOrderNum}%'");
+                }
             }
             builder.Append($@" group by a.Id order by a.Id desc");
             return GetPage<RB_Vip_Buy_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();

Mall.WebApi/Controllers/User/UserController.cs

@@ -2621,7 +2621,7 @@ namespace Mall.WebApi.Controllers.User
             if (UserId <= 0)
             {
                 return ApiResult.ParamIsNull();
-            }
+            }            
 
             var obj = userModule.GetHpUserDistributorInfo(UserId, req.TenantId, req.MallBaseId);
             return ApiResult.Success("", obj);
@@ -2871,9 +2871,136 @@ namespace Mall.WebApi.Controllers.User
 
         #endregion
 
+        #region 推荐返佣账单
+        /// <summary>
+        /// 获取账单列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetRecommendOrdersBillPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Distributor_Bill_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_Bill_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = userModule.GetRecommendOrdersBillPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.BillState,
+                x.Money,
+                x.Periods,
+                x.Remark,
+                x.SupplierId,
+                x.SupplierName,
+                x.UserId,
+                x.UserName,
+                UpdateDate = x.UpdateDate.HasValue ? x.UpdateDate.Value.ToString("yyyy-MM-dd") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 新增账单
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetRecommendOrdersBillInfo()
+        {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string IntroductionIds = parms.GetStringValue("IntroductionIds");
+            int UserId = parms.GetInt("UserId", 0);
+            int SupplierId = parms.GetInt("SupplierId", 0);
+            if (string.IsNullOrEmpty(IntroductionIds))
+            {
+                return ApiResult.ParamIsNull("请选择返佣订单");
+            }
+            List<int> IntroductionIdList = JsonConvert.DeserializeObject<List<int>>(IntroductionIds);
+            if (!IntroductionIdList.Any())
+            {
+                return ApiResult.ParamIsNull("请选择返佣订单");
+            }
+            if (UserId <= 0)
+            {
+                return ApiResult.ParamIsNull("请选择用户");
+            }
+
+            bool flag = userModule.SetRecommendOrdersBillInfo(IntroductionIdList, UserId, SupplierId, req.TenantId, req.MallBaseId, req.EmpId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 账单取消
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult CancalRecommendOrdersBill() {
+            var req = RequestParm;
+            var parms = JObject.Parse(req.msg.ToString());
+            int BillId = parms.GetInt("BillId", 0);
+            if (BillId <= 0) {
+                return ApiResult.ParamIsNull();
+            }
+            bool flag = userModule.CancalRecommendOrdersBill(BillId, req.TenantId, req.MallBaseId, req.EmpId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取账单明细
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetRecommendOrdersBillDetailList() {
+            var parms = RequestParm;
+            RB_Distributor_BillDetail_Extend demodel = JsonConvert.DeserializeObject<RB_Distributor_BillDetail_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            if ((demodel.BillId ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("请传递账单id");
+            }
+            var Robj = userModule.GetRecommendOrdersBillDetailList(demodel);
+            return ApiResult.Success("", Robj);
+        }
+        #endregion
 
         #region 粉象返佣金额设置
 
+        /// <summary>
+        /// 初始化 赠送粉象vip返佣
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult InitializeFXVIPCommission() {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int OrderId = parms.GetInt("OrderId", 0);
+            if (OrderId<=0)
+            {
+                return ApiResult.ParamIsNull("请传递参数");
+            }
+            new UserCommonModule().TestFxGradeCommission(OrderId);
+
+            return ApiResult.Success();
+        }
+
         /// <summary>
         /// 获取粉象分销返佣信息列表
         /// </summary>

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -169,6 +169,9 @@ namespace Mall.WebApi.Controllers.User
                 x.Money,
                 x.GradeName,
                 x.UserId,
+                x.Remark,
+                x.ReOrderId,
+                x.ReOrderNum,
                 PayTimeStr = x.PayTime.HasValue ? x.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
                 CommissionList = x.CommissionList.Select(z => new
                 {
@@ -199,12 +202,13 @@ namespace Mall.WebApi.Controllers.User
             {
                 ExcelRows = new List<ExcelColumn>(30) {
                     new ExcelColumn(value: "序号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
-                    new ExcelColumn(value: "订单号") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "购买单号") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },                    
                     new ExcelColumn(value: "用户Id") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "用户名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "购买金额") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "等级名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "购买时间") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
+                    new ExcelColumn(value: "关联订单号") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "返利级别") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "昵称") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
                     new ExcelColumn(value: "佣金") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
@@ -232,12 +236,13 @@ namespace Mall.WebApi.Controllers.User
                         ColumnHight = 30
                     };
 
-                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderNo) { Rowspan = OCCount });
+                    datarow.ExcelRows.Add(new ExcelColumn(value: item.OrderNo) { Rowspan = OCCount });                    
                     datarow.ExcelRows.Add(new ExcelColumn(value: item.UserId.ToString()) { Rowspan = OCCount });
                     datarow.ExcelRows.Add(new ExcelColumn(value: item.UserName) { Rowspan = OCCount });
                     datarow.ExcelRows.Add(new ExcelColumn(value: (item.Money).ToString()) { Rowspan = OCCount });
                     datarow.ExcelRows.Add(new ExcelColumn(value: item.GradeName) { Rowspan = OCCount });
                     datarow.ExcelRows.Add(new ExcelColumn(value: item.PayTime.HasValue ? item.PayTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "") { Rowspan = OCCount });
+                    datarow.ExcelRows.Add(new ExcelColumn(value: item.ReOrderNum ?? "") { Rowspan = OCCount });
 
                     bool IsOCFirst = true;
                     if (item.CommissionList.Any())

Mall.WindowsService/Module/FinanceModule.cs

@@ -845,7 +845,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                             DetailList = dlist,
                             OrderNo = orderModel.OrderNo
                         };
-                        InsertPresentFXGrade(demodel, orderModel.UserId ?? 0, orderModel.OrderId);
+                        //InsertPresentFXGrade(demodel, orderModel.UserId ?? 0, orderModel.OrderId);  2020-08-03 ld 赠送设置为 订单付款后了
                     }
                     #endregion
                 }