Merge branch 'glms/feature/0812_zmr_divPower' into 'glms/feature/1.4.2'

fix(trade): 标的除权0覆盖旧值

See merge request otc-dev/zszq-trs!17

UnitTestProject/Modules/SwapModule/SplitCorporateActionTddTest.cs

@@ -133,6 +133,17 @@ namespace YLErp.Modules.SwapModule
             Assert.AreEqual(1m, GetSplit(target));
         }
 
+        [TestMethod]
+        public void ZeroCashDividendOverridesExistingValueDuringMerge()
+        {
+            var target = CreateCorporateAction(cash: 10m);
+            var source = CreateCorporateAction(cash: 0m);
+
+            InvokeMerge(target, source);
+
+            Assert.AreEqual(0m, target.GiveCashAmount);
+        }
+
         private static ex_dividend_info CreateCorporateAction(
             decimal cash = 0m,
             decimal giveShare = 0m,
@@ -188,7 +199,7 @@ namespace YLErp.Modules.SwapModule
         private static void InvokeMerge(ex_dividend_info target, ex_dividend_info source)
         {
             var method = typeof(DividendService).GetMethod(
-                "MergeNonZeroDividendValues",
+                "MergeDividendValues",
                 BindingFlags.Static | BindingFlags.NonPublic);
             Assert.IsNotNull(method, "公司行为存量合并方法不存在");
             method.Invoke(null, new object[] { target, source });