refactor(sales): 更新退货订单处理逻辑

- 修改退货订单详情中的商家优惠字段注释
- 优化退货订单计算公式字符串拼接
- 更新测试用例中的时间参数
- 移除无用的代码注释

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

@@ -1033,7 +1033,7 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
      * @author liuyang
      */
     private String createGenerateBusinessDate(StockinOrderSearchResponse.StockinOrder.StockinH header) {
-//        header.setClosedAt("2024-11-07 11:57:12");
+//        header.setClosedAt("2024-11-26 16:21:12");
         String code = null;
         if (header != null && header.getCode() != null) {
             code = header.getCode();
@@ -1519,6 +1519,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
                     //取O实退金额
 //                    RerturnGoodsOrderSearchDetails afterSalesOrder = findAfterSalesOrderV2(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData);
 //                    totalAmount = afterSalesOrder.getTotalAmount();
+                    //测试
+//                    goodsRertunSonDetailsDto.setReceivedQty("1");
                     totalAmount = accumulatedDiscounts(goodsRertunSonDetailsDto, rerturnGoodsOrderSearchData, calculationFormulaStr);
                 }
                 Assert.notNull(totalAmount, "实退金额不能为空 明细行主键:{}", goodsRertunSonDetailsDto.getId());
@@ -2675,6 +2677,8 @@ public class SoSaleReturnPluginInitializerToC extends PluginBaseEntity {
         BigDecimal actualRefundAmount = unitPriceIncludingTax.multiply(new BigDecimal(receivedQty)).setScale(4, BigDecimal.ROUND_HALF_UP);
         //出库对应的实退=含税单价(actualRefundAmount)*出库单实退数量
 //        BigDecimal actualRefundAmountBigDecimal = new BigDecimal(receivedQty).multiply(actualRefundAmount).setScale(2, BigDecimal.ROUND_HALF_UP);
+        String format = StrUtil.format("{}/{}*{}", totalAmount, requestQty, receivedQty);
+        calculationFormulaStr.append(format);
 
         //商家优惠：不处理！！！仅保存
         String merchantDiscounts = targetDetails.getMerchantDiscounts();

buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java

@@ -110,9 +110,9 @@ class SoSaleOutPluginInitializerToCTest {
 //            soSaleOutPluginInitializerToC.startImplementStockByCode(aaa, "tran");
 
 //            String aaa = "LETS-SH2024102800021196";
-//            soSaleOutPluginInitializerToC.startImplementTranByTime("2024-11-05 10:28:06", "2024-11-05 10:28:06");
+            soSaleOutPluginInitializerToC.startImplementTranByTime("2024-11-22 11:10:16", "2024-11-22 11:10:16");
 
-            soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-15 00:00:00", "2024-11-15 23:59:59");
+//            soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-15 00:00:00", "2024-11-15 23:59:59");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -122,6 +122,8 @@ class SoSaleOutPluginInitializerToCTest {
         try {
 //            soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024103100030329", "stock");
 //            soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024110500013375", "tran");
+
+//            soSaleOutPluginInitializerToC.startImplementStockByCode("LETS-SH2024111700013756", "tran");
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -30,8 +30,8 @@ public class SoSaleReturnPluginInitializerToCTest {
     public void startImplement() {
 //        soSaleReturnPluginInitializerToC.startImplement(null, null);
         try {
-//            String code = "LETS-RE2024110500004678";
+            String code = "LETS-RE2024110500009177";
-//            soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
+            soSaleReturnPluginInitializerToC.startImplementByCode(code, "stock");
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -46,7 +46,7 @@ public class SoSaleReturnPluginInitializerToCTest {
 //            JSONObject jsonObject = new JSONObject();
 //            soSaleReturnPluginInitializerToC.executeBusiness(jsonObject);
 
-            soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-11-01 00:00:00", "2024-11-05 23:59:59");
+//            soSaleReturnPluginInitializerToC.startImplementByTradeTime("2024-11-01 00:00:00", "2024-11-05 23:59:59");
         } catch (Exception e) {
             e.printStackTrace();
         }

service/src/main/java/com/hzya/frame/ttxofs/dto/returngoodordersearch/RerturnGoodsOrderSearchDetails.java

@@ -68,7 +68,7 @@ public class RerturnGoodsOrderSearchDetails {
 
     //平台优惠
     private String platformDiscounts;
-    //商家优惠
+    //商家优惠：对于TOC业务O的售后订单，本来就没有，已经和杨云确认
     private String merchantDiscounts;
     //达人优惠
     private String expertDiscounts;