新增保利威定制开播软件下载接口

商户详情新增主账号ID

src/dsb/com/cnd3b/restcontroller/customer/tagents/SQL/合作经销商详情查询.sql

@@ -1,6 +1,8 @@
-select top 1 t1.fbrand, t1.fcontact, t1.faddress, t1.siteid, t1.fphonenumber, t1.fdutyparagraph, t1.saleprodclass,t2.ftype,t2.createby,t1.fintroduction,t1.fagentname
+select top 1 t1.fbrand, t1.fcontact, t1.faddress, t1.siteid, t1.fphonenumber, t1.fdutyparagraph, t1.saleprodclass,t2.ftype,t2.createby,t1.fintroduction,t1.fagentname,
+t3.tenterprise_userid
 from tagents AS t1
          INNER JOIN tagents_cooperation AS t2 ON t1.tagentsid = t2.tcooperationagentsid and t2.tagentsid  = $tagentsid$
+         inner join tenterprise_users t3 on t1.siteid=t3.siteid and t1.tagentsid=t3.tagentsid and t3.fisadministrator=1
 where t1.siteid = $siteid$
   and t1.tagentsid = $tcooperationagentsid$
 ORDER BY $orderby$

src/dsb/com/cnd3b/restcontroller/publicmethod/homepage/SQL/优质商户详情.sql

@@ -1,3 +1,5 @@
-select t1.fbrand, t1.fcontact, t1.faddress, t1.siteid, t1.fphonenumber, t1.fdutyparagraph, t1.saleprodclass,t1.fintroduction,t1.fagentname
+select t1.fbrand, t1.fcontact, t1.faddress, t1.siteid, t1.fphonenumber, t1.fdutyparagraph, t1.saleprodclass,t1.fintroduction,t1.fagentname,
+t2.tenterprise_userid
 from tagents AS t1
+inner join tenterprise_users t2 on t1.siteid=t2.siteid and t1.tagentsid=t2.tagentsid and t2.fisadministrator=1
 where t1.tagentsid = $tagentsid$ and t1.siteid=$siteid$

src/dsb/com/cnd3b/restcontroller/publicmethod/live/live.java

@@ -44,27 +44,27 @@ public class live extends Controller {
         brandcustcount.addParameter("tactivityid", tactivityid);
         brandcustcount.addParameter("siteid", siteid);
         Rows brandcustcountrows = dbConnect.runSqlQuery(brandcustcount.getSQL());
-        int flivecount= liverows.size();
+        int flivecount = liverows.size();
         //正在直播数
         resultObject.put("flivecount", flivecount);
         //当前在线观众人数
         resultObject.put("fcustcount", liverows.isEmpty() ? 0 : liverows.sum("fcustcount"));
         //直播列表
-        int pageSize=content.getIntValue("pageSize");
-        int pageNumber=content.getIntValue("pageNumber");
-        if(pageSize==0||pageNumber==0){
+        int pageSize = content.getIntValue("pageSize");
+        int pageNumber = content.getIntValue("pageNumber");
+        if (pageSize == 0 || pageNumber == 0) {
             resultObject.put("tlivelist", liverows);
-        }else{
-            Rows newliverows=new Rows();
-            double pageTotal=  Math.ceil((double) flivecount / (double) pageSize);//总页数
-            int startindex=(pageNumber-1)*pageSize;
-            int endindex=(pageNumber)*pageSize-1;
-            if(pageNumber>=pageTotal){
-                 startindex=flivecount-pageSize;
-                 endindex=flivecount-1;
+        } else {
+            Rows newliverows = new Rows();
+            double pageTotal = Math.ceil((double) flivecount / (double) pageSize);//总页数
+            int startindex = (pageNumber - 1) * pageSize;
+            int endindex = (pageNumber) * pageSize - 1;
+            if (pageNumber >= pageTotal) {
+                startindex = flivecount - pageSize;
+                endindex = flivecount - 1;
             }
-            for(int i=0;i<flivecount;i++){
-                if(startindex<=i&&i<=endindex){
+            for (int i = 0; i < flivecount; i++) {
+                if (startindex <= i && i <= endindex) {
                     newliverows.add(liverows.get(i));
                 }
             }
@@ -150,4 +150,11 @@ public class live extends Controller {
         object.put("saleprodclasscount", rows4);
         return getSucReturnObject().setData(object).saveToDataPool(1).toString();
     }
+
+    public String getPolyvSoftUrl() {
+        JSONObject object = new JSONObject();
+        object.put("MAC", "http://soft.polyv.net/custom/macCloud/04de51d4c1/4.5.4/Live-Setup.dmg");
+        object.put("WIN", "http://live.polyv.net/clients/winClient/04de51d4c1/Live-Setup.exe");
+        return getSucReturnObject().setData(object).toString();
+    }
 }