Skip to content

M
mall.oytour.com
Commit eabdd1d4 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq-ld

parents ee18d5c2 28ffee99
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ eabdd1d4
...@@ -665,7 +665,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -665,7 +665,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Failed("该订单已无法取消"); return ApiResult.Failed("该订单已无法取消");
} }
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
if (IsNormalServer == 1 && omodel.OrderStatus == OrderStatusEnum.WaitSendGoods) if (IsNormalServer == 1 && omodel.OrderStatus == OrderStatusEnum.WaitSendGoods && omodel.OrderSource != UserSourceEnum.ERP)
{ {
//获取小程序信息 //获取小程序信息
var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId); var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment