hzya
/
kangarooDataCenterV3
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(sales): 重构销售退货金额计算逻辑 

- 注释掉原有的条件判断代码块
- 根据闫旭的要求，统一使用实际退金额进行计算
- 调整测试用例，禁用部分测试场景
This commit is contained in:
liuy 2025-08-23 14:08:12 +08:00
parent c2b10a8c40
commit d35a0f12b4
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToC.java
View File

@ -2354,13 +2354,15 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
//取《U8C存货基本档案-参考售价》 //取《U8C存货基本档案-参考售价》
totalAmount = getRefsaleprice(bdInvmandocEntity, bdInvbasdocEntity, calculationFormulaStr, goodsRertunSonDetailsDto, header); totalAmount = getRefsaleprice(bdInvmandocEntity, bdInvbasdocEntity, calculationFormulaStr, goodsRertunSonDetailsDto, header);
} else { } else {
if (sceneType.equals("tran")) { // if (sceneType.equals("tran")) {
//取《O实退金额》 // //取《O实退金额》
totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr); // totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
} else { // } else {
//取《O实退金额/O请求数量*O实收数量》 // //取《O实退金额/O请求数量*O实收数量》
totalAmount = accumulatedDiscounts(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr); // totalAmount = accumulatedDiscounts(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
} // }
//2025年8月23日13:49:04 闫旭找我沟通，统一取O实退金额，
totalAmount = accumulatedDiscountsV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
} }
//取对应的售后订单明细，主要是取这个价格 //取对应的售后订单明细，主要是取这个价格

4
buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleReturnPluginInitializerToCTest.java
View File

@ -74,9 +74,9 @@ public class SoSaleReturnPluginInitializerToCTest {
//满足红字应收单 //满足红字应收单
// soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025072200001324", "tran"); // 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"); // soSaleReturnPluginInitializerToC.startImplementByCode("LETS-RE2025080200002257", "tran");