1：管理端获取登陆验证码时判断有误管理员账号，如果没有则返回错误提示

2：新增获取经销商主账号方法
3:新增发送socket系统消息方法
4：商户认证或商户信息修改成功时，自动发送系统消息
5：修复轮播图公共查询方法错误

src/dsb/com/cnd3b/common/Controller.java

@@ -319,6 +319,10 @@ public class Controller extends BaseClass {
         return dbConnect.runSqlQuery("select  * from tenterprise_users where siteid='" + siteid + "' and tenterprise_userid in(" + where + ")").toRowsMap("tenterprise_userid");
     }
 
+    public Row getMainUser(long tagentsid) {
+        return dbConnect.runSqlQuery("select  * from tenterprise_users where siteid='" + siteid + "' and fisadministrator=1 and tagentsid=" + tagentsid).get(0);
+    }
+
     /**
      * 获取用户账户余额
      *
@@ -654,6 +658,18 @@ public class Controller extends BaseClass {
         }
     }
 
+    /**
+     * 发送系统消息
+     */
+    public void sendSystemWebSocketMessage(long userid, String message) {
+        JSONObject methodobject = new JSONObject();
+        methodobject.put("type", "remind");//提醒
+        methodobject.put("text", message);
+        for (WebClientSocket webClientSocket : parameter.websocketClients.get(userid).values()) {
+            webClientSocket.sendSystemMessage(methodobject);
+        }
+    }
+
 
     /**
      * 生成系统消息
@@ -667,6 +683,7 @@ public class Controller extends BaseClass {
         factory.addParameter("ftype", "系统");
         factory.addParameter("fmessage", fmessage);
         factory.addParameter("tenterprise_userid", userid);
+        sendSystemWebSocketMessage(userid, fmessage);
         return dbConnect.runSqlUpdate(factory.getSQL());
     }
 

src/dsb/com/cnd3b/common/restful/WebClientRest.java

@@ -259,14 +259,16 @@ public class WebClientRest {
         String client = "";//登陆来源，web_manage、web_customer、wechat_customer
         if (requestcontent.containsKey("client")) {
             client = requestcontent.getString("client");
+            if ("web_manage".equalsIgnoreCase(client)) {
+                DBConnect dbConnect = new DBConnect();
+                if (dbConnect.runSqlQuery("select * from tenterprise_users where fphonenumber='" + phonenumber + "' and fusertype='企业'").isEmpty()) {
+                    JSONObject object = new JSONObject();
+                    object.put("code", 0);
+                    object.put("msg", "当前手机号不是管理员账号");
+                    return object.toString();
+                }
+            }
         }
-//        DBConnect dbConnect = new DBConnect();
-//        if (dbConnect.runSqlQuery("select * from tenterprise_users where fphonenumber='" + phonenumber + "'").isEmpty()) {
-//            JSONObject object = new JSONObject();
-//            object.put("code", 0);
-//            object.put("msg", "当前手机号未注册！");
-//            return object.toString();
-//        }
 
         String password = createPassWord();
         parameter.phonenumber_password.put(phonenumber, password);

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

@@ -252,6 +252,12 @@ public class tagents extends Controller {
             tagents_msgchangeappSet.getPao(0).setValue("checkdate", sysdate, 11L);
             tagentsSet.save();
             tagentsSet.close();
+
+            if (ftype.equals("商户认证") || ftype.equals("新增")) {
+                createSystemMessage(tagentsid, "恭喜商户入驻审核成功，布玩家将竭诚为你服务！");
+            } else {
+                createSystemMessage(tagentsid, "商户信息修改审核成功！");
+            }
         }
         return getSucReturnObject().toString();
     }

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

@@ -22,8 +22,7 @@ public class bannermag extends Controller {
      * @return
      */
     public String query_bannerlocationlist() {
-        String siteid = content.getString("siteid");
-        this.siteid = siteid;
+        this.siteid = content.getString("siteid");
         String fclienttype = content.getString("fclienttype");
 
         SQLFactory locationSQL = new SQLFactory(this, "ÂÖ²¥¹ã¸æλ²éѯ");