add time out redpacket

Dapp-Learning-DAO · Dec 19, 2023 · 60c71ab · 60c71ab
1 parent ec0f8e8
commit 60c71ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/main/java/com/dl/officialsite/member/Member.java b/src/main/java/com/dl/officialsite/member/Member.java
@@ -15,6 +15,8 @@
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
+import static com.dl.officialsite.common.privacy.PrivacyTypeEnum.CUSTOMER;
+
 @Getter
 @Setter
 @AllArgsConstructor
@@ -71,8 +73,11 @@ public class Member  implements Serializable
     //todo
     private Long workStatus;
 
-    @JsonIgnore
+    @PrivacyEncrypt(type= CUSTOMER)
     private String resume;
 
+   //todo 
+
+
 
 }
diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketController.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketController.java
@@ -81,6 +81,13 @@ BaseResponse getRedPacketByAddress(@RequestParam String address, @RequestParam(r
         return BaseResponse.successWithData(result);
     }
 
+    @RequestMapping(value = "/query/user/timeout", method = RequestMethod.GET)
+    BaseResponse getTimeoutRedPacketByAddress(@RequestParam String address) {
+        List<RedPacket> result;
+        result = redPacketRepository.findByUnclaimedTimeOutPacket("%" + address + "%");
+        return BaseResponse.successWithData(result);
+    }
+
     @PostMapping(value = "/query/all")
     BaseResponse getAllRedPacketByCriteria(@RequestParam String address,
                                         @RequestBody   RedPacketVo redPacket,

diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketRepository.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketRepository.java
@@ -23,6 +23,10 @@ public interface RedPacketRepository extends JpaRepository<RedPacket, String>,
     List<RedPacket> findByClaimedPacket(@Param("address") String address);
 
 
+    @Query(value = "select * from red_packet where address_list like ?1 and  claimed_address not like ?1 and  expire_time < UNIX_TIMESTAMP(current_timestamp()) ", nativeQuery = true)
+    List<RedPacket> findByUnclaimedTimeOutPacket(@Param("address") String address);
+
+    // @Query(value = "select * from red_packet where address_list like ?1 and  claimed_address not like ?1 and status = ?2 and expire_time > UNIX_TIMESTAMP(current_timestamp()) ", nativeQuery = true)
     @Query(value = "select * from red_packet where address_list like ?1 and  claimed_address not like ?1 and status = ?2 and expire_time > UNIX_TIMESTAMP(current_timestamp()) ", nativeQuery = true)
     List<RedPacket> findByUnclaimedPacket(@Param("address") String address, @Param("status") Integer status);