nacos_config/rc-service-wallet/application.yml

@@ -10,11 +10,3 @@ invite:
       base-url: ${INVITE_CAMPAIGN_GO_URL:}
       internal-token: ${GAME_INTERNAL_CALLBACK_SECRET:}
       timeout-millis: ${INVITE_CAMPAIGN_GO_TIMEOUT_MILLIS:10000}
-
-task:
-  center:
-    go:
-      enabled: ${TASK_CENTER_GO_ENABLED:true}
-      base-url: ${TASK_CENTER_GO_URL:${LIKEI_GATEWAY_ROUTE_GO_URI:http://golang:2900}}
-      internal-token: ${GAME_INTERNAL_CALLBACK_SECRET:}
-      timeout-millis: ${TASK_CENTER_GO_TIMEOUT_MILLIS:3000}

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/BlessingsGiftGiveCmdExe.java

@@ -10,7 +10,6 @@ import com.red.circle.mq.business.model.event.gift.GiveGiftConfig;
 import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
 import com.red.circle.mq.rocket.business.producer.GiftMqMessage;
 import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
-import com.red.circle.other.app.common.task.TaskCenterGoClient;
 import com.red.circle.other.app.dto.cmd.gift.GiveAwayGiftBatchCmd;
 import com.red.circle.other.infra.database.cache.service.other.GiftCacheService;
 import com.red.circle.other.infra.database.rds.service.user.user.CpRelationshipService;
@@ -49,7 +48,6 @@ public class BlessingsGiftGiveCmdExe {
   private final TaskMqMessage taskMqMessage;
   private final WalletGoldClient walletGoldClient;
   private final CpRelationshipService cpRelationshipService;
-  private final TaskCenterGoClient taskCenterGoClient;
   public BigDecimal execute(GiveAwayGiftBatchCmd cmd) {
 
     // 过滤赠送人非法值
@@ -84,7 +82,6 @@ public class BlessingsGiftGiveCmdExe {
 //    log.warn("cptesttest execute:{}", JacksonUtils.toJson(giftBatchEvent));
     giftBatchEvent.setCheckBlessingsGift(Boolean.TRUE);
     giftMqMessage.sendGift(receipt.getAssetRecordId().toString(), giftBatchEvent);
-    reportTaskCenterGiftEvent(cmd, giftConfig, receipt);
 
 
 
@@ -120,26 +117,6 @@ public class BlessingsGiftGiveCmdExe {
 
   }
 
-  private void reportTaskCenterGiftEvent(GiveAwayGiftBatchCmd cmd, GiftConfigDTO giftConfig,
-      WalletReceiptResDTO receipt) {
-    if (Objects.isNull(receipt)) {
-      return;
-    }
-    taskCenterGoClient.reportGiftConsumeGold(cmd.requireReqSysOrigin(),
-        cmd.requiredReqUserId(),
-        receipt.getAssetRecordId(),
-        giftConfig.getId(),
-        giftConfig.getGiftName(),
-        giftConfig.getGiftTab(),
-        giftConfig.getGiftCandy(),
-        cmd.getQuantity(),
-        cmd.filterAcceptUserId().size(),
-        receipt.getOpAmount().getDollarAmount(),
-        cmd.getRoomId(),
-        cmd.getDynamicContentId(),
-        "BLESSINGS_GIFT");
-  }
-
   private GiveAwayGiftBatchEvent toGiveAwayGiftBatchEvent(GiveAwayGiftBatchCmd cmd,
                                                           GiftConfigDTO giftConfig, Long trackId) {
 

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/GiftGiveAwayBatchCmdExe.java

@@ -8,7 +8,6 @@ import com.red.circle.framework.core.response.ResponseErrorCode;
 import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
 import com.red.circle.mq.rocket.business.producer.GiftMqMessage;
 import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
-import com.red.circle.other.app.common.task.TaskCenterGoClient;
 import com.red.circle.other.app.convertor.material.GiftAppConvertor;
 import com.red.circle.other.app.dto.cmd.gift.GiveAwayGiftBatchCmd;
 import com.red.circle.other.app.service.task.TaskService;
@@ -56,7 +55,6 @@ public class GiftGiveAwayBatchCmdExe {
   private final WalletDiamondClient walletDiamondClient;
   private final TaskService taskService;
   private final UserRegionGateway userRegionGateway;
-  private final TaskCenterGoClient taskCenterGoClient;
 
   public BigDecimal execute(GiveAwayGiftBatchCmd cmd) {
 
@@ -88,7 +86,6 @@ public class GiftGiveAwayBatchCmdExe {
 
     giftMqMessage.sendGift(receipt.getConsumeId().toString(),
         giftAppConvertor.toGiveAwayGiftBatchEvent(cmd, giftConfig, receipt.getConsumeId()));
-    reportTaskCenterGiftEvent(cmd, giftConfig, receipt);
     userProfileGateway.removeCache(cmd.requiredReqUserId());
 
     // 检查是否未完成任务
@@ -166,26 +163,6 @@ public class GiftGiveAwayBatchCmdExe {
     throw new IllegalArgumentException("param error.");
   }
 
-  private void reportTaskCenterGiftEvent(GiveAwayGiftBatchCmd cmd, GiftConfigDTO giftConfig,
-      WalletReceiptDTO receipt) {
-    if (!isGiftTypeEqGold(giftConfig) || Objects.isNull(receipt)) {
-      return;
-    }
-    taskCenterGoClient.reportGiftConsumeGold(cmd.requireReqSysOrigin(),
-        cmd.requiredReqUserId(),
-        receipt.getConsumeId(),
-        giftConfig.getId(),
-        giftConfig.getGiftName(),
-        giftConfig.getGiftTab(),
-        giftConfig.getGiftCandy(),
-        cmd.getQuantity(),
-        cmd.filterAcceptUserId().size(),
-        receipt.getProcessAmount(),
-        cmd.getRoomId(),
-        cmd.getDynamicContentId(),
-        "NORMAL_GIFT");
-  }
-
   private boolean isGiftTypeEqDiamond(GiftConfigDTO giftConfigInfo) {
     return Objects.equals(giftConfigInfo.getType(), GiftCurrencyType.DIAMOND.name());
   }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/gift/LuckyGiftGiveCmdExe.java

@@ -7,7 +7,6 @@ import com.red.circle.mq.business.model.event.task.TaskApprovalEvent;
 import com.red.circle.mq.rocket.business.producer.GiftMqMessage;
 import com.red.circle.mq.rocket.business.producer.TaskMqMessage;
 import com.red.circle.other.app.common.gift.GameLuckyGiftCommon;
-import com.red.circle.other.app.common.task.TaskCenterGoClient;
 import com.red.circle.other.app.convertor.material.GiftAppConvertor;
 import com.red.circle.other.app.dto.cmd.gift.GiveAwayGiftBatchCmd;
 import com.red.circle.other.app.service.task.TaskService;
@@ -50,7 +49,6 @@ public class LuckyGiftGiveCmdExe {
   private final GameLuckyGiftCommon gameLuckyGiftCommon;
   private final TaskMqMessage taskMqMessage;
   private final TaskService taskService;
-  private final TaskCenterGoClient taskCenterGoClient;
 
   public BigDecimal execute(GiveAwayGiftBatchCmd cmd) {
 
@@ -100,7 +98,6 @@ public class LuckyGiftGiveCmdExe {
           giftAppConvertor.toGiveAwayGiftBatchEvent(cmd, giftConfig, trackId)
       );
     }
-    reportTaskCenterGiftEvent(cmd, giftConfig, receipt);
 
     // 抽奖mq
     if (luckyGift) {
@@ -156,27 +153,4 @@ public class LuckyGiftGiveCmdExe {
 
   }
 
-  private void reportTaskCenterGiftEvent(GiveAwayGiftBatchCmd cmd, GiftConfigDTO giftConfig,
-      WalletReceiptResDTO receipt) {
-    if (Objects.isNull(receipt)) {
-      return;
-    }
-    String source = Objects.equals(giftConfig.getGiftTab(), GiftTabEnum.MAGIC.name())
-        ? "MAGIC_GIFT"
-        : "LUCKY_GIFT";
-    taskCenterGoClient.reportGiftConsumeGold(cmd.requireReqSysOrigin(),
-        cmd.requiredReqUserId(),
-        receipt.getAssetRecordId(),
-        giftConfig.getId(),
-        giftConfig.getGiftName(),
-        giftConfig.getGiftTab(),
-        giftConfig.getGiftCandy(),
-        cmd.getQuantity(),
-        cmd.filterAcceptUserId().size(),
-        receipt.getOpAmount().getDollarAmount(),
-        cmd.getRoomId(),
-        cmd.getDynamicContentId(),
-        source);
-  }
-
 }

rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/common/task/TaskCenterGoClient.java

@@ -3,9 +3,7 @@ package com.red.circle.other.app.common.task;
 import cn.hutool.http.HttpResponse;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import java.math.BigDecimal;
 import java.time.Instant;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 import lombok.Data;
@@ -19,7 +17,6 @@ import org.springframework.stereotype.Component;
 public class TaskCenterGoClient {
 
   private static final String EVENT_TYPE_GAME_CONSUME_GOLD = "GAME_CONSUME_GOLD";
-  private static final String EVENT_TYPE_GIFT_CONSUME_GOLD = "GIFT_CONSUME_GOLD";
 
   @Value("${task.center.go.enabled:true}")
   private boolean enabled;
@@ -54,52 +51,6 @@ public class TaskCenterGoClient {
         .setPayload(payload));
   }
 
-  public void reportGiftConsumeGold(String sysOrigin,
-      Long userId,
-      Long trackId,
-      Long giftId,
-      String giftName,
-      String giftTab,
-      BigDecimal giftCandy,
-      Integer quantity,
-      Integer acceptUserSize,
-      BigDecimal consumeGold,
-      Long roomId,
-      Long dynamicContentId,
-      String source) {
-    if (Objects.isNull(userId) || Objects.isNull(trackId) || Objects.isNull(consumeGold)
-        || consumeGold.compareTo(BigDecimal.ZERO) <= 0) {
-      return;
-    }
-
-    long deltaGold = consumeGold.longValue();
-    if (deltaGold <= 0) {
-      return;
-    }
-
-    Map<String, Object> payload = new HashMap<>();
-    payload.put("trackId", trackId);
-    payload.put("giftId", giftId);
-    payload.put("giftName", giftName);
-    payload.put("giftTab", giftTab);
-    payload.put("giftCandy", giftCandy);
-    payload.put("quantity", quantity);
-    payload.put("acceptUserSize", acceptUserSize);
-    payload.put("actualAmount", consumeGold);
-    payload.put("roomId", roomId);
-    payload.put("dynamicContentId", dynamicContentId);
-    payload.put("source", source);
-
-    reportEvent(new TaskCenterEventRequest()
-        .setSysOrigin(sysOrigin)
-        .setEventId("GIFT_CONSUME:" + trackId)
-        .setEventType(EVENT_TYPE_GIFT_CONSUME_GOLD)
-        .setUserId(userId)
-        .setDeltaValue(deltaGold)
-        .setOccurredAt(Instant.now().toString())
-        .setPayload(payload));
-  }
-
   private void reportEvent(TaskCenterEventRequest request) {
     if (!enabled) {
       return;

rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/DealerToUserShipCmdExe.java

@@ -29,7 +29,6 @@ import com.red.circle.other.inner.asserts.user.UserErrorCode;
 import com.red.circle.other.inner.endpoint.user.user.UserSvipClient;
 import com.red.circle.wallet.app.dto.cmd.FreightDealerToUserShipCmd;
 import com.red.circle.wallet.app.common.invite.InviteCampaignGoClient;
-import com.red.circle.wallet.app.common.task.TaskCenterGoClient;
 import com.red.circle.wallet.domain.gateway.FreightShipGateway;
 import com.red.circle.wallet.domain.gateway.WalletGoldGateway;
 import com.red.circle.wallet.domain.wallet.WalletReceipt;
@@ -85,7 +84,6 @@ public class DealerToUserShipCmdExe {
     private final UserProfileClient userProfileClient;
     private final InviteUserClient inviteUserClient;
     private final InviteCampaignGoClient inviteCampaignGoClient;
-    private final TaskCenterGoClient taskCenterGoClient;
 
   public BigDecimal execute(FreightDealerToUserShipCmd cmd) {
     controlSwitch.execute(cmd.requireReqSysOriginChildEnum());
@@ -171,15 +169,6 @@ public class DealerToUserShipCmdExe {
 
       // 累计充值
       incrRechargeQuantity(cmd);
-      taskCenterGoClient.reportSellerAgentRechargeGold(cmd.requireReqSysOrigin(),
-          cmd.getAcceptUserId(),
-          runningWater.getId(),
-          cmd.getQuantity(),
-          getGoldToSUD(cmd),
-          cmd.requiredReqUserId(),
-          freightBalance.getUserId(),
-          freightSeller.getId(),
-          cmd.getReqTraceId());
       notifyInviteCampaignRecharge(cmd, runningWater);
 
       //累计今日充值，每日累计充值抽奖活动

rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/command/freight/SendFreightShipCmdExe.java

@@ -34,7 +34,6 @@ import com.red.circle.tool.core.num.ArithmeticUtils;
 import com.red.circle.tool.core.tuple.PennyAmount;
 import com.red.circle.other.inner.asserts.user.UserErrorCode;
 import com.red.circle.wallet.app.common.invite.InviteCampaignGoClient;
-import com.red.circle.wallet.app.common.task.TaskCenterGoClient;
 import com.red.circle.wallet.app.dto.cmd.FreightShipSendCmd;
 import com.red.circle.wallet.app.dto.cmd.SalaryWithdrawCmd;
 import com.red.circle.wallet.domain.gateway.FreightShipGateway;
@@ -97,7 +96,6 @@ public class SendFreightShipCmdExe {
   private final InviteCampaignGoClient inviteCampaignGoClient;
   private final UserRegionClient userRegionClient;
   private final OfficialNoticeClient officialNoticeClient;
-  private final TaskCenterGoClient taskCenterGoClient;
 
   public BigDecimal execute(FreightShipSendCmd cmd) {
 
@@ -192,13 +190,6 @@ public class SendFreightShipCmdExe {
 
         // 累计充值
         incrRechargeQuantity(cmd);
-        taskCenterGoClient.reportShippingAgentRechargeGold(cmd.requireReqSysOrigin(),
-            cmd.getAcceptUserId(),
-            runningWater.getId(),
-            cmd.getQuantity(),
-            getGoldToSUD(cmd),
-            cmd.requiredReqUserId(),
-            cmd.getReqTraceId());
         notifyInviteCampaignRecharge(cmd, runningWater);
 
         //累计今日充值，每日累计充值抽奖活动

rc-service/rc-service-wallet/wallet-application/src/main/java/com/red/circle/wallet/app/common/task/TaskCenterGoClient.java

@@ -1,174 +0,0 @@
-package com.red.circle.wallet.app.common.task;
-
-import com.alibaba.fastjson.JSON;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.time.Instant;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class TaskCenterGoClient {
-
-  private static final String EVENT_TYPE_RECHARGE_GOLD = "RECHARGE_GOLD";
-
-  @Value("${task.center.go.enabled:true}")
-  private boolean enabled;
-
-  @Value("${task.center.go.base-url:}")
-  private String baseUrl;
-
-  @Value("${task.center.go.internal-token:}")
-  private String internalToken;
-
-  @Value("${task.center.go.timeout-millis:3000}")
-  private Integer timeoutMillis;
-
-  public void reportShippingAgentRechargeGold(String sysOrigin,
-      Long userId,
-      Long runningWaterId,
-      BigDecimal goldQuantity,
-      BigDecimal usdQuantity,
-      Long freightUserId,
-      String traceId) {
-    Map<String, Object> payload = new HashMap<>();
-    payload.put("channel", "SHIPPING_AGENT");
-    payload.put("runningWaterId", runningWaterId);
-    payload.put("goldQuantity", goldQuantity);
-    payload.put("usdQuantity", usdQuantity);
-    payload.put("freightUserId", freightUserId);
-    payload.put("traceId", traceId);
-    reportRechargeGold(sysOrigin, userId, runningWaterId, goldQuantity, "SHIPPING_AGENT", payload);
-  }
-
-  public void reportSellerAgentRechargeGold(String sysOrigin,
-      Long userId,
-      Long runningWaterId,
-      BigDecimal goldQuantity,
-      BigDecimal usdQuantity,
-      Long sellerUserId,
-      Long freightUserId,
-      Long sellerId,
-      String traceId) {
-    Map<String, Object> payload = new HashMap<>();
-    payload.put("channel", "SELLER_AGENT");
-    payload.put("runningWaterId", runningWaterId);
-    payload.put("goldQuantity", goldQuantity);
-    payload.put("usdQuantity", usdQuantity);
-    payload.put("sellerUserId", sellerUserId);
-    payload.put("freightUserId", freightUserId);
-    payload.put("sellerId", sellerId);
-    payload.put("traceId", traceId);
-    reportRechargeGold(sysOrigin, userId, runningWaterId, goldQuantity, "SELLER_AGENT", payload);
-  }
-
-  private void reportRechargeGold(String sysOrigin,
-      Long userId,
-      Long runningWaterId,
-      BigDecimal goldQuantity,
-      String channel,
-      Map<String, Object> payload) {
-    if (Objects.isNull(userId) || Objects.isNull(runningWaterId) || Objects.isNull(goldQuantity)) {
-      return;
-    }
-    long deltaValue = goldQuantity.setScale(0, RoundingMode.DOWN).longValue();
-    if (deltaValue <= 0) {
-      return;
-    }
-
-    reportEvent(new TaskCenterEventRequest()
-        .setSysOrigin(sysOrigin)
-        .setEventId("RECHARGE_GOLD:" + channel + ":" + runningWaterId)
-        .setEventType(EVENT_TYPE_RECHARGE_GOLD)
-        .setUserId(userId)
-        .setDeltaValue(deltaValue)
-        .setOccurredAt(Instant.now().toString())
-        .setPayload(payload));
-  }
-
-  private void reportEvent(TaskCenterEventRequest request) {
-    if (!enabled) {
-      return;
-    }
-    String normalizedBaseUrl = trimRightSlash(Objects.toString(baseUrl, "").trim());
-    if (normalizedBaseUrl.isEmpty()) {
-      log.warn("Task center go baseUrl is blank, skip event report. eventId={}", request.getEventId());
-      return;
-    }
-
-    HttpURLConnection connection = null;
-    try {
-      URL url = new URL(normalizedBaseUrl + "/internal/task-center/event");
-      connection = (HttpURLConnection) url.openConnection();
-      int timeout = Objects.requireNonNullElse(timeoutMillis, 3000);
-      connection.setConnectTimeout(timeout);
-      connection.setReadTimeout(timeout);
-      connection.setRequestMethod("POST");
-      connection.setDoOutput(true);
-      connection.setRequestProperty("Content-Type", "application/json");
-      connection.setRequestProperty("Accept", "application/json");
-      connection.setRequestProperty("X-Internal-Token", Objects.toString(internalToken, ""));
-
-      byte[] body = JSON.toJSONString(request).getBytes(StandardCharsets.UTF_8);
-      try (OutputStream outputStream = connection.getOutputStream()) {
-        outputStream.write(body);
-      }
-
-      int status = connection.getResponseCode();
-      if (status < 200 || status >= 300) {
-        log.warn("Task center go report failed. status={}, body={}, eventId={}",
-            status, readResponse(connection), request.getEventId());
-      }
-    } catch (Exception e) {
-      log.warn("Task center go report error. eventId={}", request.getEventId(), e);
-    } finally {
-      if (Objects.nonNull(connection)) {
-        connection.disconnect();
-      }
-    }
-  }
-
-  private String readResponse(HttpURLConnection connection) {
-    try (InputStream inputStream = connection.getErrorStream() != null
-        ? connection.getErrorStream()
-        : connection.getInputStream()) {
-      if (Objects.isNull(inputStream)) {
-        return "";
-      }
-      return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-    } catch (Exception e) {
-      return "";
-    }
-  }
-
-  private String trimRightSlash(String value) {
-    while (value.endsWith("/")) {
-      value = value.substring(0, value.length() - 1);
-    }
-    return value;
-  }
-
-  @Data
-  @Accessors(chain = true)
-  private static class TaskCenterEventRequest {
-    private String sysOrigin;
-    private String eventId;
-    private String eventType;
-    private Long userId;
-    private Long deltaValue;
-    private String occurredAt;
-    private Map<String, Object> payload;
-  }
-}

rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/WalletGoldBalanceService.java

@@ -18,7 +18,7 @@ public interface WalletGoldBalanceService extends BaseService<WalletGoldBalance>
   /**
    * 初始化钱包，不存在创建.
    */
-  boolean init(String sysOrigin, Long userId, Long income, Long expenditure);
+  void init(String sysOrigin, Long userId, Long income, Long expenditure);
 
   /**
    * 获取用户余额(注意可能出现负数).
@@ -30,12 +30,12 @@ public interface WalletGoldBalanceService extends BaseService<WalletGoldBalance>
   /**
    * 增加收入.
    */
-  boolean incrIncome(Long userId, Long amount);
+  void incrIncome(Long userId, Long amount);
 
   /**
    * 增加支出.
    */
-  boolean incrExpenditure(Long userId, Long amount);
+  void incrExpenditure(Long userId, Long amount);
 
   /**
    * 增加支出.

rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/database/rds/service/impl/WalletGoldBalanceServiceImpl.java

@@ -32,9 +32,9 @@ public class WalletGoldBalanceServiceImpl extends
   }
 
   @Override
-  public boolean init(String sysOrigin, Long userId, Long income, Long expenditure) {
+  public void init(String sysOrigin, Long userId, Long income, Long expenditure) {
     try {
-      return save(new WalletGoldBalance()
+      save(new WalletGoldBalance()
           .setId(userId)
           .setSysOrigin(sysOrigin)
           .setIncome(income)
@@ -42,7 +42,6 @@ public class WalletGoldBalanceServiceImpl extends
       );
     } catch (DuplicateKeyException ex) {
       // ignore
-      return false;
     }
   }
 
@@ -62,8 +61,8 @@ public class WalletGoldBalanceServiceImpl extends
 
 
   @Override
-  public boolean incrIncome(Long userId, Long amount) {
+  public void incrIncome(Long userId, Long amount) {
-    return update().set(WalletGoldBalance::getUpdateTime, DateUtils.now())
+    update().set(WalletGoldBalance::getUpdateTime, DateUtils.now())
         .setSql(String.format("income=income+%s", amount))
         .eq(WalletGoldBalance::getId, userId)
         .last(PageConstant.LIMIT_ONE)
@@ -71,8 +70,8 @@ public class WalletGoldBalanceServiceImpl extends
   }
 
   @Override
-  public boolean incrExpenditure(Long userId, Long amount) {
+  public void incrExpenditure(Long userId, Long amount) {
-    return update().set(WalletGoldBalance::getUpdateTime, DateUtils.now())
+    update().set(WalletGoldBalance::getUpdateTime, DateUtils.now())
         .setSql(String.format("expenditure=expenditure+%s", amount))
         .eq(WalletGoldBalance::getId, userId)
         .last(PageConstant.LIMIT_ONE)

rc-service/rc-service-wallet/wallet-infrastructure/src/main/java/com/red/circle/wallet/infra/tool/WalletAssetSyncTool.java

@@ -150,48 +150,18 @@ public class WalletAssetSyncTool {
    */
   public void syncGold(WalletReceiptSyncEvent receipt) {
     try {
-      if (!syncGoldBalanceChange(receipt)) {
+      if (receipt.checkTypeIncome()) {
-        initMissingGoldBalance(receipt);
+        walletGoldBalanceService.incrIncome(receipt.getUserId(),
+            receipt.getAmount().getPennyAmount());
+      }
+
+      if (receipt.checkExpenditure()) {
+        walletGoldBalanceService.incrExpenditure(receipt.getUserId(),
+            receipt.getAmount().getPennyAmount());
       }
     } catch (Exception ex) {
       saveErrorLog(receipt, WalletErrorLogReason.REST_BALANCE);
-      throw new IllegalStateException("sync gold balance failed", ex);
+      ex.printStackTrace();
-    }
-  }
-
-  private boolean syncGoldBalanceChange(WalletReceiptSyncEvent receipt) {
-    if (receipt.checkTypeIncome()) {
-      return walletGoldBalanceService.incrIncome(receipt.getUserId(),
-          receipt.getAmount().getPennyAmount());
-    }
-
-    if (receipt.checkExpenditure()) {
-      return walletGoldBalanceService.incrExpenditure(receipt.getUserId(),
-          receipt.getAmount().getPennyAmount());
-    }
-    return true;
-  }
-
-  private void initMissingGoldBalance(WalletReceiptSyncEvent receipt) {
-    long amount = receipt.getAmount().getPennyAmount();
-    long balance = receipt.getBalance().getPennyAmount();
-    long income = Math.max(balance, 0L);
-    long expenditure = 0L;
-
-    if (receipt.checkExpenditure()) {
-      income = Math.max(balance + amount, 0L);
-      expenditure = Math.max(amount, 0L);
-    }
-
-    if (walletGoldBalanceService.init(receipt.getSysOrigin(), receipt.getUserId(), income,
-        expenditure)) {
-      log.warn("初始化缺失金币余额记录: userId={}, eventType={}, eventId={}",
-          receipt.getUserId(), receipt.getEventType(), receipt.getEventId());
-      return;
-    }
-    if (!syncGoldBalanceChange(receipt)) {
-      throw new IllegalStateException(
-          "sync gold balance no rows after init: userId=" + receipt.getUserId());
     }
   }
 

rc-service/rc-service-wallet/wallet-inner-endpoint/src/main/java/com/red/circle/wallet/inner/endpoint/wallet/WalletGoldClientEndpoint.java

@@ -39,25 +39,23 @@ public class WalletGoldClientEndpoint implements WalletGoldClientApi {
   }
 
   @Override
-  public ResultResponse<WalletReceiptResDTO> changeBalance(
+  public ResultResponse<WalletReceiptResDTO> changeBalance(GoldReceiptCmd cmd) {
-      @RequestBody @Validated GoldReceiptCmd cmd) {
     return ResultResponse.success(walletGoldClientService.changeBalance(cmd));
   }
 
   @Override
-  public ResultResponse<WalletReceiptResDTO> changeBalanceTest(
+  public ResultResponse<WalletReceiptResDTO> changeBalanceTest(TestWalletReceiptCmd cmd) {
-      @RequestBody @Validated TestWalletReceiptCmd cmd) {
     return ResultResponse.success(walletGoldClientService.changeBalanceTest(cmd));
   }
 
   @Override
-  public ResultResponse<Void> refundBack(@RequestBody @Validated RefundBackReceiptCmd cmd) {
+  public ResultResponse<Void> refundBack(RefundBackReceiptCmd cmd) {
     walletGoldClientService.refundBack(cmd);
     return ResultResponse.success();
   }
 
   @Override
-  public ResultResponse<Void> recovery(@RequestBody @Validated RecoveryGoldReceiptCmd cmd) {
+  public ResultResponse<Void> recovery(RecoveryGoldReceiptCmd cmd) {
     walletGoldClientService.recovery(cmd);
     return ResultResponse.success();
   }
@@ -76,7 +74,7 @@ public class WalletGoldClientEndpoint implements WalletGoldClientApi {
 
   @Override
   public ResultResponse<List<UserGoldRunningWaterHistoryDTO>> listWater(
-      @RequestBody @Validated UserGoldRunningWaterBackQryCmd cmd) {
+      UserGoldRunningWaterBackQryCmd cmd) {
     return ResultResponse.success(walletGoldClientService.listWater(cmd));
   }
 
@@ -92,7 +90,7 @@ public class WalletGoldClientEndpoint implements WalletGoldClientApi {
 
   @Override
   public ResultResponse<UserGoldRunningWaterClsHistoryDTO> getClsSearchWater(
-      @RequestBody @Validated UserGoldRunningWaterBackQryCmd query) {
+      UserGoldRunningWaterBackQryCmd query) {
     return ResultResponse.success(walletGoldClientService.getClsSearchWater(query));
   }
 

rc-service/rc-service-wallet/wallet-start/src/test/java/com/red/circle/wallet/infra/tool/WalletAssetSyncToolTest.java

@@ -1,70 +0,0 @@
-package com.red.circle.wallet.infra.tool;
-
-import static org.mockito.Mockito.inOrder;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import com.red.circle.common.business.core.enums.ReceiptType;
-import com.red.circle.mq.business.model.event.wallet.WalletReceiptSyncEvent;
-import com.red.circle.tool.core.tuple.PennyAmount;
-import com.red.circle.wallet.infra.database.rds.service.WalletGoldBalanceService;
-import org.junit.jupiter.api.Test;
-import org.mockito.InOrder;
-
-class WalletAssetSyncToolTest {
-
-  @Test
-  void syncGoldInitializesMissingBalanceWhenExpenditureUpdateMissesRow() {
-    WalletGoldBalanceService balanceService = mock(WalletGoldBalanceService.class);
-    when(balanceService.incrExpenditure(1001L, 1_500_000L)).thenReturn(false);
-    when(balanceService.init("LIKEI", 1001L, 10_000_000L, 1_500_000L)).thenReturn(true);
-    WalletAssetSyncTool tool = newTool(balanceService);
-
-    WalletReceiptSyncEvent event = new WalletReceiptSyncEvent();
-    event.setReceiptType(ReceiptType.EXPENDITURE);
-    event.setSysOrigin("LIKEI");
-    event.setUserId(1001L);
-    event.setEventType("VOICE_ROOM_RED_PACKET_SEND");
-    event.setEventId("VRPS:123");
-    event.setAmount(PennyAmount.ofPenny(1_500_000L));
-    event.setBalance(PennyAmount.ofPenny(8_500_000L));
-
-    tool.syncGold(event);
-
-    InOrder ordered = inOrder(balanceService);
-    ordered.verify(balanceService).incrExpenditure(1001L, 1_500_000L);
-    ordered.verify(balanceService).init("LIKEI", 1001L, 10_000_000L, 1_500_000L);
-    verify(balanceService, never()).incrIncome(1001L, 1_500_000L);
-  }
-
-  @Test
-  void syncGoldInitializesMissingBalanceWhenIncomeUpdateMissesRow() {
-    WalletGoldBalanceService balanceService = mock(WalletGoldBalanceService.class);
-    when(balanceService.incrIncome(1002L, 1_500_000L)).thenReturn(false);
-    when(balanceService.init("LIKEI", 1002L, 11_500_000L, 0L)).thenReturn(true);
-    WalletAssetSyncTool tool = newTool(balanceService);
-
-    WalletReceiptSyncEvent event = new WalletReceiptSyncEvent();
-    event.setReceiptType(ReceiptType.INCOME);
-    event.setSysOrigin("LIKEI");
-    event.setUserId(1002L);
-    event.setEventType("VOICE_ROOM_RED_PACKET_CLAIM");
-    event.setEventId("VRPC:123");
-    event.setAmount(PennyAmount.ofPenny(1_500_000L));
-    event.setBalance(PennyAmount.ofPenny(11_500_000L));
-
-    tool.syncGold(event);
-
-    InOrder ordered = inOrder(balanceService);
-    ordered.verify(balanceService).incrIncome(1002L, 1_500_000L);
-    ordered.verify(balanceService).init("LIKEI", 1002L, 11_500_000L, 0L);
-    verify(balanceService, never()).incrExpenditure(1002L, 1_500_000L);
-  }
-
-  private WalletAssetSyncTool newTool(WalletGoldBalanceService balanceService) {
-    return new WalletAssetSyncTool(null, null, null, null, null, balanceService, null, null, null,
-        null);
-  }
-}