From 9ed312959e86767e520d627bd6172be678dd8a37 Mon Sep 17 00:00:00 2001
From: Leeminha <bangle0621@gmail.com>
Date: Sat, 10 Dec 2022 16:00:37 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=B0=ED=95=A9=ED=95=A0=EC=9D=B8=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EA=B0=9C?=
 =?UTF-8?q?=EB=B0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/modules/custMgt/views/SubsDetail.vue      | 10 ++++++++++
 .../kr/co/uplus/ez/api/custMgt/CustMgtService.java     |  1 +
 .../kr/co/uplus/ez/api/custMgt/dto/SubsDetail.java     |  2 ++
 .../ez/api/custMgt/dto/UpdateAdminInfoReqDto.java      |  3 +++
 .../resources/mapper/mysql/custMgt/custMgt-mapper.xml  |  2 ++
 5 files changed, 18 insertions(+)

diff --git a/frontend/src/modules/custMgt/views/SubsDetail.vue b/frontend/src/modules/custMgt/views/SubsDetail.vue
index 11b3818..66811f6 100644
--- a/frontend/src/modules/custMgt/views/SubsDetail.vue
+++ b/frontend/src/modules/custMgt/views/SubsDetail.vue
@@ -88,6 +88,13 @@
               <td colspan="2"><input type="text" disabled v-model="plan" /></td>
               <th>가입번호</th>
               <td colspan="2"><input type="text" disabled v-model="subsNo" /></td>
+              <th>결합할인여부</th>
+              <td colspan="1">
+              <select name="" id="" v-model="bindDcYn">
+                <option value="Y">Y</option>
+                <option value="N">N</option>
+              </select>
+              </td>
             </tr>
             <tr class="tr_input w75">
               <th>관리자명</th>
@@ -221,6 +228,7 @@ export default {
       userCnt: '',
       saveConfirm: false,
       props: {},
+      bindDcYn: '',
     };
   },
   props: {
@@ -313,6 +321,7 @@ export default {
           this.email = result.data.email;
           this.carryOver = result.data.carryOver;
           this.userCnt = result.data.userCnt;
+          this.bindDcYn = result.data.bindDcYn;
           if (this.bregNo != '' && this.bregNo != null) {
             this.bregNo1 = this.bregNo.substr(0, 3);
             this.bregNo2 = this.bregNo.substr(3, 2);
@@ -339,6 +348,7 @@ export default {
       this.row.serviceId = this.$route.params.serviceId;
       this.row.adminId = this.adminId;
       this.row.adminNm = this.adminNm;
+      this.row.bindDcYn = this.bindDcYn;
 
       try {
         const response = await custMgtApi.updateAdminInfo(this.row);
diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
index 77cf801..d2f997a 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
@@ -248,6 +248,7 @@ public class CustMgtService {
         subsDetail.setAdminId(adminInfoReqDto.getAdminId());
         subsDetail.setAdminNm(adminInfoReqDto.getAdminNm());
         subsDetail.setServiceId(adminInfoReqDto.getServiceId());
+        subsDetail.setBindDcYn(adminInfoReqDto.getBindDcYn());
 
 		try {
 			custMgtMapper.updateAdminInfo(subsDetail);
diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsDetail.java b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsDetail.java
index e207050..256c3e7 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsDetail.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/SubsDetail.java
@@ -57,5 +57,7 @@ public class SubsDetail implements Serializable {
 	private String carryOver;
 	@ApiModelProperty(example = "사용자ID개수", name = "사용자ID개수", dataType = "String")
 	private String userCnt;
+	@ApiModelProperty(example = "결합할인여부", name = "결합할인여부", dataType = "String")
+	private String bindDcYn;
 
 }
\ No newline at end of file
diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/UpdateAdminInfoReqDto.java b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/UpdateAdminInfoReqDto.java
index afc301b..94ef1f0 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/dto/UpdateAdminInfoReqDto.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/dto/UpdateAdminInfoReqDto.java
@@ -17,5 +17,8 @@ public class UpdateAdminInfoReqDto implements Serializable {
 	
 	@ApiModelProperty(example = "서비스ID", name = "서비스ID", dataType = "String")
 	private String serviceId;
+	
+	@ApiModelProperty(example = "결합할인여부", name = "결합할인여부", dataType = "String")
+	private String bindDcYn;
 
 }
diff --git a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
index 1ffeefe..77b260d 100644
--- a/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/custMgt/custMgt-mapper.xml
@@ -385,6 +385,7 @@
          esi.ATTRCTOR_NM AS CHANNEL_NM,
          esi.SUBSMNGR_ID AS ADMIN_ID,
          esi.SUBSMNGR_NM AS ADMIN_NM,
+         esi.BIND_DC_YN,
          -- 사용자 데이터
          esu.USER_ID as SERVICE_ID,
          esu.USER_SEQ,
@@ -422,6 +423,7 @@
         SET
            CHG_ID = #{serviceId}
            ,CHG_DT = NOW()
+           ,BIND_DC_YN = #{bindDcYn}
            <if test="adminId != null and adminId != ''">
            ,SUBSMNGR_ID= #{adminId}
            </if>