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

refactor(swap): 统一债券价格处理逻辑

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

YLErpDAL/Modules/EodModule/BondPaymentService.cs

@@ -59,43 +59,7 @@ namespace YLErp.Modules.EodModule
                             create_time = source.create_time,
                             update_time = source.update_time
                         };
-            // 不再依赖 bond-sync 镜像：Stock/Fund 公司行为直接作为展示行返回。
-            // 展示金额按“每 10 份派现金额”换算为 GiveCashAmount / 10；EOD 计算仍使用
-            // GetBondPayments 的内部单位口径，不受此处展示换算影响。
-            var corporateQuery = from un in queryUn
-                                 join dividend in DbContext.ex_dividend_info.AsNoTracking()
-                                     on un.UnderlyingCode equals dividend.UnderlyingCode
-                                 where dividend.ValidStatus
-                                     && dividend.EffectiveDate.HasValue
-                                     && dividend.EffectiveDate.Value >= valueDtStart
-                                     && dividend.EffectiveDate.Value < valueDtEnd
-                                     && dividend.GiveCashAmount != 0
-                                     && (string.IsNullOrEmpty(req.UnderlyingCode)
-                                         || dividend.UnderlyingCode.Contains(req.UnderlyingCode))
-                                     && (un.UnderlyingInstrumentType == ConsGlobal.InstrumentType.Stock
-                                         || un.UnderlyingInstrumentType == ConsGlobal.InstrumentType.Fund)
-                                     && (string.IsNullOrEmpty(req.DataSource)
-                                         || "公司行为除权表".Contains(req.DataSource))
-                                 select new BondPaymentDto
-                                 {
-                                     id = -dividend.id,
-                                     channel_source = "公司行为除权表",
-                                     MarketName = un.MarketName,
-                                     security_id = un.UnderlyingCode,
-                                     symbol = un.UnderlyingName,
-                                     coupon_rate = null,
-                                     payment_date = dividend.EffectiveDate,
-                                     payment_interest = dividend.GiveCashAmount / 10m,
-                                     payment_parvalue = null,
-                                     paying_price = dividend.GiveCashAmount / 10m,
-                                     create_time = dividend.OptDate,
-                                     update_time = dividend.OptDate
-                                 };
-            // EF Core 无法翻译两个对 BondPaymentDto 继承属性赋值集合不完全一致的投影
-            // 直接 Concat；分别执行后在内存合并，不改变两组查询的筛选口径。
-            var rows = query.ToList();
-            rows.AddRange(corporateQuery.ToList());
-            var result = rows.AsQueryable().ToSearchList(req);
+            var result = query.ToSearchList(req);
             return result;
         }