|
@@ -574,6 +574,29 @@ namespace MySystem
|
|
return result;
|
|
return result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ public void StartDepositListenBridge()
|
|
|
|
+ {
|
|
|
|
+ Thread th2 = new Thread(ListenDepositDataBridgeReady);
|
|
|
|
+ th2.IsBackground = true;
|
|
|
|
+ th2.Start();
|
|
|
|
+ }
|
|
|
|
+ public void ListenDepositDataBridgeReady()
|
|
|
|
+ {
|
|
|
|
+ while (true)
|
|
|
|
+ {
|
|
|
|
+ string content = RedisDbconn.Instance.RPop<string>("cache:ListenDepositDataByOneQueue");
|
|
|
|
+ if (!string.IsNullOrEmpty(content))
|
|
|
|
+ {
|
|
|
|
+ RedisDbconn.Instance.AddList("ListenDepositDataByOneQueue", content);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ Thread.Sleep(10000);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
public void StartDepositListenByOne()
|
|
public void StartDepositListenByOne()
|
|
{
|
|
{
|
|
//每天凌晨执行获取好哒FTP昨日交易数据
|
|
//每天凌晨执行获取好哒FTP昨日交易数据
|
|
@@ -647,6 +670,18 @@ namespace MySystem
|
|
if(!db.HdDepositTmp.Any(m => m.SnNo == SnNo))
|
|
if(!db.HdDepositTmp.Any(m => m.SnNo == SnNo))
|
|
{
|
|
{
|
|
function.WriteLog(DateTime.Now.ToString() + ":" + SnNo, "好哒押金数据入库new");
|
|
function.WriteLog(DateTime.Now.ToString() + ":" + SnNo, "好哒押金数据入库new");
|
|
|
|
+ if(MerKind == "待定")
|
|
|
|
+ {
|
|
|
|
+ MpMainModels2.MerchantAddInfo addInfo = db.MerchantAddInfo.FirstOrDefault(m => m.MchtNo == MerNo) ?? new MpMainModels2.MerchantAddInfo();
|
|
|
|
+ if(addInfo.SubjectType == "SUBJECT_TYPE_ENTERPRISE" || addInfo.SubjectType == "SUBJECT_TYPE_INDIVIDUAL")
|
|
|
|
+ {
|
|
|
|
+ MerKind = "000002";
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ MerKind = "000001";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
db.HdDepositTmp.Add(new MpMainModels2.HdDepositTmp()
|
|
db.HdDepositTmp.Add(new MpMainModels2.HdDepositTmp()
|
|
{
|
|
{
|
|
SnNo = SnNo,
|
|
SnNo = SnNo,
|