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

Mall.Module.User/UserModule.cs

@@ -4199,40 +4199,49 @@ namespace Mall.Module.User
                 string pathName = Guid.NewGuid().ToString() + ".jpg";
                 string basepath = AppContext.BaseDirectory;
                 string path_server = basepath + "\\upfile\\temporary\\" + pathName;
-                var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
-                //if (Robj.Length > 100)
-                //{
-                    return "/upfile/temporary/" + pathName;
-                ////}
-                ////else
-                ////{
-                ////    JObject parms = JObject.Parse(Robj);
-                ////    string errcode = parms.GetStringValue("errcode");//错误码
-                ////    if (errcode == "40001")//access_token失效那就重新在获取一次
-                ////    {
-                ////        token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret);
-                ////        System.Threading.Tasks.Task.Run(() => CacheManager.AppletWeChat.WeiXinReidsCache.Set(appletWeChatModel.MiniAppId, token));
-                ////        if (!string.IsNullOrEmpty(token))
-                ////        {
-                ////            GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码
-                ////            postData = new
-                ////            {
-                ////                path,
-                ////                width
-                ////            };
-                ////            pathName = Guid.NewGuid().ToString() + ".jpg";
-                ////            basepath = AppContext.BaseDirectory;
-                ////            path_server = basepath + "\\upfile\\temporary\\" + pathName;
-                ////            Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
-                ////            return "/upfile/temporary/" + pathName;
-                ////        }
-                ////    }
-                ////    else
-                ////    {
-                ////        return "/upfile/temporary/";
-                ////    }
-                ////}
-                //var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
+                var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
+
+                if (Robj1.Length > 200)
+                {
+                    var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
+                    if (Robj != null)
+                    {
+                        return "/upfile/temporary/" + pathName;
+                    }
+                }
+                else
+                {
+                    JObject parms = JObject.Parse(Robj1);
+                    string errcode = parms.GetStringValue("errcode");//错误码
+                    if (errcode == "40001")//access_token失效那就重新在获取一次
+                    {
+                        token = Mall.Common.Pay.WeChatPat.TokenHelper.GetLXYToken(token, appletWeChatModel.MiniAppId, appletWeChatModel.MiniAppSecret);
+                        System.Threading.Tasks.Task.Run(() => CacheManager.AppletWeChat.WeiXinReidsCache.Set(appletWeChatModel.MiniAppId, token));
+                        if (!string.IsNullOrEmpty(token))
+                        {
+                            GetImageUrl = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + token;//获取小程序码
+                            postData = new
+                            {
+                                path,
+                                width
+                            };
+                            pathName = Guid.NewGuid().ToString() + ".jpg";
+                            basepath = AppContext.BaseDirectory;
+                            path_server = basepath + "\\upfile\\temporary\\" + pathName;
+                            Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
+                            var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
+                            if (Robj != null)
+                            {
+                                return "/upfile/temporary/" + pathName;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        return "";
+                    }
+                }
+                //
 
             }
             return "";