提交代码

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -210,7 +210,7 @@ namespace Mall.Module.BaseSetUp
                 {
                     new WhereHelper (){ FiledName=nameof(RB_Logistics_Rules.MallBaseId),FiledValue=query.MallBaseId,OperatorEnum=OperatorEnum.Equal}
                 };
-                logisticsRulesRepository.Update(fileds, whereHelpers, trans);
+                flag= logisticsRulesRepository.Update(fileds, whereHelpers, trans);
 
                 IDictionary<string, object> filedsDefault = new Dictionary<string, object>()
                 {
@@ -220,7 +220,7 @@ namespace Mall.Module.BaseSetUp
                 {
                     new WhereHelper (){ FiledName=nameof(RB_Logistics_Rules.ID),FiledValue=query.ID,OperatorEnum=OperatorEnum.Equal}
                 };
-                logisticsRulesRepository.Update(filedsDefault, whereHelpersDefault, trans);
+                flag= logisticsRulesRepository.Update(filedsDefault, whereHelpersDefault, trans);
                 logisticsRulesRepository.DBSession.Commit();
             }
             catch (Exception ex)

Mall.Module.User/UserModule.cs

@@ -1602,7 +1602,7 @@ namespace Mall.Module.User
                     foreach (var item in list)
                     {
                         Dictionary<string, object> keyValues = new Dictionary<string, object>() {
-                            { nameof(RB_Distributor_Info.Status),1},                            
+                            { nameof(RB_Distributor_Info.Status),1},
                             { nameof(RB_Distributor_Info.UpdateDate),DateTime.Now}
                         };
                         List<WhereHelper> wheres = new List<WhereHelper>() {
@@ -2609,7 +2609,8 @@ namespace Mall.Module.User
             }
 
             var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
-            if (basicModel == null) {
+            if (basicModel == null)
+            {
                 return "";
             }
             return new
@@ -3287,7 +3288,8 @@ namespace Mall.Module.User
                             }
                         }
                     }
-                    else if (umodel.IsDistributor != 1 && umodel.SuperiorId == 0) {
+                    else if (umodel.IsDistributor != 1 && umodel.SuperiorId == 0)
+                    {
                         IsShowDistributionCenter = 2;//没有上级  和平下不能显示分销中心
                     }
                 }
@@ -4198,8 +4200,40 @@ namespace Mall.Module.User
                 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), "");
-                return "/upfile/temporary/" + pathName;
+
             }
             return "";
         }