From 43987d31cdf56e5c2de1626ec490607679297b53 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 19 四月 2023 14:18:14 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs | 205 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 195 insertions(+), 10 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index e97f527..9989543 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -35,6 +35,7 @@
private readonly zhengcaioaContext _context;
private readonly IMapper _mapper;
private readonly zcUserInfoN_dbContext _zcUserInfoN_DbContext;
+ private readonly IMdbtestContext _iMdbtestContext;
public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
{
_logger = logger;
@@ -46,6 +47,7 @@
_context = factory.CreateScope().ServiceProvider.GetRequiredService<zhengcaioaContext>();
_mapper = factory.CreateScope().ServiceProvider.GetRequiredService<IMapper>();
_zcUserInfoN_DbContext = factory.CreateScope().ServiceProvider.GetRequiredService<zcUserInfoN_dbContext>();
+ _iMdbtestContext = factory.CreateScope().ServiceProvider.GetRequiredService<IMdbtestContext>();
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -150,6 +152,9 @@
//浼氬憳琛�
var frameworkUsers = _zcUserInfoN_DbContext.FrameworkUsers.Where(x => x.IsValid == true).ToList();
+
+ //鏄电О鏍�
+ var imUserInfos = _iMdbtestContext.ImUserInfos.ToList();
//StringBuilder number = new StringBuilder(); ;
//if (result != null && result.Count > 0)
@@ -565,6 +570,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -614,6 +637,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -767,7 +808,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \""+ ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \""+ projectfasongxiaoxisywjl[i].HuiyuanName+ "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
@@ -885,7 +926,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔★紝鐢�3浣嶉��浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ユ爣涔︼紝鏉滅粷搴熸爣 銆佸府鍔╂偍寰楀埌鍏ㄩ儴缁煎悎璇勫寰楀垎锛岀粡鏀块噰鍜ㄨ鍏徃妫�鏌ヨ繃鐨勬爣涔︼紝涓嶅彲鑳借搴熸爣锛岃鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \",\"body\": \"鏀块噰鍜ㄨ鍏徃鐨勨�滄爣涔﹂璇勫鈥濇湇鍔� \","
@@ -1292,6 +1333,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1341,6 +1400,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1493,7 +1570,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -1575,7 +1652,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛屽鏋滄偍鍦ㄥ弬鍔犫��" + projectfasongxiaoxisywjl[i].Projectname + "鈥濇姇鏍囧墠鎵炬斂閲囧挩璇㈡鏌ユ爣涔︼紝鑷冲皯鎻愬崌璇勫寰楀垎5-8鍒嗭紝涔熻涓爣鐨勫氨鏄吹鍏徃銆備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -1895,6 +1972,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -1944,6 +2039,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2097,7 +2210,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -2217,7 +2330,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╄瘎瀹′笓瀹舵壘涓嶅嚭涓昏鏂规鎵ｅ垎鐞嗙敱锛岃嚦灏戝姪鎮ㄦ彁鍗囩患鍚堣瘎瀹″緱鍒�5-10鍒嗐�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�� \","
@@ -2565,6 +2678,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2614,6 +2745,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -2767,7 +2916,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵� \","
@@ -2887,7 +3036,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�濓紝閫�浼戣祫娣辫瘎瀹′笓瀹跺湪寮�鏍囧墠鎸夌収璇勬爣娴佺▼涓烘偍浜ゅ弶妫�鏌ャ�佹寚瀵兼爣涔︼紝璁╂偍寰楅綈鍏ㄩ儴瀹㈣鍒嗗拰涓昏鍒嗭紝浠庢涓嶅啀涓烘爣涔﹀埗浣滄搷蹇冦�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟鈥滄爣涔︽鏌モ�濄�佲�滄爣涔︽寚瀵尖�漒","
@@ -3608,6 +3757,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -3657,6 +3824,24 @@
projectfasongxiaoxiDTO.KhId = projectfasongxiaoxiDTO1.KhId;
projectfasongxiaoxiDTO.HuiyuanId = frameworkUser.Id.ToString().ToLower();
projectfasongxiaoxiDTO.Projectname = projectfasongxiaoxiDTO1.Projectname;
+ string name = "";
+ var imUserInfo = imUserInfos.Where(x => x.Id == projectfasongxiaoxiDTO.HuiyuanId).FirstOrDefault();
+ if (imUserInfo != null)
+ {
+ name = imUserInfo.NickName;
+ }
+ else
+ {
+ if (frameworkUser.Name.StartsWith("1") && frameworkUser.Name.Length == 11)
+ {
+ name = frameworkUser.Name.Substring(0, 3) + "****" + frameworkUser.Name.Substring(7, 4);
+ }
+ else
+ {
+ name = frameworkUser.Name;
+ }
+ }
+ projectfasongxiaoxiDTO.HuiyuanName = name;
projectfasongxiaoxiDTOsappzuizhong.Add(projectfasongxiaoxiDTO);
}
}
@@ -3805,7 +3990,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"" + ywjl.UserSn + "\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"" + ywjl.UserName + "\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�" + ywjl.Phone + " \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
@@ -3926,7 +4111,7 @@
+ "\"appkey\": \"" + appkey + "\","
+ "\"senderId\": \"kehujingli\","
+ "\"senderData\": { \"avatar\": \"\",\"name\": \"瀹㈡埛缁忕悊\"},"
- + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"\"}},"
+ + "\"to\": { \"type\": \"private\",\"id\": \"" + projectfasongxiaoxisywjl[i].HuiyuanId + "\",\"data\": { \"avatar\": \"\",\"name\": \"" + projectfasongxiaoxisywjl[i].HuiyuanName + "\"}},"
+ "\"type\": \"text\","
+ "\"payload\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功锛岃祫娣辨斂搴滈噰璐硶寰嬩笓瀹躲��3000澶氫欢璐ㄧ枒鎶曡瘔鎴愬姛妗堜緥锛屾壘鏀块噰鍜ㄨ锛岃姳閽辨洿灏戙�佽儨绠楁洿楂橈紝鎺ュ彈鎺ㄩ闄╀唬鐞嗭紝璐ㄧ枒鎶曡瘔鎴愬姛鍐嶆敹璐广�備簡瑙ｈ鎯呰鍜ㄨ锛�400-028-8080 \","
+ "\"notification\": { \"title\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \",\"body\": \"鏀块噰鍜ㄨ鍏徃涓撲笟涓轰緵搴斿晢浠ｆ嫙璐ㄧ枒鍑姐�佹姇璇変功 \","
--
Gitblit v1.9.1