|
|
@@ -249,45 +249,45 @@ namespace MySystem
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
- PxcModels.SimposMerchantInfo sim = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Bind.MerNo && m.KqSnNo == Bind.MerSnNo);
|
|
|
- if (sim == null)
|
|
|
+ string json = Bind.SeoDescription;
|
|
|
+ string ProductName = ""; //商品名称
|
|
|
+ string ActivityName = ""; //促销活动名称
|
|
|
+ string ProductTypeName = ""; //商品类型名称
|
|
|
+ string ActStatusName = ""; //激活状态名称
|
|
|
+ string ActAmount = ""; //实付金额
|
|
|
+ string EmployeeNo = ""; //员工工号
|
|
|
+ string EmployeeName = ""; //员工姓名
|
|
|
+ if(!string.IsNullOrEmpty(json))
|
|
|
{
|
|
|
- string json = Bind.SeoDescription;
|
|
|
- string ProductName = ""; //商品名称
|
|
|
- string ActivityName = ""; //促销活动名称
|
|
|
- string ProductTypeName = ""; //商品类型名称
|
|
|
- string ActStatusName = ""; //激活状态名称
|
|
|
- string ActAmount = ""; //实付金额
|
|
|
- string EmployeeNo = ""; //员工工号
|
|
|
- string EmployeeName = ""; //员工姓名
|
|
|
- if(!string.IsNullOrEmpty(json))
|
|
|
- {
|
|
|
- JsonData jsonObj = JsonMapper.ToObject(json);
|
|
|
- ProductName = jsonObj["ProductName"].ToString();
|
|
|
- ActivityName = jsonObj["ActiveName"].ToString();
|
|
|
- ProductTypeName = jsonObj["ProductType"].ToString();
|
|
|
- ActAmount = jsonObj["ActualAmount"].ToString();
|
|
|
- ActStatusName = jsonObj["ActStatus"].ToString();
|
|
|
- EmployeeNo = jsonObj["WorkNo"].ToString();
|
|
|
- EmployeeName = jsonObj["AccountName"].ToString();
|
|
|
- }
|
|
|
+ JsonData jsonObj = JsonMapper.ToObject(json);
|
|
|
+ ProductName = jsonObj["ProductName"].ToString();
|
|
|
+ ActivityName = jsonObj["ActiveName"].ToString();
|
|
|
+ ProductTypeName = jsonObj["ProductType"].ToString();
|
|
|
+ ActAmount = jsonObj["ActualAmount"].ToString();
|
|
|
+ ActStatusName = jsonObj["ActStatus"].ToString();
|
|
|
+ EmployeeNo = jsonObj["WorkNo"].ToString();
|
|
|
+ EmployeeName = jsonObj["AccountName"].ToString();
|
|
|
+ }
|
|
|
+ PxcModels.SimposMerchantInfo sim = db.SimposMerchantInfo.FirstOrDefault(m => m.KqMerNo == Bind.MerNo);
|
|
|
+ if (sim == null)
|
|
|
+ {
|
|
|
sim = db.SimposMerchantInfo.Add(new PxcModels.SimposMerchantInfo()
|
|
|
{
|
|
|
Id = add.Id,
|
|
|
CreateDate = Bind.CreateTime,
|
|
|
KqMerNo = Bind.MerNo,
|
|
|
- KqSnNo = Bind.MerSnNo,
|
|
|
MerchantNo = Bind.MerNo.Length > 16 ? Bind.MerNo.Substring(0, 16) : Bind.MerNo,
|
|
|
- ProductName = ProductName,
|
|
|
- ActivityName = ActivityName,
|
|
|
- ProductTypeName = ProductTypeName,
|
|
|
- ActStatusName = ActStatusName,
|
|
|
- ActAmount = decimal.Parse(ActAmount),
|
|
|
- EmployeeNo = EmployeeNo,
|
|
|
- EmployeeName = EmployeeName,
|
|
|
}).Entity;
|
|
|
db.SaveChanges();
|
|
|
}
|
|
|
+ sim.KqSnNo = Bind.MerSnNo;
|
|
|
+ sim.ProductName = ProductName;
|
|
|
+ sim.ActivityName = ActivityName;
|
|
|
+ sim.ProductTypeName = ProductTypeName;
|
|
|
+ sim.ActStatusName = ActStatusName;
|
|
|
+ sim.ActAmount = decimal.Parse(ActAmount);
|
|
|
+ sim.EmployeeNo = EmployeeNo;
|
|
|
+ sim.EmployeeName = EmployeeName;
|
|
|
pos.BindMerchantId = add.Id;
|
|
|
pos.LastMerchantId = add.Id;
|
|
|
if(pos.CardType < 2)
|
