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

Mall.Common/Plugin/HttpHelper.cs

@@ -132,12 +132,21 @@ namespace Mall.Common.Plugin
         {
             HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
             req.Method = "POST";
-            req.ContentType = "application/octet-stream";
-            req.ContentLength = Encoding.UTF8.GetByteCount(postDataStr);
-            Stream myRequestStream = req.GetRequestStream();
-            StreamWriter myStreamWriter = new StreamWriter(myRequestStream, Encoding.GetEncoding("gb2312"));
-            myStreamWriter.Write(postDataStr);
-            myStreamWriter.Close();
+            req.ContentType = "application/x-www-form-urlencoded";
+       
+            //req.Headers.Add("Accept", "application/json");
+            //req.Headers.Add("Content-Type", "application/json");
+            byte[] data = Encoding.UTF8.GetBytes(postDataStr);
+
+            req.ContentLength = data.Length;
+
+            using (Stream reqStream = req.GetRequestStream())
+            {
+                reqStream.Write(data, 0, data.Length);
+
+                reqStream.Close();
+            }
+        
 
             HttpWebResponse rsp = (HttpWebResponse)req.GetResponse();
             if (string.IsNullOrWhiteSpace(rsp.CharacterSet))

Mall.Common/Plugin/WeiXinHelper.cs

@@ -10,6 +10,27 @@ namespace Mall.Common.Plugin
 {
     public class WeiXinHelper
     {
+        static List<WeChatMiniAppMessage> weChatMiniAppMessages = new List<WeChatMiniAppMessage>();
+
+        static WeiXinHelper()
+        {
+            // //(拼团失败通知) 980（拼团成功通知）
+            weChatMiniAppMessages.Add(new WeChatMiniAppMessage()
+            {
+                Tid = "1953",
+                Title = "拼团失败通知",
+                KidList = new List<int>() {1,2,3 },
+                SceneDesc = "",
+            });
+
+            weChatMiniAppMessages.Add(new WeChatMiniAppMessage()
+            {
+                Tid = "980",
+                Title = "拼团成功通知",
+                KidList = new List<int>() {1,2,3},
+                SceneDesc = "",
+            });
+        }
 
         /// <summary>
         /// 获取微信用户OpenId
@@ -40,9 +61,14 @@ namespace Mall.Common.Plugin
             return openid;
         }
 
-        public static string GetWeChatAccessToken(string AppId, string AppSecret)
+        /// <summary>
+        /// 获取微信订阅消息模板
+        /// </summary>
+        /// <param name="AppId"></param>
+        /// <param name="AppSecret"></param>
+        /// <returns></returns>
+        public static List<WeChatMiniAppMessage> GetWeChatTemplateMessage(string AppId, string AppSecret)
         {
-            string returnStr = "";
             string result = "";
             string access_token = "";
             try
@@ -57,23 +83,35 @@ namespace Mall.Common.Plugin
                 }
                 if (!string.IsNullOrWhiteSpace(access_token))
                 {
-                    result = "";
-                    string templateUrl = string.Format("https://api.weixin.qq.com/wxaapi/newtmpl/gettemplate?access_token={0}", access_token);
-                    result = Common.Plugin.HttpHelper.HttpGet(templateUrl);
-                    returnStr = result;
-                    if (result != null && !string.IsNullOrWhiteSpace(result))
+                    string addTemplate = string.Format("https://api.weixin.qq.com/wxaapi/newtmpl/addtemplate?access_token={0}",access_token);
+                    foreach (var item in weChatMiniAppMessages)
                     {
-                        JObject jObj = JObject.Parse(result);
-
+                        result = "";
+                        string newParameters = string.Format("tid={0}",item.Tid);
+                        if (item.KidList != null && item.KidList.Count > 0)
+                        {
+                            int index = 0;
+                            foreach (var subItem in item.KidList)
+                            {
+                                newParameters += string.Format("&kidList[{0}]={1}", index,subItem);
+                                index++;
+                            }
+                        }
+                        newParameters += string.Format("&sceneDesc={0}",item.Title);
+                        result = Common.Plugin.HttpHelper.HttpPostStr(addTemplate, newParameters);
+                        if (!string.IsNullOrWhiteSpace(result))
+                        {
+                            JObject jObj = JObject.Parse(result);
+                            item.MessageTemplateId = jObj["priTmplId"].ToString();
+                        }
                     }
-                    //1953(拼团失败通知) 980（拼团成功通知）
                 }
             }
             catch (Exception ex)
             {
                 Common.Plugin.LogHelper.Write(ex, "GetWeChatAccessToken:result=" + result);
             }
-            return returnStr;
+            return weChatMiniAppMessages;
         }
     }
 
@@ -101,6 +139,11 @@ namespace Mall.Common.Plugin
         /// 服务场景描述，15个字以内
         /// </summary>
         public string SceneDesc { get; set; }
+
+        /// <summary>
+        /// 模板消息Id
+        /// </summary>
+        public string MessageTemplateId { get; set; }
     }
 
     /// <summary>

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -28,6 +28,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string NickName { get; set; }
 
