新增接口：团队加入申请，团队加入申请列表，团队加入申请审核

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/SQL/团队加入申请列表.sql

@@ -0,0 +1,12 @@
+SELECT tenterprise_userid,
+       fname,
+       tagentteamapplyid,
+       createdate,
+       tagentsid,
+       fuserid,
+       fstatus,
+       fphonenumber,
+       siteid
+FROM TAGENTTEAMAPPLY
+WHERE tagentsid = $tagentsid$
+  AND siteid = $siteid$ AND fstatus = 'н¨'

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/teammsg.java

@@ -30,6 +30,7 @@ public class teammsg extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "经销商账号列表查询");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("tagentsid", tagentsid);
+        System.err.println(tagentsid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
 
         SQLFactory subusersql = new SQLFactory(this, "下级账号查询");
@@ -157,10 +158,55 @@ public class teammsg extends Controller {
 
     /**
      * 团队加入申请审核
+     *
      * @return
      */
-    public String checkEntryTeamApply(){
+    public String checkEntryTeamApply() throws P2Exception {
+
+        String isPass = content.getString("isPass");
+        //加入商户团队申请表id
+        String tagentteamapplyid = content.getString("tagentteamapplyid");
+        //企业账号表id
+        String tenterprise_userid = content.getString("tenterprise_userid");
+
+        PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tagentteamapply", "tagentteamapplyid = '" + tagentteamapplyid + "'");
+        PaoSetRemote paoSetRemote_tenterprise = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid = '" + tenterprise_userid + "'");
+        if (!paoSetRemote.isEmpty() && !paoSetRemote_tenterprise.isEmpty()) {
+            PaoRemote paoRemote = paoSetRemote.getPao(0);
+            PaoRemote paoRemote_tenterprise = paoSetRemote_tenterprise.getPao(0);
+            //拒绝，只更新商户团队申请表
+            if (isPass.equals("0")) {
+                paoRemote.setValue("fstatus", "拒绝", 11L);
+                paoSetRemote.save();
+                paoRemote_tenterprise.setValue("tagentsid", "", 11L);
+                paoSetRemote_tenterprise.save();
+                return getSucReturnObject().setData("拒绝成功").toString();
+            } else {
+                paoRemote.setValue("fstatus", "审核", 11L);
+                paoSetRemote.save();
+                paoRemote_tenterprise.setValue("tagentsid", tagentsid, 11L);
+                paoSetRemote_tenterprise.save();
+                return getSucReturnObject().setData("审核成功").toString();
+            }
 
-        return "";
+
+        } else {
+            return getErrReturnObject().setErrMsg("未找到申请记录").toString();
+        }
+
+
+    }
+
+    /**
+     * 获取团队加入申请列表
+     *
+     * @return
+     */
+    public String getEntryTeamApplyList() {
+        SQLFactory sqlFactory = new SQLFactory(this, "团队加入申请列表", pageSize, pageNumber, "createdate");
+        sqlFactory.addParameter("tagentsid", tagentsid);
+        sqlFactory.addParameter("siteid", siteid);
+        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }
 }

src/dsb/com/cnd3b/restcontroller/publicmethod/users/Users.java

@@ -152,10 +152,79 @@ public class Users extends Controller {
 
     /**
      * 团队加入申请
+     *
      * @return
      */
-    public String entryTeamApply(){
+    public String entryTeamApply() throws P2Exception {
+        String userid = content.getString("userid");
+        String tagentsid = content.getString("tagentsid");
+        String fname = content.getString("fname");
+        String fphonenumber = content.getString("fphonenumber");
+
+        PaoSetRemote queryPaoSetRemote = getP2ServerSystemPaoSet("tagentteamapply", "tagentsid = '" + tagentsid + "' AND fuserid = '" + userid + "'");
+        if (!queryPaoSetRemote.isEmpty()) {
+            PaoRemote remote = queryPaoSetRemote.getPao(0);
+            String fstatus = remote.getString("fstatus");
+            if (fstatus.equals("新建")) {
+                return getErrReturnObject().setErrCode(2).setErrMsg("正在申请中").toString();
+            } else if (fstatus.equals("审核")) {
+                return getErrReturnObject().setErrCode(3).setErrMsg("已通过申请").toString();
+            }
+        }
+
 
-        return "";
+        String tenterprise_userid = String.valueOf(getUniqueIDValue("tenterprise_users", "tenterprise_userid"));
+        if (userid != null) {
+            PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid = '" + userid + "'");
+            if (!paoSetRemote.isEmpty()) {
+                PaoRemote paoRemote = paoSetRemote.getPao(0);
+                fname = paoRemote.getString("fname");
+                fphonenumber = paoRemote.getString("fphonenumber");
+            }
+
+        } else {
+            userid = tenterprise_userid;
+            if (fname == null || fphonenumber == null) {
+                return getErrReturnObject().setErrMsg("未找到用户名或者手机号").toString();
+            }
+
+        }
+
+        //创建一个企业账号表
+        createTenterpriseUser(fname, fphonenumber, tenterprise_userid);
+
+
+        PaoRemote paoRemote = queryPaoSetRemote.addAtEnd();
+        paoRemote.setValue("SITEID", siteid, 11L);
+        paoRemote.setValue("FPHONENUMBER", fphonenumber, 11L);
+        paoRemote.setValue("TENTERPRISE_USERID", tenterprise_userid, 11L);
+        paoRemote.setValue("TAGENTSID", tagentsid, 11L);
+        paoRemote.setValue("FNAME", fname, 11L);
+        paoRemote.setValue("FSTATUS", "新建", 11L);
+        paoRemote.setValue("FUSERID", userid, 11L);
+        queryPaoSetRemote.save();
+
+
+        return getSucReturnObject().setData("申请成功").toString();
+    }
+
+    /**
+     * 创建tenterprise_users账号
+     *
+     * @param fname
+     * @param fphonenumber
+     * @param tenterprise_userid
+     * @throws P2Exception
+     */
+    public void createTenterpriseUser(String fname, String fphonenumber, String tenterprise_userid) throws P2Exception {
+        PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tenterprise_users");
+        PaoRemote paoRemote = paoSetRemote.addAtEnd();
+        paoRemote.setValue("SITEID", siteid, 11L);
+        paoRemote.setValue("FNAME", fname, 11L);
+        paoRemote.setValue("FPHONENUMBER", fphonenumber, 11L);
+        paoRemote.setValue("tenterprise_userid", tenterprise_userid, 11L);
+        paoRemote.setValue("fusertype", "经销商");
+        paoRemote.setValue("fisadministrator", 0, 11L);
+        paoSetRemote.save();
     }
 }