[공통][Bug] 회원가입 API 수정

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/MemberJoinDataBean.java

@@ -0,0 +1,51 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * MemberJoinDataBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 10. 5.]   [최초 작성]
+ * @since 2018. 10. 5.
+ */
+public class MemberJoinDataBean extends UserIDBean {
+  /*
+  "user_no": "201810050000000007",
+  "user_name": "나나나",
+  "mail_id": "naananan@gmail.com",
+  "memr_stat_cd": "000",
+  "lock_stat_cd": "000"
+   */
+
+  @SerializedName("mail_id")
+  private String emailId;
+  @SerializedName("user_name")
+  private String name;
+
+  public MemberJoinDataBean(String userId) {
+    super(userId);
+  }
+
+  public String getEmailId() {
+    return emailId;
+  }
+
+  public void setEmailId(String emailId) {
+    this.emailId = emailId;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/MemberJoinRequestBean.java

@@ -20,14 +20,23 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
 public class MemberJoinRequestBean extends JsonBeanBase {
   /*
   "{
-  ""mail_id"":""test@test.com"",
-  ""user_name"":""홍길동""
-  }"
+""mail_id"":""test@test.com"",
+""user_name"":""홍길동"",
+""dev_prno"" : ""2222222222""
+}"
    */
   @SerializedName("mail_id")
   private String emailId;
   @SerializedName("user_name")
   private String name;
+  @SerializedName("dev_prno")
+  private String deviceId;
+
+  public MemberJoinRequestBean(String emailId, String name, String deviceId) {
+    this.emailId = emailId;
+    this.name = name;
+    this.deviceId = deviceId;
+  }
 
   public String getEmailId() {
     return emailId;
@@ -44,4 +53,12 @@ public class MemberJoinRequestBean extends JsonBeanBase {
   public void setName(String name) {
     this.name = name;
   }
+
+  public String getDeviceId() {
+    return deviceId;
+  }
+
+  public void setDeviceId(String deviceId) {
+    this.deviceId = deviceId;
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/MemberJoinResultBean.java

@@ -18,13 +18,13 @@ import com.google.gson.annotations.SerializedName;
 public class MemberJoinResultBean extends LifeplusAPIBean {
 
   @SerializedName("data")
-  private UserIDBean data;
+  private MemberJoinDataBean data;
 
-  public UserIDBean getData() {
+  public MemberJoinDataBean getData() {
     return data;
   }
 
-  public void setData(UserIDBean data) {
+  public void setData(MemberJoinDataBean data) {
     this.data = data;
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/model/SignUpModel.java

@@ -253,10 +253,8 @@ public class SignUpModel extends Model {
     else {
       // 필수 항목 체크 완료;
 
-      MemberJoinRequestBean bean = new MemberJoinRequestBean();
       // fixme 이메일을 입력하지 않았음
-      bean.setEmailId("nothing@email.com");
-      bean.setName(mobileAuthBean.getName());
+      MemberJoinRequestBean bean = new MemberJoinRequestBean("", mobileAuthBean.getName(), SuperModel.getInstance().getDeviceUuid());
 
       disposable.add(
         new LifeplusAPIService().insertMember(bean)