Merge branch 'dev' of https://code.bizgaze.com/bizgaze/CRM.Visitors into dev
此提交包含在:
@@ -82,7 +82,7 @@ namespace Bizgaze.CRM.Visitors.ActionProviders
|
|||||||
var emailId = "";
|
var emailId = "";
|
||||||
//long installedAppId = 0;
|
//long installedAppId = 0;
|
||||||
var visitorName = "";
|
var visitorName = "";
|
||||||
// var stageStatusName = "";
|
// var stageStatusName = "";
|
||||||
var photourl = "";
|
var photourl = "";
|
||||||
var visitorInfo = docParameters.Find(x => x.DocType == "bizgazecrm_visitors");
|
var visitorInfo = docParameters.Find(x => x.DocType == "bizgazecrm_visitors");
|
||||||
|
|
||||||
@@ -114,7 +114,7 @@ namespace Bizgaze.CRM.Visitors.ActionProviders
|
|||||||
photourl = visitordata.Result.PhotoUrl;
|
photourl = visitordata.Result.PhotoUrl;
|
||||||
var stages = await stageManager.GetStageByStageStatusAsync(srequest, installedAppId, stageStatusName);
|
var stages = await stageManager.GetStageByStageStatusAsync(srequest, installedAppId, stageStatusName);
|
||||||
var NewStageIds = stages.Result.StageId;
|
var NewStageIds = stages.Result.StageId;
|
||||||
var UpdateStages= new Update("bizgazecrm_visitors").Value("stageid", NewStageIds).Where(Exp.Eq("visitorId", visitorIds));
|
var UpdateStages = new Update("bizgazecrm_visitors").Value("stageid", NewStageIds).Where(Exp.Eq("visitorId", visitorIds));
|
||||||
await _repository.ExecuteAsync(request, UpdateStages);
|
await _repository.ExecuteAsync(request, UpdateStages);
|
||||||
var visitorTypeid = visitordata.Result.VisitorType;
|
var visitorTypeid = visitordata.Result.VisitorType;
|
||||||
if (visitorTypeid != 2)
|
if (visitorTypeid != 2)
|
||||||
@@ -182,8 +182,14 @@ namespace Bizgaze.CRM.Visitors.ActionProviders
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var visitorInfos = await visitorManager.GetpreVisitorsAsync(srequest, code);
|
var visitorInfos = await visitorManager.GetpreVisitorsAsync(srequest, code);
|
||||||
var visitorId = Convert.ToInt64(visitorInfos.Result.VisitorId);
|
var visitorId = Convert.ToInt64(visitorInfos.Result.VisitorId);
|
||||||
|
var select = new Unibase.Data.Sql.Select("bizgazecrm_visitorcheckout").AllColumns().Where("visitorId", visitorId);
|
||||||
|
var parameters = new List<Unibase.Data.Parameter>();
|
||||||
|
parameters.Add(new Unibase.Data.Parameter("@visitorId", visitorId));
|
||||||
|
var dt = await GetDataTableAsync(srequest, select, parameters);
|
||||||
|
if (dt.Rows.Count == 0)
|
||||||
|
{
|
||||||
var vistoroptions = new EntityOptions()
|
var vistoroptions = new EntityOptions()
|
||||||
{
|
{
|
||||||
IsIdentity = true,
|
IsIdentity = true,
|
||||||
@@ -210,6 +216,7 @@ namespace Bizgaze.CRM.Visitors.ActionProviders
|
|||||||
if (requestTrans.StartedLocal) await request.RollbackTransactionAsync();
|
if (requestTrans.StartedLocal) await request.RollbackTransactionAsync();
|
||||||
return ActionResponse<FormActionResponse>.CreateErrorResponse("1", "Visitor Check Out Data Not Saved");
|
return ActionResponse<FormActionResponse>.CreateErrorResponse("1", "Visitor Check Out Data Not Saved");
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
var returnresponse = new FormActionResponse();
|
var returnresponse = new FormActionResponse();
|
||||||
returnresponse.Obj = dictObj as ExpandoObject;
|
returnresponse.Obj = dictObj as ExpandoObject;
|
||||||
|
|||||||
新增問題並參考
封鎖使用者