From d35a0f12b40ed8afe2430e9ed85845483f4024c4 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Sat, 23 Aug 2025 14:08:12 +0800
Subject: [PATCH] =?UTF-8?q?refactor(sales):=20=E9=87=8D=E6=9E=84=E9=94=80?=
 =?UTF-8?q?=E5=94=AE=E9=80=80=E8=B4=A7=E9=87=91=E9=A2=9D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉原有的条件判断代码块
- 根据闫旭的要求，统一使用实际退金额进行计算
- 调整测试用例，禁用部分测试场景
---
 .../sales/SoSaleReturnPluginInitializerToC.java  | 16 +++++++++-------
 .../SoSaleReturnPluginInitializerToCTest.java    |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
index 720ff0b4..073d6498 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
@@ -2354,13 +2354,15 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                     //取《U8C存货基本档案-参考售价》
                     totalAmount = getRefsaleprice(bdInvmandocEntity, bdInvbasdocEntity, calculationFormulaStr, goodsRertunSonDetailsDto, header);
                 } else {
-                    if (sceneType.equals("tran")) {
-                        //取《O实退金额》
-                        totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
-                    } else {
-                        //取《O实退金额/O请求数量*O实收数量》
-                        totalAmount = accumulatedDiscounts(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
-                    }
+//                    if (sceneType.equals("tran")) {
+//                        //取《O实退金额》
+//                        totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
+//                    } else {
+//                        //取《O实退金额/O请求数量*O实收数量》
+//                        totalAmount = accumulatedDiscounts(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
+//                    }
+                    //2025年8月23日13:49:04 闫旭找我沟通，统一取O实退金额，
+                    totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
                 }
 
                 //取对应的售后订单明细，主要是取这个价格
diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
index f146c687..f0081eb0 100644
--- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
+++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
@@ -74,9 +74,9 @@ public class SoSaleReturnPluginInitializerToCTest {
             //满足红字应收单
 //            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200001324", "tran");
             //情况一
-//            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900000460", "stock");
+            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072900000460", "stock");
             //情况二
-            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072800000594", "tran");
+//            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072800000594", "tran");
             //情况三
 //            soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025080200002257", "tran");