diff --git a/src/main/java/com/dl/officialsite/bounty/Bounty.java b/src/main/java/com/dl/officialsite/bounty/Bounty.java index c2f27a16..419f5c4a 100644 --- a/src/main/java/com/dl/officialsite/bounty/Bounty.java +++ b/src/main/java/com/dl/officialsite/bounty/Bounty.java @@ -1,6 +1,7 @@ package com.dl.officialsite.bounty; +import com.dl.officialsite.member.Member; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.hibernate.annotations.CreationTimestamp; @@ -25,25 +26,29 @@ public class Bounty { /** * 创建岗位人地址 */ - private String creator; + @Embedded + private Member member; private String title; @Column(columnDefinition = "TEXT") private String description; - private String Salary; + private String salary; // 线性释放, 指数释放 private int paymentType; - private Long projectLength; + private String projectLength; + + private String techTag; /** * 0:jd 招聘中 * 1: 已匹配 - * 1:jd 删除 - * 2:jd 过期 - * 设置默认值,默认值为招聘中 + * 2:jd 已完成结算 + * 3:jd 已过期 + * 4:jd 已退款 + * 5: 已删除 */ private int status; diff --git a/src/main/java/com/dl/officialsite/bounty/BountyController.java b/src/main/java/com/dl/officialsite/bounty/BountyController.java new file mode 100644 index 00000000..09fddfd6 --- /dev/null +++ b/src/main/java/com/dl/officialsite/bounty/BountyController.java @@ -0,0 +1,30 @@ +package com.dl.officialsite.bounty; + + +import com.dl.officialsite.member.Member; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.hibernate.annotations.CreationTimestamp; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import org.springframework.stereotype.Controller; + +import javax.persistence.*; +import java.util.Date; + + + +@Controller +public class BountyController { + + + //1 bounty 创建/更新/查询/删除(置status) + + + // 2 bounty申请和匹配 + + + + + +} diff --git a/src/main/java/com/dl/officialsite/member/Member.java b/src/main/java/com/dl/officialsite/member/Member.java index 3a56f3f6..9a369bce 100644 --- a/src/main/java/com/dl/officialsite/member/Member.java +++ b/src/main/java/com/dl/officialsite/member/Member.java @@ -25,6 +25,7 @@ @EqualsAndHashCode(onlyExplicitlyIncluded = true) @EntityListeners(AuditingEntityListener.class) @Entity +@Embeddable @DynamicUpdate @Table(name = "member", schema = "dl", uniqueConstraints = { @UniqueConstraint(name = "address", columnNames = {"address"}), diff --git a/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java b/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java index 381c6201..989ee1f2 100644 --- a/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java +++ b/src/main/java/com/dl/officialsite/redpacket/RedPacketService.java @@ -62,14 +62,22 @@ public void updateRedpacketStatus() throws IOException { JsonObject data = jsonObject.getAsJsonObject("data"); JsonArray redpacketsArray = data.getAsJsonArray("redpackets"); JsonArray lastupdatesArray = data.getAsJsonArray("lastupdates"); - // String lastTimestampFromGraph = lastupdatesArray.get(0).getAsJsonObject().get("lastupdateTimestamp").getAsString(); - - // open in prod todo -// if(Objects.equals(lastTimestampFromGraph, lastUpdateTimestamp)){ -// return; -// } else { -// lastUpdateTimestamp = lastTimestampFromGraph; -// } + log.info("lastupdatesArray"+ lastupdatesArray.toString()); + + + // open in prod todo + if(lastupdatesArray.size() != 0){ + String lastTimestampFromGraph = lastupdatesArray.get(0).getAsJsonObject().get("lastupdateTimestamp").getAsString(); + + if(Objects.equals(lastTimestampFromGraph, lastUpdateTimestamp)){ + return; + } else { + lastUpdateTimestamp = lastTimestampFromGraph; + } + } + + + List redPacketList = redPacketRepository.findUnfinishedRedpacketByChainId(chainId);