|
@@ -9,6 +9,7 @@ using MySystem.Models;
|
|
using LitJson;
|
|
using LitJson;
|
|
using Library;
|
|
using Library;
|
|
using MySystem.Models.Main;
|
|
using MySystem.Models.Main;
|
|
|
|
+using System.Data;
|
|
|
|
|
|
public class HaoDaAuthQueryHelper
|
|
public class HaoDaAuthQueryHelper
|
|
{
|
|
{
|
|
@@ -28,16 +29,13 @@ public class HaoDaAuthQueryHelper
|
|
{
|
|
{
|
|
while (true)
|
|
while (true)
|
|
{
|
|
{
|
|
- string content = RedisDbconn.Instance.RPop<string>("HaoDaAuthQueryHelper");
|
|
|
|
- if (!string.IsNullOrEmpty(content))
|
|
|
|
|
|
+ DataTable dt = CustomerSqlConn.dtable("select Id,OutMchtNo,StoreNo from MerchantAddInfo where HdStatus=3 and OutMchtNo is not null and StoreNo is not null and ((`Status`=1 and WeChatMerchantId is null) or (`QueryCount`=1 and AliMerchantId is null)) order by Id desc", AppConfig.Base.SqlConnStr);
|
|
|
|
+ foreach(DataRow dr in dt.Rows)
|
|
{
|
|
{
|
|
- JsonData json = JsonMapper.ToObject(content);
|
|
|
|
- QueryAuthStatus(json["MerchantId"].ToString(), json["MchtNo"].ToString(), json["StoreNo"].ToString());
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- {
|
|
|
|
- Thread.Sleep(10000);
|
|
|
|
|
|
+ QueryAuthStatus(dr["Id"].ToString(), dr["OutMchtNo"].ToString(), dr["StoreNo"].ToString());
|
|
|
|
+ Thread.Sleep(2000);
|
|
}
|
|
}
|
|
|
|
+ Thread.Sleep(10000);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -52,27 +50,29 @@ public class HaoDaAuthQueryHelper
|
|
{
|
|
{
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
MerchantAddInfo info = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
|
|
MerchantAddInfo info = db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
|
|
- MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
|
|
|
|
|
|
+ // MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
|
|
var wxcheck = jsonObj["wechatVerifyState"].ToString();
|
|
var wxcheck = jsonObj["wechatVerifyState"].ToString();
|
|
var alicheck = jsonObj["aliVerifyState"].ToString();
|
|
var alicheck = jsonObj["aliVerifyState"].ToString();
|
|
- if (wxcheck == "1")
|
|
|
|
- {
|
|
|
|
- info.Status = 2;
|
|
|
|
- info.WeChatMerchantId = jsonObj["wechatMerchantId"].ToString();
|
|
|
|
- merchant.Status = 2;
|
|
|
|
- info.WeChatRemark = "";
|
|
|
|
- }
|
|
|
|
- if (alicheck == "1")
|
|
|
|
- {
|
|
|
|
- info.QueryCount = 2;
|
|
|
|
- info.AliMerchantId = jsonObj["aliMerchantId"].ToString();
|
|
|
|
- merchant.QueryCount = 2;
|
|
|
|
- info.AlipayRemark = "";
|
|
|
|
- }
|
|
|
|
- if (wxcheck != "1" || alicheck != "1")
|
|
|
|
- {
|
|
|
|
- RedisDbconn.Instance.AddList("HaoDaAuthQueryHelper", "{\"MerchantId\":\"" + MerchantId + "\",\"MchtNo\":\"" + info.OutMchtNo + "\",\"StoreNo\":\"" + info.StoreNo + "\"}");
|
|
|
|
- }
|
|
|
|
|
|
+ info.WeChatMerchantId = jsonObj["wechatMerchantId"].ToString();
|
|
|
|
+ info.AliMerchantId = jsonObj["aliMerchantId"].ToString();
|
|
|
|
+ // if (wxcheck == "1")
|
|
|
|
+ // {
|
|
|
|
+ // info.Status = 2;
|
|
|
|
+ // info.WeChatMerchantId = jsonObj["wechatMerchantId"].ToString();
|
|
|
|
+ // merchant.Status = 2;
|
|
|
|
+ // info.WeChatRemark = "";
|
|
|
|
+ // }
|
|
|
|
+ // if (alicheck == "1")
|
|
|
|
+ // {
|
|
|
|
+ // info.QueryCount = 2;
|
|
|
|
+ // info.AliMerchantId = jsonObj["aliMerchantId"].ToString();
|
|
|
|
+ // merchant.QueryCount = 2;
|
|
|
|
+ // info.AlipayRemark = "";
|
|
|
|
+ // }
|
|
|
|
+ // if (wxcheck != "1" || alicheck != "1")
|
|
|
|
+ // {
|
|
|
|
+ // RedisDbconn.Instance.AddList("HaoDaAuthQueryHelper", "{\"MerchantId\":\"" + MerchantId + "\",\"MchtNo\":\"" + info.OutMchtNo + "\",\"StoreNo\":\"" + info.StoreNo + "\"}");
|
|
|
|
+ // }
|
|
|
|
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
}
|
|
}
|