调整分账标记逻辑顺序

Areas/Api/Controllers/Main/ConsumerOrdersController.cs

@@ -92,7 +92,6 @@ namespace MySystem.Areas.Api.Controllers.v1
             var merchant = MerchantInfoService.Query(MerchantId);
             var merchantAdd = MerchantAddInfoService.Query(MerchantId);
             var merchantset = MerchantParamSetService.Query(MerchantId);
-            var ledgerModel = merchantset.IsAll == 1 ? "1" : "5";
             string openid = "";
             if (merchant.IsAct == 0)
             {
@@ -133,6 +132,8 @@ namespace MySystem.Areas.Api.Controllers.v1
             {
                 ActFlag = false;
             }
+            var ledgerModel = ActFlag ? "5" : "1";
+
             var infos = ConsumerOrdersUtil.AddConsumerOrders(MerchantId, ConsumerId, merchant.UserId, PayMode, PayMoney, SnNo, OrderNo, ActFlag ? PayMoney * merchantset.DiviPercent / 100 : 0, ActFlag ? 1u : 0u, ActFlag ? PayMoney * merchantset.GetPercent / 100 : PayMoney, Newtonsoft.Json.JsonConvert.SerializeObject(merchantset));
             ConsumerOrderForNoUtil.AddConsumerOrderForNo(OrderNo, int.Parse(infos.Data.ToString()));
             if (PayMode == 1)