+          /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string MemberUserName { get; set; }
+
         /// <summary>
         /// 头像
         /// </summary>

Mall.Model/Extend/User/RB_Supplier_Extend.cs

@@ -22,6 +22,11 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string IntroducerName { get; set; }
 
+        /// <summary>
+        /// 会员名称
+        /// </summary>
+        public string MemberUserName { get; set; }
+
         public List<RB_SupplierCommission> SupplierCommissionList { get; set; }
     } 
 }

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -108,7 +108,7 @@ where {where} order by di.CreateDate desc";
                 where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
             }
 
-            string sql = $@"select di.*,mu.OpenId from RB_Distributor_Info di LEFT JOIN rb_member_user as mu on di.UserId=mu.Id where {where} order by di.CreateDate desc";
+            string sql = $@"select di.*,mu.OpenId,mu.Name as MemberUserName from RB_Distributor_Info di LEFT JOIN rb_member_user as mu on di.UserId=mu.Id where {where} order by di.CreateDate desc";
             return Get<RB_Distributor_Info_Extend>(sql).ToList();
         }
 

Mall.Repository/User/RB_SupplierRepository.cs

@@ -37,7 +37,8 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.Name)} like '%{dmodel.Name}%'";
             }
-            string sql = $@"select a.*,b.`Name` as IntroducerName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId {where} order by a.Id desc";
+            string sql = $@"select a.*,b.`Name` as IntroducerName,c.`Name` as MemberUserName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId
+LEFT JOIN rb_member_user as c on c.Id=b.UserId {where} order by a.Id desc";
             return GetPage<RB_Supplier_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
         }
 
@@ -69,7 +70,8 @@ namespace Mall.Repository.User
             {
                 where += $@" and a.{nameof(RB_Supplier.ID)} in({dmodel.SupplierIds})";
             }
-            string sql = $@"select a.*,b.`Name` as IntroducerName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId {where} order by a.Id desc";
+            string sql = $@"select a.*,b.`Name` as IntroducerName,c.`Name` as MemberUserName from {TableName} as a LEFT JOIN rb_distributor_info as b on a.Introducer=b.UserId
+LEFT JOIN rb_member_user as c on c.Id=b.UserId {where} order by a.Id desc";
             return Get<RB_Supplier_Extend>(sql).ToList();
         }
     }

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -592,13 +592,13 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetMessageTemplate()
         {
             JObject parms = JObject.Parse(RequestParm.msg.ToString());
-            string result = "";
+            var result = new object();
             if (RequestParm.MiniAppId != null && !string.IsNullOrWhiteSpace(RequestParm.MiniAppId))
             {
                 var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = RequestParm.MiniAppId });
                 if (miniProgram != null && miniProgram.MallBaseId > 0)
                 {
-                    result = Common.Plugin.WeiXinHelper.GetWeChatAccessToken(miniProgram.MiniAppId, miniProgram.MiniAppSecret);
+                    result = Common.Plugin.WeiXinHelper.GetWeChatTemplateMessage(miniProgram.MiniAppId, miniProgram.MiniAppSecret);
                 }
             }
             return ApiResult.Success(data: result);

Mall.WebApi/Controllers/User/SupplierController.cs

@@ -58,7 +58,7 @@ namespace Mall.WebApi.Controllers.User
                 x.Name,
                 x.Mobile,
                 x.Address,
-                x.IntroducerName,
+                IntroducerName = string.IsNullOrWhiteSpace(x.IntroducerName) ? x.MemberUserName : x.IntroducerName,
                 CardNum = x.ClientBankAccount != null ? x.ClientBankAccount.CardNum : "",
                 OpenBankName = x.ClientBankAccount != null ? x.ClientBankAccount.OpenBankName : "",
                 AccountAlias = x.ClientBankAccount != null ? x.ClientBankAccount.AccountAlias : "",
@@ -224,6 +224,10 @@ namespace Mall.WebApi.Controllers.User
             query.MallBaseId = parms.MallBaseId;
             query.AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited;
             var oldLogisticsList = orderModule.GetDistributorInfoList(query);
+            if (oldLogisticsList != null && oldLogisticsList.Any())
+            {
+                oldLogisticsList.ForEach(x => x.Name = (string.IsNullOrWhiteSpace(x.Name) ? x.MemberUserName : x.Name));
+            }
             return ApiResult.Success("", oldLogisticsList);
         }
 
@@ -342,8 +346,8 @@ namespace Mall.WebApi.Controllers.User
                                 GoodsName = orderGoodsItem.GoodsName,
                                 OrderNo = orderGoodsItem.OrderNo,
                                 Id = orderGoodsItem.Id,
-                                CostMoney= orderGoodsItem.CostMoney,
-                                FreightCostMoney=orderGoodsItem.FreightCostMoney
+                                CostMoney = orderGoodsItem.CostMoney,
+                                FreightCostMoney = orderGoodsItem.FreightCostMoney
                             };
                             result.Add(newOrderGoods);
                         }