页面修改

Mall.Model/Entity/Product/RB_Goods_OrderCommission.cs

@@ -119,6 +119,9 @@ namespace Mall.Model.Entity.Product
             set;
         }
 
+        /// <summary>
+        /// 是否已提现  1是
+        /// </summary>
         public int? IsRemit { get; set; }
 
 

Mall.Model/Entity/Product/RB_SmallShops_Commission.cs

@@ -114,5 +114,4 @@ namespace Mall.Model.Entity.Product
         /// </summary>
         public int SmallShopsId { get; set; }
     }
-
-}
+}
\ No newline at end of file

Mall.Model/Extend/User/RB_Member_User_Extend.cs

@@ -124,6 +124,11 @@ namespace Mall.Model.Extend.User
         /// 小程序排序
         /// </summary>
         public int SortNum { get; set; }
+
+        /// <summary>
+        /// 是否已提现   1是   2否
+        /// </summary>
+        public int IsRemit { get; set; }
     }
 
 

Mall.Module.User/MemberUserModule.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 using VT.FW.DB;
+using System.Linq;
 
 namespace Mall.Module.User
 {
@@ -38,5 +39,28 @@ namespace Mall.Module.User
             //});
             //return falg;
         }
+
+        /// <summary>
+        /// 获取用户佣金
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public RB_Member_User_Extend GetUserCommissionModule(int UserId)
+        {
+            RB_Member_User_Extend model = new RB_Member_User_Extend() { Id = UserId };
+            //总佣金
+            var totalList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds=UserId.ToString()});
+            //本月佣金
+            var currentMonthList = member_UserRepository.GetUserCommissionRepository(new RB_Member_User_Extend() { UserIds = UserId.ToString() }, IsGetCurrentMonth: true);
+            if (totalList != null && totalList.Count > 0)
+            {
+                model.TotalCommission = totalList.Sum(qitem => qitem.Commission);
+            }
+            if (currentMonthList != null && currentMonthList.Count > 0)
+            {
+                model.Commission = currentMonthList.Sum(qitem => qitem.Commission);
+            }
+            return model;
+        }
     }
 }

Mall.Module.User/UserModule.cs

@@ -2471,7 +2471,7 @@ namespace Mall.Module.User
 
                     string apiResult = Mall.Common.Plugin.HttpHelper.HttpPost(Config.PaymentFinanceApi, JsonHelper.Serialize(resultInfo), "");
                     var apir = JsonConvert.DeserializeObject<ApiResult>(apiResult);
-                    LogHelper.Write("打款：" + apiResult);
+                    LogHelper.WriteInfo("打款：" + apiResult);
                     if (apir.resultCode == 1)
                     {
                         Dictionary<string, object> keyValues = new Dictionary<string, object>() {

Mall.WebApi/App_Code/PayUtil.cs

@@ -237,7 +237,7 @@ namespace Mall.WebApi.App_Code
             });
 
             var xe = XElement.Parse(result, LoadOptions.SetLineInfo);
-            LogHelper.Write(null, "退款申请【" + param.OrderNumber + "】回调接口：" + xe);
+            LogHelper.WriteInfo("退款申请【" + param.OrderNumber + "】回调接口：" + xe);
             var returnCode = xe.GetElement("return_code").Value;
             //退款成功
             if (returnCode.Equals("SUCCESS"))

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -845,8 +845,14 @@ namespace Mall.WebApi.Controllers.User
             var userInfo = AppletUserInfo;
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
             RB_Member_Footmark_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Footmark_Extend>(req.msg.ToString());
-
+           
             demodel.UserId = userInfo.UserId;
+            //HK 2020-08-27新增
+            JObject parms = JObject.Parse(req.msg.ToString());
+            if (parms.GetInt("NewUserId") > 0)
+            {
+                demodel.UserId = parms.GetInt("NewUserId");
+            }
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
             var list = userModule.GetUserFootMarkPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
@@ -1665,6 +1671,12 @@ namespace Mall.WebApi.Controllers.User
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
             demodel.UserId = userInfo.UserId;
+            //HK 2020-08-27新增
+            JObject parms = JObject.Parse(req.msg.ToString());
+            if (parms.GetInt("NewUserId") > 0)
+            {
+                demodel.UserId = parms.GetInt("NewUserId");
+            }
             var list = userModule.GetOrderIntroductionPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new