|
@@ -264,7 +264,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
MerchantParamSet merchantset = MerchantParamSetDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantParamSet();
|
|
MerchantParamSet merchantset = MerchantParamSetDbconn.Instance.Get(qrcode.MerchantId) ?? new MerchantParamSet();
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
|
|
string OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
|
|
- maindb.ConsumerOrders.Add(new ConsumerOrders()
|
|
|
|
|
|
+ ConsumerOrders order = maindb.ConsumerOrders.Add(new ConsumerOrders()
|
|
{
|
|
{
|
|
// Id = PublicFunction.MakeConsumerOrderId(),
|
|
// Id = PublicFunction.MakeConsumerOrderId(),
|
|
CreateDate = DateTime.Now, //创建时间
|
|
CreateDate = DateTime.Now, //创建时间
|
|
@@ -277,6 +277,12 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
MaxDivi = PayMoney * merchantset.DiviPercent / 100,
|
|
MaxDivi = PayMoney * merchantset.DiviPercent / 100,
|
|
IsAct = merchantset.IsAll == 1 ? 0u : 1u,
|
|
IsAct = merchantset.IsAll == 1 ? 0u : 1u,
|
|
SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
|
|
SeoDescription = Newtonsoft.Json.JsonConvert.SerializeObject(merchantset),
|
|
|
|
+ }).Entity;
|
|
|
|
+ maindb.SaveChanges();
|
|
|
|
+ maindb.ConsumerOrderForNo.Add(new ConsumerOrderForNo()
|
|
|
|
+ {
|
|
|
|
+ OrderNo = OrderNo,
|
|
|
|
+ OrderIds = order.Id,
|
|
});
|
|
});
|
|
maindb.SaveChanges();
|
|
maindb.SaveChanges();
|
|
if (PayMode == 1)
|
|
if (PayMode == 1)
|