加入团队申请增加是否保留原商户信息字段

商户加入审核通过后，如果不保留原商户信息，则自动删除所有原商户ID关联的数据信息

src/dsb/com/cnd3b/restcontroller/customer/usercenter/teammsg/SQL/商户档案删除.sql

@@ -0,0 +1,17 @@
+delete from tagents where siteid=$siteid$ and tagentsid=$tagentsid$
+
+delete from tenterprise_users where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tuserrequestlog where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tattachment_downlog where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tpayinfo where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tagents_product where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tmaxbillnum where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tnotice where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tagents_cooperation where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tliveapply where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tlive where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tactivity_agentmsg where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tactivity_agentproducts where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tagents_msgchangeapp where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tsupplyanddemand where siteid=$siteid$ and tagentsid=$tagentsid$
+delete from tnotice_userdata where siteid=$siteid$ and tagentsid=$tagentsid$

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

@@ -277,7 +277,6 @@ public class teammsg extends Controller {
      * @return
      */
     public String checkEntryTeamApply() throws P2Exception {
-
         boolean isPass = content.getBooleanValue("isPass");
         //加入商户团队申请表id
         long tagentteamapplyid = content.getLong("tagentteamapplyid");
@@ -290,6 +289,7 @@ public class teammsg extends Controller {
             if (paoSetRemote_tenterprise.isEmpty()) {
                 return getErrReturnObject().setErrMsg("未找到申请人信息").toString();
             }
+            long oldtagentsid = paoSetRemote_tenterprise.getPao(0).getLong("tagentsid");
             PaoRemote paoRemote_tenterprise = paoSetRemote_tenterprise.getPao(0);
             //拒绝，只更新商户团队申请表
             if (!isPass) {
@@ -299,18 +299,8 @@ public class teammsg extends Controller {
                 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);
-                    paoRemote_tenterprise.setValue("fisadministrator", false, 11L);
-                } else {
+                boolean fissaveagentmsg = paoRemote.getBoolean("fissaveagentmsg");//是否保留当前商户信息
+                if (fissaveagentmsg) {
                     PaoRemote pao = paoSetRemote_tenterprise.addAtEnd();
                     pao.setValue("SITEID", paoRemote_tenterprise.getString("SITEID"), 11L);
                     pao.setValue("FNAME", paoRemote_tenterprise.getString("FNAME"), 11L);
@@ -320,13 +310,20 @@ public class teammsg extends Controller {
                     pao.setValue("tagentsid", tagentsid, 11L);
                     paoRemote.setValue("fuserid", pao.getUniqueIDValue(), 11L);
                     tenterprise_userid = pao.getUniqueIDValue();
+                } else {
+                    paoRemote_tenterprise.setValue("tagentsid", tagentsid, 11L);
+                    paoRemote_tenterprise.setValue("fisadministrator", false, 11L);
                 }
-
                 paoSetRemote.save();
+                if (!fissaveagentmsg) {
+                    SQLFactory deleteagentsql = new SQLFactory(this, "商户档案删除");
+                    deleteagentsql.addParameter("siteid", siteid);
+                    deleteagentsql.addParameter("tagentsid", oldtagentsid);
+                    dbConnect.runSqlUpdate(deleteagentsql.getSQL());
+                }
                 createSystemMessage("团队", "团队加入通知", "恭喜加入" + getAgent(tagentsid).getString("fbrand"), tenterprise_userid);
                 return getSucReturnObject().setData("审核成功").toString();
             }
-
         } else {
             return getErrReturnObject().setErrMsg("未找到申请记录").toString();
         }

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

@@ -156,8 +156,9 @@ public class Users extends Controller {
      * @return
      */
     public String entryTeamApply() throws P2Exception {
-        String userid = content.getString("userid");
-        String tagentsid = content.getString("tagentsid");
+        long userid = content.getLongValue("userid");
+        long tagentsid = content.getLong("tagentsid");
+        boolean fissaveagentmsg = content.getBooleanValue("fissaveagentmsg");//是否保留当前商户信息
         String fname = "";
         String fphonenumber = "";
         PaoSetRemote queryPaoSetRemote = getP2ServerSystemPaoSet("tagentteamapply", "tagentsid = '" + tagentsid + "' AND fuserid = '" + userid + "'");
@@ -172,7 +173,7 @@ public class Users extends Controller {
             }
         }
 
-        if (userid != null) {
+        if (userid > 0) {
             PaoSetRemote paoSetRemote = getP2ServerSystemPaoSet("tenterprise_users", "tenterprise_userid = '" + userid + "'");
             if (!paoSetRemote.isEmpty()) {
                 PaoRemote paoRemote = paoSetRemote.getPao(0);
@@ -184,7 +185,6 @@ public class Users extends Controller {
             return getErrReturnObject().setErrMsg("未找到对应用户").toString();
 
         }
-
         PaoRemote paoRemote = queryPaoSetRemote.addAtEnd();
         paoRemote.setValue("SITEID", siteid, 11L);
         paoRemote.setValue("FPHONENUMBER", fphonenumber, 11L);
@@ -193,10 +193,9 @@ public class Users extends Controller {
         paoRemote.setValue("FNAME", fname, 11L);
         paoRemote.setValue("FSTATUS", "申请", 11L);
         paoRemote.setValue("FUSERID", userid, 11L);
+        paoRemote.setValue("fissaveagentmsg", fissaveagentmsg, 11L);
         queryPaoSetRemote.save();
 
-
         return getSucReturnObject().setData("申请成功").toString();
     }
-
 }