|
|
@@ -43,7 +43,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
if (query.Id > 0)
|
|
|
{
|
|
|
Dictionary<string, object> fields = new Dictionary<string, object>();
|
|
|
- fields.Add("Sort", PayMode); //订单号
|
|
|
+ fields.Add("Sort", PayMode); //支付方式(1 支付宝)
|
|
|
MerchantDepositOrderService.Edit(fields, Id, false);
|
|
|
string PayData = "";
|
|
|
Models.KxsMainModels.PublicAccountSet set = new AlipayFunctionForKxs(_accessor.HttpContext).SetData(MerchantId);
|
|
|
@@ -80,7 +80,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
|
|
|
Dictionary<string, object> Obj = new Dictionary<string, object>();
|
|
|
MerchantInfo merchant = MerchantInfoService.Query(MerchantId);
|
|
|
- string OrderNo = "SHJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
|
|
|
+ string OrderNo = "YLJH" + DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8);
|
|
|
string check = RedisDbconn.Instance.Get<string>("ConfirmOrder:" + MerchantId + "_" + OrderNo);
|
|
|
if (!string.IsNullOrEmpty(check))
|
|
|
{
|
