|
@@ -133,7 +133,7 @@ namespace MySystem
|
|
|
if (merchantadd != null)
|
|
|
{
|
|
|
merchantadd.Status = 2;
|
|
|
- merchantadd.SubMchid = dic["sub_mchid"].ToString();
|
|
|
+ // merchantadd.SubMchid = dic["sub_mchid"].ToString();
|
|
|
RedisDbconn.Instance.Set("MerchantAddInfo:" + sign.MerchantAddInfoId, merchantadd);
|
|
|
PxcModels.MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
|
|
|
if (merchantadd.Status == 2 && merchantadd.QueryCount == 2)
|
|
@@ -141,18 +141,6 @@ namespace MySystem
|
|
|
merchant.Status = 2;
|
|
|
}
|
|
|
db.SaveChanges();
|
|
|
- if (merchantadd.Status == 2 && merchantadd.QueryCount == 2)
|
|
|
- {
|
|
|
- List<MerchantInfo> merchants = RedisDbconn.Instance.GetList<MerchantInfo>("TmpMerchantInfo:" + merchant.UserId, 1, 1000000);
|
|
|
- MerchantInfo check = merchants.FirstOrDefault(m => m.Id == sign.MerchantAddInfoId);
|
|
|
- if (check != null)
|
|
|
- {
|
|
|
- merchants.Remove(check);
|
|
|
- RedisDbconn.Instance.Clear("TmpMerchantInfo:" + merchant.UserId);
|
|
|
- RedisDbconn.Instance.AddList("TmpMerchantInfo:" + merchant.UserId, merchants.ToArray());
|
|
|
- }
|
|
|
- }
|
|
|
- deletes.Add(sign);
|
|
|
}
|
|
|
}
|
|
|
else if (dic["applyment_state"].ToString() == "APPLYMENT_STATE_REJECTED")
|