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

src/dsb/com/cnd3b/restcontroller/customer/tagents/tagents.java

@@ -150,11 +150,11 @@ public class tagents extends Controller {
                 where.append("or t2.fbrand like'%").append(whereObject.getString("condition")).append("%' ");
                 where.append(")");
             }
-            if (whereObject.containsKey("ftype") && !"".equals(whereObject.getString("ftype"))) {
-                where.append(" and(");
-                where.append("t1.ftype ='").append(whereObject.getString("ftype")).append("' ");
-                where.append(")");
-            }
+//            if (whereObject.containsKey("ftype") && !"".equals(whereObject.getString("ftype"))) {
+//                where.append(" and(");
+//                where.append("t1.ftype ='").append(whereObject.getString("ftype")).append("' ");
+//                where.append(")");
+//            }
             if (whereObject.containsKey("fstatus") && !"".equals(whereObject.getString("fstatus"))) {
                 where.append(" and(");
                 where.append("t1.fstatus ='").append(whereObject.getString("fstatus")).append("' ");
@@ -193,7 +193,7 @@ public class tagents extends Controller {
         if (dbConnect.runSqlQuery("select *from tagents where tagentsid='" + tcooperationagentsid + "'").isEmpty()) {
             return getErrReturnObject().setErrMsg("找不到该合作商户信息！").toString();
         }
-        int ftype = content.getInteger("ftype");//合作类型
+//        int ftype = content.getInteger("ftype");//合作类型
         PaoSetRemote tagents_cooperationSet = getP2ServerSystemPaoSet("tagents_cooperation", "tagentsid='" + tcooperationagentsid + "' and tcooperationagentsid='" + tagentsid + "'");
         if (!tagents_cooperationSet.isEmpty()) {
             if ("合作".equals(tagents_cooperationSet.getPao(0).getString("fstatus"))) {
@@ -206,7 +206,7 @@ public class tagents extends Controller {
         tagents_cooperation.setValue("siteid", siteid, 11L);
         tagents_cooperation.setValue("createby", username, 11L);
         tagents_cooperation.setValue("createdate", sysdate, 11L);
-        tagents_cooperation.setValue("ftype", ftype, 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
+//        tagents_cooperation.setValue("ftype", ftype, 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
         tagents_cooperation.setValue("fstatus", "申请", 11L);//状态
         tagents_cooperation.setValue("tagentsid", tcooperationagentsid, 11L);
         tagents_cooperation.setValue("tcooperationagentsid", tagentsid, 11L);
@@ -224,13 +224,13 @@ public class tagents extends Controller {
      */
     public String cooperation() throws P2Exception {
         long tcooperationagentsid = content.getLong("tcooperationagentsid");//合作商ID
-        int ftype = content.getInteger("ftype");//合作类型
+//        int ftype = content.getInteger("ftype");//合作类型
         PaoSetRemote tagents_cooperationSet = getP2ServerSystemPaoSet("tagents_cooperation", "tagentsid='" + tagentsid + "' and tcooperationagentsid='" + tcooperationagentsid + "'");
 
         PaoRemote tagents_cooperation = tagents_cooperationSet.getPao(0);
         tagents_cooperation.setValue("createby", username, 11L);
         tagents_cooperation.setValue("createdate", sysdate, 11L);
-        tagents_cooperation.setValue("ftype", ftype, 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
+//        tagents_cooperation.setValue("ftype", ftype, 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
         tagents_cooperation.setValue("fstatus", "合作", 11L);//状态
 
         if (dbConnect.runSqlQuery("select *from tagents_cooperation where tagentsid='" + tcooperationagentsid + "' and tcooperationagentsid='" + tagentsid + "'").isEmpty()) {
@@ -238,7 +238,7 @@ public class tagents extends Controller {
             tagents_cooperation2.setValue("siteid", siteid, 11L);
             tagents_cooperation2.setValue("createby", username, 11L);
             tagents_cooperation2.setValue("createdate", sysdate, 11L);
-            tagents_cooperation2.setValue("ftype", ftype == 1 ? 2 : (ftype == 2 ? 1 : 0), 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
+//            tagents_cooperation2.setValue("ftype", ftype == 1 ? 2 : (ftype == 2 ? 1 : 0), 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
             tagents_cooperation2.setValue("fstatus", "合作", 11L);//状态
             tagents_cooperation2.setValue("tagentsid", tcooperationagentsid, 11L);
             tagents_cooperation2.setValue("tcooperationagentsid", tagentsid, 11L);