|
@@ -50,7 +50,6 @@ namespace MySystem
|
|
|
public void StartDo(int MerchantId)
|
|
|
{
|
|
|
WebCMSEntities db = new WebCMSEntities();
|
|
|
- Models.Main1.WebCMSEntities db1 = new Models.Main1.WebCMSEntities();
|
|
|
MerchantAddInfo AddInfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == MerchantId);
|
|
|
MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == MerchantId);
|
|
|
if (AddInfo.HdStatus >= 1)
|
|
@@ -82,8 +81,6 @@ namespace MySystem
|
|
|
BusinessCode = "LKB" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(5);
|
|
|
AddInfo.BusinessCode = BusinessCode;
|
|
|
}
|
|
|
- string pwd = AddInfo.MobilePhone.Substring(5);
|
|
|
- merchant.LoginPwd = function.MD532(pwd);
|
|
|
MerchantParamSet query = db.MerchantParamSet.FirstOrDefault(m => m.Id == MerchantId);
|
|
|
if (query == null)
|
|
|
{
|
|
@@ -103,28 +100,7 @@ namespace MySystem
|
|
|
}
|
|
|
merchantForMobile.MerchantId = MerchantId;
|
|
|
db.SaveChanges();
|
|
|
- Models.Main1.MerchantLoginInfo info = db1.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == AddInfo.MobilePhone);
|
|
|
- if (info == null)
|
|
|
- {
|
|
|
- info = db1.MerchantLoginInfo.Add(new Models.Main1.MerchantLoginInfo()
|
|
|
- {
|
|
|
- LoginMobile = AddInfo.MobilePhone,
|
|
|
- }).Entity;
|
|
|
- db1.SaveChanges();
|
|
|
- }
|
|
|
- info.LoginPwd = function.MD532(pwd);
|
|
|
- db1.SaveChanges();
|
|
|
- Models.Main1.MerchantAccountLinkInfo infolink = db1.MerchantAccountLinkInfo.FirstOrDefault(m => m.LoginId == info.Id && m.MerchantId == MerchantId && m.Kind == 2);
|
|
|
- if (infolink == null)
|
|
|
- {
|
|
|
- infolink = db1.MerchantAccountLinkInfo.Add(new Models.Main1.MerchantAccountLinkInfo()
|
|
|
- {
|
|
|
- LoginId = info.Id,
|
|
|
- MerchantId = MerchantId,
|
|
|
- Kind = 2,
|
|
|
- }).Entity;
|
|
|
- db1.SaveChanges();
|
|
|
- }
|
|
|
+
|
|
|
if (AddInfo.Status <= 0)
|
|
|
{
|
|
|
//好哒新建商户
|
|
@@ -142,9 +118,9 @@ namespace MySystem
|
|
|
AddInfo.HdStatus = 0; //0 待审核 1 已通过 2 已开通分账 3 已添加接收方
|
|
|
merchant.Status = 0;
|
|
|
db.SaveChanges();
|
|
|
- QueryMerchantStatus queryMerchantStatus = new QueryMerchantStatus();
|
|
|
- queryMerchantStatus.MerchantId = MerchantId.ToString();
|
|
|
- queryMerchantStatus.MerchantNo = AddInfo.MchtNo;
|
|
|
+ // QueryMerchantStatus queryMerchantStatus = new QueryMerchantStatus();
|
|
|
+ // queryMerchantStatus.MerchantId = MerchantId.ToString();
|
|
|
+ // queryMerchantStatus.MerchantNo = AddInfo.MchtNo;
|
|
|
// RedisDbconn.Instance.AddList("WeChatSignHdQueue", queryMerchantStatus);
|
|
|
}
|
|
|
//创建失败
|
|
@@ -166,7 +142,6 @@ namespace MySystem
|
|
|
}
|
|
|
}
|
|
|
db.Dispose();
|
|
|
- db1.Dispose();
|
|
|
}
|
|
|
}
|
|
|
}
|