Merge remote-tracking branch 'origin/develop' into develop

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

@@ -8,6 +8,7 @@ import com.cnd3b.common.data.RowsMap;
 import com.cnd3b.common.data.SQLFactory;
 import com.cnd3b.common.Controller;
 import com.cnd3b.common.data.Row;
+import p2.common.parse.P;
 import p2.pao.PaoRemote;
 import p2.pao.PaoSetRemote;
 import p2.util.P2Exception;
@@ -168,28 +169,48 @@ public class teammsg extends Controller {
         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()) {
+        if (!paoSetRemote.isEmpty()) {
             PaoRemote paoRemote = paoSetRemote.getPao(0);
+            PaoSetRemote paoSetRemote_tenterprise = paoRemote.getPaoSet("tenterprise_users", "tenterprise_users", "tenterprise_userid = '" + tenterprise_userid + "'");
             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);
+                String sql = "SELECT ftype FROM tagents WHERE tagentsid = '" + paoRemote_tenterprise.getString("tagentsid") + "'";
+                Rows rows = dbConnect.runSqlQuery(sql);
+                String ftype = "";
+                if (!rows.isEmpty()) {
+                    ftype = rows.get(0).getString("ftype");
+                }
+                //如果是个人
+                if (ftype.equals("个人")) {
+                    paoRemote_tenterprise.getPaoSet("tagents", "tagents", "tagentsid=:tagentsid").getPao(0).delete();
+                    paoRemote_tenterprise.setValue("tagentsid", tagentsid, 11L);
+
+                } else {
+                    PaoRemote pao = paoSetRemote_tenterprise.addAtEnd();
+                    String newUserid = String.valueOf(getUniqueIDValue("tenterprise_users", "tenterprise_userid"));
+                    pao.setValue("SITEID", paoRemote_tenterprise.getString("SITEID"), 11L);
+                    pao.setValue("FNAME", paoRemote_tenterprise.getString("FNAME"), 11L);
+                    pao.setValue("FPHONENUMBER", paoRemote_tenterprise.getString("FPHONENUMBER"), 11L);
+                    pao.setValue("tenterprise_userid", newUserid, 11L);
+                    pao.setValue("fusertype", "经销商");
+                    pao.setValue("fisadministrator", 0, 11L);
+                    pao.setValue("tagentsid", tagentsid, 11L);
+                    //
+                    paoRemote.setValue("fuserid", newUserid, 11L);
+
+                }
+
                 paoSetRemote.save();
-                paoRemote_tenterprise.setValue("tagentsid", tagentsid, 11L);
-                paoSetRemote_tenterprise.save();
                 return getSucReturnObject().setData("审核成功").toString();
             }
 
-
         } else {
             return getErrReturnObject().setErrMsg("未找到申请记录").toString();
         }
@@ -204,9 +225,14 @@ public class teammsg extends Controller {
      */
     public String getEntryTeamApplyList() {
         SQLFactory sqlFactory = new SQLFactory(this, "团队加入申请列表", pageSize, pageNumber, "createdate");
-        sqlFactory.addParameter("tagentsid", tagentsid);
+        sqlFactory.addParameter("tagentsid", "35208");
         sqlFactory.addParameter("siteid", siteid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
+        for (Row row : rows) {
+            System.err.println(row.getString("tenterprise_userid"));
+            row.put("attinfos", getAttachmentUrl("tenterprise_users", row.getString("tenterprise_userid")));
+        }
+
         return getSucReturnObject().setDataByPaging(rows).preloading(1).toString();
     }
 }

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

@@ -158,10 +158,10 @@ public class Users extends Controller {
     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");
-
+        String fname = "";
+        String fphonenumber = "";
         PaoSetRemote queryPaoSetRemote = getP2ServerSystemPaoSet("tagentteamapply", "tagentsid = '" + tagentsid + "' AND fuserid = '" + userid + "'");
+
         if (!queryPaoSetRemote.isEmpty()) {
             PaoRemote remote = queryPaoSetRemote.getPao(0);
             String fstatus = remote.getString("fstatus");
@@ -172,8 +172,6 @@ public class Users extends Controller {
             }
         }
 
-
-        String tenterprise_userid = String.valueOf(getUniqueIDValue("tenterprise_users", "tenterprise_userid"));
         if (userid != null) {
             PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid = '" + userid + "'");
             if (!paoSetRemote.isEmpty()) {
@@ -183,21 +181,14 @@ public class Users extends Controller {
             }
 
         } else {
-            userid = tenterprise_userid;
-            if (fname == null || fphonenumber == null) {
-                return getErrReturnObject().setErrMsg("未找到用户名或者手机号").toString();
-            }
+            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("TENTERPRISE_USERID", userid, 11L);
         paoRemote.setValue("TAGENTSID", tagentsid, 11L);
         paoRemote.setValue("FNAME", fname, 11L);
         paoRemote.setValue("FSTATUS", "新建", 11L);
@@ -208,23 +199,4 @@ public class Users extends Controller {
         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();
-    }
 }