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

bex-cloud-staking-service/src/main/java/com/bex/staking/engine/OrderEngine.java

@@ -223,7 +223,8 @@ public class OrderEngine {
                 "",
                 contributionValue.toPlainString(),
                 RULE_CODE_PERSONAL_STAKE,
-                days);
+                days,
+                stakingNum.toPlainString());
 
         return Boolean.TRUE;
     }

bex-cloud-staking-service/src/main/java/com/bex/staking/mq/ContributionEventProducer.java

@@ -23,21 +23,22 @@ public class ContributionEventProducer {
     /**
      * 发送添加贡献记录事件
      *
-     * @param userId    用户ID
-     * @param sourceId  订单ID
-     * @param currency  币种
-     * @param value     交易金额
-     * @param stakeValue 质押数量（有质押才填，非质押填null）
-     * @param ruleCode  规则码（PERSONAL_STAKE/TEAM_STAKE/SPOT_TRADE/FUTURES_TRADE）
-     * @param days      质押天数（质押需填写，非质押填null）
+     * @param userId        用户ID
+     * @param sourceId      订单ID
+     * @param currency      币种
+     * @param value         交易金额
+     * @param stakeValue    质押数量（有质押才填，非质押填null）
+     * @param ruleCode      规则码（PERSONAL_STAKE/TEAM_STAKE/SPOT_TRADE/FUTURES_TRADE）
+     * @param days          质押天数（质押需填写，非质押填null）
+     * @param originalAmount 未计算比例前的原始质押数量（质押填，非质押填null）
      */
-    public void sendAddContributionRecordsEvent(String userId, String sourceId, String currency, String value, String stakeValue, String ruleCode, String days) {
+    public void sendAddContributionRecordsEvent(String userId, String sourceId, String currency, String value, String stakeValue, String ruleCode, String days, String originalAmount) {
         String destination = CONTRIBUTION_TOPIC + ":addContributionRecords_event";
         String message = String.format(
-                "{\"userId\":%s,\"sourceId\":\"%s\",\"currency\":\"%s\",\"value\":\"%s\",\"stakeValue\":\"%s\",\"ruleCode\":\"%s\",\"days\":\"%s\"}",
-                userId, sourceId, currency, value, stakeValue, ruleCode, days);
+                "{\"userId\":%s,\"sourceId\":\"%s\",\"currency\":\"%s\",\"value\":\"%s\",\"stakeValue\":\"%s\",\"ruleCode\":\"%s\",\"days\":\"%s\",\"originalAmount\":\"%s\"}",
+                userId, sourceId, currency, value, stakeValue, ruleCode, days, originalAmount);
         rocketMQTemplate.convertAndSend(destination, message);
-        log.info("发送“添加贡献记录”事件: userId={}, sourceId={}, ruleCode={}, currency={}, value={}",
-                userId, sourceId, ruleCode, currency, value);
+        log.info("发送“添加贡献记录”事件: userId={}, sourceId={}, ruleCode={}, currency={}, value={}, originalAmount={}",
+                userId, sourceId, ruleCode, currency, value, originalAmount);
     }
 }