From f32639164edf205681649d7c1a08ea38e62cf74f Mon Sep 17 00:00:00 2001
From: sanji <sanji@tuanhuo.com>
Date: Mon, 16 Oct 2023 12:50:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=B9=B3=E5=8F=B0=EF=BC=8C=E5=88=99=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E6=89=BF=E6=8B=85=E5=85=A8=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/Order/OrderBusiness.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index f4894b60..7616cdbd 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -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")
             }));