修改商家承担规则

BBWY.Server.Business/Order/OrderBusiness.cs

@@ -1257,7 +1257,7 @@ namespace BBWY.Server.Business
                 Initiator = string.IsNullOrEmpty(j.Value<string>("promotionName")) ? "平台" : "商家",
                 CouponOrPromotionType = j.Value<string>("saleTypeDesc"),
                 PreferentialAmount = j.Value<decimal>("salePrice"),
-                UndertakenByMerchantAmount = 0,
+                UndertakenByMerchantAmount = j.Value<decimal>("salePrice"),
                 UndertakenByPlatformAmount = 0
             }));
 
@@ -1267,7 +1267,9 @@ namespace BBWY.Server.Business
                 Initiator = string.IsNullOrEmpty(j.Value<string>("couponName")) ? "平台" : "商家",
                 CouponOrPromotionType = j.Value<string>("couponTypeDesc"),
                 PreferentialAmount = j.Value<decimal>("couponPrice"),
-                UndertakenByMerchantAmount = j.Value<decimal>("venderDivideMoney"),
+                UndertakenByMerchantAmount = j.Value<bool>("priceDivide") == true ?
+                                             j.Value<decimal>("venderDivideMoney") :
+                                             j.Value<decimal>("couponPrice"),
                 UndertakenByPlatformAmount = j.Value<decimal>("jdDivideMoney")
             }));
 
@@ -1282,8 +1284,8 @@ namespace BBWY.Server.Business
                     ItemList = g.ToList()
                 }).ToList(),
                 TotalPreferentialAmount = itemList.Sum(x => x.PreferentialAmount ?? 0),
-                TotalUndertakenByMerchantAmount = itemList.Where(x => x.Initiator == "商家").Sum(x => x.UndertakenByMerchantAmount ?? 0),
-                TotalUndertakenByPlatformAmount = itemList.Where(x => x.Initiator == "平台").Sum(x => x.UndertakenByPlatformAmount ?? 0),
+                TotalUndertakenByMerchantAmount = itemList.Sum(x => x.UndertakenByMerchantAmount ?? 0),
+                TotalUndertakenByPlatformAmount = itemList.Sum(x => x.UndertakenByPlatformAmount ?? 0),
                 TotalBalance = couponDetailVoJToken.Value<decimal?>("totalBalance"),
                 TotalBaseDiscount = couponDetailVoJToken.Value<decimal?>("totalBaseDiscount"),
                 TotalBaseFee = couponDetailVoJToken.Value<decimal?>("totalBaseFee"),