diff --git a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/RocketRestController.java b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/RocketRestController.java index 05f0d65d..90b6cdc4 100644 --- a/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/RocketRestController.java +++ b/rc-service/rc-service-other/other-adapter/src/main/java/com/red/circle/other/adapter/app/RocketRestController.java @@ -48,6 +48,7 @@ public class RocketRestController { */ @PostMapping("/claim") public RocketRewardCO claimReward(@Valid @RequestBody RocketRewardClaimCmd cmd) { + cmd.setReceive(true); return rocketService.claimReward(cmd); } } diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketRewardClaimCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketRewardClaimCmdExe.java index 679e0abd..b019264e 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketRewardClaimCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/rocket/RocketRewardClaimCmdExe.java @@ -142,7 +142,7 @@ public class RocketRewardClaimCmdExe { // 4. 检查库存(查询,不递增) int rewardQuantity = config.getRewardQuantity() != null ? config.getRewardQuantity() : 20; int currentClaimed = latestHistory.getClaimedCount() != null ? latestHistory.getClaimedCount() : 0; - if (currentClaimed >= rewardQuantity) { + if (Boolean.TRUE.equals(cmd.getReceive()) && currentClaimed >= rewardQuantity) { return null; } diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/RocketRewardClaimCmd.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/RocketRewardClaimCmd.java index 2f4aacac..80a8a8d3 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/RocketRewardClaimCmd.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/cmd/RocketRewardClaimCmd.java @@ -22,4 +22,9 @@ public class RocketRewardClaimCmd extends AppExtCommand { @NotNull(message = "房间ID不能为空") private Long roomId; + /** + * 是否手动领取 + */ + private Boolean receive; + }