fix the if else order

Dapp-Learning-DAO · Jan 22, 2024 · 643ad71 · 643ad71
1 parent 5bc9849
commit 643ad71
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java
@@ -98,18 +98,19 @@ public void updateRedpacketStatus() throws IOException {
                         redPacket.setClaimedAddress(claimersList);
                         redPacket.setClaimedValues(claimedValueList);
 
-                        //refund or claimed all
-
                         ////0 uncompleted  1 completed    2 overtime 3 refund
                         Boolean allClaimed = redpacketObject.get("allClaimed").getAsBoolean();
                         Boolean refunded = redpacketObject.get("refunded").getAsBoolean();
+                        if( redPacket.getExpireTime()< System.currentTimeMillis()/1000){
+                            redPacket.setStatus(2);
+                        }
                         if (allClaimed) {
                             redPacket.setStatus(1);
-                        } else if (refunded) {
+                        }
+                        if (refunded) {
                             redPacket.setStatus(3);
-                        } else if( redPacket.getExpireTime()< System.currentTimeMillis()/1000){
-                           redPacket.setStatus(2);
-                       }
+                        }
+
                         redPacketRepository.save(redPacket);
                     }
                 }

diff --git a/src/main/resources/DB/2.sql b/src/main/resources/DB/2.sql
@@ -18,4 +18,4 @@ delete  from red_packet;
 alter table red_packet MODIFY COLUMN id bigint;
 
 
-alter table red_packet
+alter table red_packet drop index  name;