diff --git a/src/main/java/com/dl/officialsite/member/Member.java b/src/main/java/com/dl/officialsite/member/Member.java index bec06fcf..c8a9f1b1 100644 --- 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 index 40ce05b3..16afe5b4 100644 --- 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 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 index 6085c70b..88e9aca3 100644 --- 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, List 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 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 findByUnclaimedPacket(@Param("address") String address, @Param("status") Integer status);