Merge remote-tracking branch 'origin/dev' into prod

yd-csf-service/src/main/java/com/yd/csf/service/service/impl/CommissionServiceImpl.java

@@ -815,10 +815,9 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
                 // 入账检核汇率 — 仅审计追溯，始终写入
                 // 入账检核汇率 — 仅审计追溯，始终写入
                 fortune.setExchangeRate(exchangeRate);
                 fortune.setExchangeRate(exchangeRate);
 
 
-                // 判断 expectedFortune.originalCurrency 、入账币种-fortune.currency 是否都等于 HKD
+                // 判断 入账币种-fortune.currency 是否等于 HKD
                 Commission matchedCommission = commissionByPolicyPeriod.get(key);
                 Commission matchedCommission = commissionByPolicyPeriod.get(key);
                 boolean isAllHkd = matchedCommission != null
                 boolean isAllHkd = matchedCommission != null
-                        && "HKD".equalsIgnoreCase(expectedFortune.getOriginalCurrency())
                         && "HKD".equalsIgnoreCase(matchedCommission.getCurrency());
                         && "HKD".equalsIgnoreCase(matchedCommission.getCurrency());
 
 
                 if (isAllHkd) {
                 if (isAllHkd) {