Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -147,11 +147,59 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous]
         public ApiResult SetUserShippingAddress()
         {
             var req = RequestParm;
             var userInfo = AppletUserInfo;
+            RB_Member_ShippingAddress_Extend demodel = JsonConvert.DeserializeObject<RB_Member_ShippingAddress_Extend>(req.msg.ToString());
+            if (string.IsNullOrEmpty(demodel.Name))
+            {
+                return ApiResult.ParamIsNull("请输入收货人");
+            }
+            if (string.IsNullOrEmpty(demodel.Mobile))
+            {
+                return ApiResult.ParamIsNull("请输入联系电话");
+            }
+            if ((demodel.Province ?? 0) <= 0 || (demodel.City ?? 0) <= 0 || (demodel.District ?? 0) <= 0)
+            {
+                return ApiResult.ParamIsNull("请选择区域");
+            }
+            if (string.IsNullOrEmpty(demodel.Address))
+            {
+                return ApiResult.ParamIsNull("请输入详细地址");
+            }
+            demodel.IsDefault ??= 2;
+            demodel.PostCode ??= "";
+            demodel.Lonlat ??= "";
+            demodel.Country ??= 2;
+            demodel.UserId = userInfo.UserId;
+            demodel.TenantId = userInfo.TenantId;
+            demodel.MallBaseId = userInfo.MallBaseId;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            demodel.Status = 0;
+
+            bool flag = userModule.SetUserShippingAddress(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// ERP新增用户地址
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [AllowAnonymous]
+        public ApiResult ERPSetUserShippingAddress()
+        {
+            var req = RequestParm;
+            AppletUserInfo userInfo = null;
             JObject prams = JObject.Parse(req.msg.ToString());
             int NewUserId = prams.GetInt("NewUserId");
             if (NewUserId > 0)
@@ -198,6 +246,7 @@ namespace Mall.WebApi.Controllers.User
             }
         }
             
+
         /// <summary>
         /// 设置地址默认
         /// </summary>

Mall.WebApi/Filter/ApiFilterAttribute.cs

@@ -49,9 +49,6 @@ namespace Mall.WebApi.Filter
             {
                 isCheckToken = false;
             }
-
-
-          
             #region Token校验
 
             if (isCheckToken)