页面修改

Mall.Repository/BaseSetUp/RB_DestinationRepository.cs

@@ -72,7 +72,7 @@ namespace Mall.Repository.BaseSetUp
                 var index = 0;
                 foreach (var item in where)
                 {
-                    if (!string.IsNullOrEmpty(item.Trim()))
+                    if (item!=null && !string.IsNullOrEmpty(item.Trim()))
                     {
                         if (index == 0)
                         {

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -1181,8 +1181,21 @@ namespace Mall.WebApi.Controllers.User
         {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
+            JObject prams = JObject.Parse(req.msg.ToString());
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(req.msg.ToString());
-            RB_Member_Balance_Extend demodel = JsonConvert.DeserializeObject<RB_Member_Balance_Extend>(req.msg.ToString());
+            var createDateStr = prams.GetStringValue("CreateDate")+"-01";
+            RB_Member_Balance_Extend demodel = new RB_Member_Balance_Extend();
+            if (!string.IsNullOrWhiteSpace(createDateStr))
+            {
+                try
+                {
+                    demodel.CreateDate = Convert.ToDateTime(createDateStr);
+                }
+                catch
+                {
+                    demodel.CreateDate = DateTime.Now;
+                }
+            }
             demodel.UserId = userInfo.UserId;
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;

Mall.WebApi/Controllers/User/UserController.cs

@@ -50,9 +50,18 @@ namespace Mall.WebApi.Controllers.User
         public ApiResult GetMemberUserPageList()
         {
             var parms = RequestParm;
+            JObject param= JObject.Parse(parms.msg.ToString());
             ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
-            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(parms.msg.ToString());
-
+            RB_Member_User_Extend demodel = new RB_Member_User_Extend()
+            {
+                Name= param.GetStringValue("param"),
+                Source=(UserSourceEnum)param.GetInt("Source"),
+                MemberGrade=param.GetInt("MemberGrade"),
+                Id=param.GetInt("Id"),
+                Moblie=param.GetStringValue("Moblie"),
+                StartTime=param.GetStringValue("StartTime"),
+                EndTime=param.GetStringValue("EndTime"),
+            };
             demodel.TenantId = Convert.ToInt32(parms.uid);
             demodel.MallBaseId = parms.MallBaseId;
             var list = userModule.GetMemberUserPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);