fix the redpacket refund

Dapp-Learning-DAO · Dec 17, 2023 · b47e8b2 · b47e8b2
1 parent 2753e68
commit b47e8b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketController.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketController.java
@@ -40,7 +40,7 @@ public class RedPacketController {
 
 
     @PostMapping("/create")
-    @Auth("admin")
+   //todo  @Auth("admin")
     public BaseResponse createRedPacket(@Valid @RequestBody RedPacket redPacket, @RequestParam String address) {
         redPacket.setCreator(address);
         RedPacket redPacket1 = redPacketRepository.save(redPacket);

diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java
@@ -70,7 +70,7 @@ public void updateRedpacketStatus() throws IOException {
             JsonObject data = jsonObject.getAsJsonObject("data");
             JsonArray redpacketsArray = data.getAsJsonArray("redpackets");
 
-           log.info("redpacket array : " + redpacketsArray.get(0));
+          // log.info("redpacket array : " + redpacketsArray.get(0));
             List<RedPacket> redPacketList = redPacketRepository.findByStatus(0);
 
             for (int i = 0; i < redpacketsArray.size(); i++) {
@@ -85,15 +85,6 @@ public void updateRedpacketStatus() throws IOException {
                     if (!redPacketList.get(j).getId().equals(id))
                         continue;
 
-//                    Boolean claimed = redpacketObject.get("hasRefundedOrAllClaimed").getAsBoolean();
-//
-//                    if (claimed) {
-//                        log.info("redpacket id: " + id + "claimed: ");
-//                        redPacket.setStatus(1);
-//                        redPacketRepository.save(redPacket);
-//                        continue;
-//                    }
-
 
                     JsonArray claimers = redpacketObject.getAsJsonArray("claimers");
 
@@ -105,6 +96,7 @@ public void updateRedpacketStatus() throws IOException {
                         continue;
                     }
 
+
                     if (claimers.size() > redPacket.getClaimedAddress().size()) {
                         ArrayList<String> claimersList = new ArrayList<>();
 
@@ -117,8 +109,14 @@ public void updateRedpacketStatus() throws IOException {
                         redPacket.setClaimedAddress(claimersList);
                         log.info("update claimed address : " + id);
                         redPacketRepository.save(redPacket);
+                    }
 
-
+                  //refund
+               Boolean claimed = redpacketObject.get("hasRefundedOrAllClaimed").getAsBoolean();
+                    if (claimed) {
+                        log.info("redpacket id: " + id + "claimed: ");
+                        redPacket.setStatus(1);
+                        redPacketRepository.save(redPacket);
                     }
                 }
             }