diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java
index cd2d00c25..683d8f30d 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/achievementLibrary/service/BlockChainService.java
@@ -398,6 +398,20 @@ public class BlockChainService {
if(CommitCreateVoList!=null && CommitCreateVoList.size()>0) {
for(CommitResultVo commit : CommitCreateVoList) {
commitDataTnBlock(commit);
+
+ //判断代码合并的时候issue
+ String issue_id = commitCreateVo.getIssue_id();
+ if(StringUtils.isNotEmpty(issue_id)) {
+ //根据issue_id获取,判断是否要进行token转让
+ UserProjectTransferRecords records = projectResourceLibraryMapper.selectIssueEndInfo(issue_id);
+ if (Objects.nonNull(records)) {
+ records.setType("issuePr");//pr合并关闭issue
+ records.setTxHash("txHash");
+ records.setCreateTime(DateUtils.getNowDate());
+ records.setCreateBy(SecurityUtils.getUsername());
+ userProjectTransferRecordsMapper.insertUserProjectTransferRecords(records);
+ }
+ }
}
}
return AjaxResult.success();
@@ -592,4 +606,6 @@ public class BlockChainService {
}
return AjaxResult.error();
}
+
+
}
diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitCreateVo.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitCreateVo.java
index c6cdfa218..c9a5db27f 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitCreateVo.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/common/vo/CommitCreateVo.java
@@ -9,4 +9,6 @@ public class CommitCreateVo {
private String project_id;
private String commit_diff;
+
+ private String issue_id;
}
\ No newline at end of file
diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java
index aa206ba29..bdd889470 100644
--- a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/resourceLibrary/mapper/ProjectResourceLibraryMapper.java
@@ -2,6 +2,7 @@ package com.microservices.dms.resourceLibrary.mapper;
import com.microservices.common.datasource.annotation.Slave;
import com.microservices.dms.achievementLibrary.domain.TokenListVo;
+import com.microservices.dms.achievementLibrary.domain.blockchain.UserProjectTransferRecords;
import com.microservices.dms.common.vo.PrCreateQueryVo;
import com.microservices.dms.resourceLibrary.domain.ProjectResourceLibrary;
import com.microservices.dms.resourceLibrary.domain.vo.KeyValVo;
@@ -70,4 +71,6 @@ public interface ProjectResourceLibraryMapper {
Long getUsedApplyToken(@Param("tokenName")String tokenName,@Param("userName") String userName);
String getUserIdBYLogin(@Param("userId")String userId);
+
+ UserProjectTransferRecords selectIssueEndInfo(@Param("issueId") String issueId);
}
diff --git a/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/TestCase.java b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/TestCase.java
new file mode 100644
index 000000000..d45c28ead
--- /dev/null
+++ b/microservices-modules/microservices-modules-dms/src/main/java/com/microservices/dms/utils/TestCase.java
@@ -0,0 +1,20 @@
+package com.microservices.dms.utils;
+
+import lombok.Data;
+
+@Data
+public class TestCase {
+ private String id;
+ private String identifier;
+ private String name;
+ private String description;
+ private String type;
+
+ public TestCase(String id, String identifier, String name, String description, String type) {
+ this.id = id;
+ this.identifier = identifier;
+ this.name = name;
+ this.description = description;
+ this.type = type;
+ }
+}
diff --git a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml
index 1033b4594..e26857abc 100644
--- a/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml
+++ b/microservices-modules/microservices-modules-dms/src/main/resources/mapper/dms/ProjectResourceLibraryMapper.xml
@@ -461,4 +461,12 @@
+
+