From 27b0311fb7f26907988ddc2dbcbd2b7e21b6ed20 Mon Sep 17 00:00:00 2001
From: liushaowen <565850092@qq.com>
Date: Wed, 18 Nov 2020 09:46:37 +0800
Subject: [PATCH] =?UTF-8?q?group=5Fcode=E8=A1=A8=E6=B7=BB=E5=8A=A0invitati?=
 =?UTF-8?q?onId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java     | 5 +++++
 .../com/epmet/modules/group/entity/ResiGroupCodeEntity.java  | 5 +++++
 .../modules/group/service/impl/ResiGroupCodeServiceImpl.java | 1 +
 .../db/migration/V0.0.6__add_group_code_invitation_id.sql    | 1 +
 4 files changed, 12 insertions(+)
 create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.6__add_group_code_invitation_id.sql

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
index 8871b5ec6d..ac301a624c 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupCodeDTO.java
@@ -58,6 +58,11 @@ public class ResiGroupCodeDTO implements Serializable {
      */
 	private String type;
 
+    /**
+     * 邀请ID
+     */
+    private String invitationId;
+
     /**
      * 二维码路径
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
index ae5498c114..3859492d3a 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupCodeEntity.java
@@ -59,6 +59,11 @@ public class ResiGroupCodeEntity extends BaseEpmetEntity {
      */
 	private String type;
 
+	/**
+	 * 邀请ID
+	 */
+	private String invitationId;
+
     /**
      * 二维码路径
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
index 297f2cfd71..b833478cda 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupCodeServiceImpl.java
@@ -259,6 +259,7 @@ public class ResiGroupCodeServiceImpl extends BaseServiceImpl<ResiGroupCodeDao,
                 //存表
                 ResiGroupCodeEntity entity = new ResiGroupCodeEntity();
                 BeanUtils.copyProperties(dto, entity);
+                entity.setInvitationId(groupScanCodeInvitation.getInvitationId());
                 entity.setUrl(uploadResult.getData().getUrl());
                 baseDao.insert(entity);
             } else {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.6__add_group_code_invitation_id.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.6__add_group_code_invitation_id.sql
new file mode 100644
index 0000000000..e8fa287adf
--- /dev/null
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.6__add_group_code_invitation_id.sql
@@ -0,0 +1 @@
+ALTER TABLE `resi_group_code` ADD INVITATION_ID varchar(64) NOT NULL COMMENT '邀请id';