调整系统消息，增加系统消息标题

新增根据商户id获取商户信息方法
新增系统消息发送节点

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

@@ -325,6 +325,10 @@ public class Controller extends BaseClass {
         return dbConnect.runSqlQuery("select  * from tenterprise_users where siteid='" + siteid + "' and fisadministrator=1 and tagentsid=" + tagentsid).get(0);
     }
 
+    public Row getAgent(long tagentsid) {
+        return dbConnect.runSqlQuery("select  * from tagents where siteid='" + siteid + "' and tagentsid=" + tagentsid).get(0);
+    }
+
     /**
      * 获取用户账户余额
      *
@@ -681,18 +685,68 @@ public class Controller extends BaseClass {
      * 生成系统消息
      *
      * @param userid   用户ID，传0表示全部用户
+     * @param ftype    消息类型（公共、商户、团队）
+     * @param ftitle   消息小标题
+     * @param fmessage 消息内容
+     */
+    public String createSystemMessage(String ftype, String ftitle, String fmessage, long userid) {
+        SQLFactory factory = new SQLFactory("系统消息插入");
+        factory.addParameter("siteid", siteid);
+        factory.addParameter("ftype", ftype);
+        factory.addParameter("ftitle", ftitle);
+        factory.addParameter("fmessage", fmessage);
+        factory.addParameter("tenterprise_userid", userid);
+        factory.addParameter("objectid", "null");
+        factory.addParameter("objectname", "null");
+        sendSystemWebSocketMessage(userid, fmessage);
+        return dbConnect.runSqlUpdate(factory.getSQL());
+    }
+
+    /**
+     * 生成系统消息
+     *
+     * @param userid   用户ID，传0表示全部用户
+     * @param ftype    消息类型（公共、商户、团队）
+     * @param ftitle   消息小标题
      * @param fmessage 消息内容
      */
-    public String createSystemMessage(long userid, String fmessage) {
+    public String createSystemMessage(String ftype, String ftitle, String fmessage, long objectid, String objectname, long userid) {
         SQLFactory factory = new SQLFactory("系统消息插入");
         factory.addParameter("siteid", siteid);
-        factory.addParameter("ftype", "系统");
+        factory.addParameter("ftype", ftype);
+        factory.addParameter("ftitle", ftitle);
         factory.addParameter("fmessage", fmessage);
         factory.addParameter("tenterprise_userid", userid);
+        factory.addParameter("objectid", objectid);
+        factory.addParameter("objectname", objectname);
         sendSystemWebSocketMessage(userid, fmessage);
         return dbConnect.runSqlUpdate(factory.getSQL());
     }
 
+    /**
+     * 生成系统消息
+     *
+     * @param tagentsid 用户ID，传0表示全部用户
+     * @param ftype     消息类型（公共、商户、团队）
+     * @param ftitle    消息小标题
+     * @param fmessage  消息内容
+     */
+    public String createSystemMessageByAgentsid(String ftype, String ftitle, String fmessage, long tagentsid) {
+        return createSystemMessage(ftype, ftitle, fmessage, getMainUser(tagentsid).getLong("tenterprise_usersid"));
+    }
+
+    /**
+     * 生成系统消息
+     *
+     * @param tagentsid 用户ID，传0表示全部用户
+     * @param ftype     消息类型（公共、商户、团队）
+     * @param ftitle    消息小标题
+     * @param fmessage  消息内容
+     */
+    public String createSystemMessageByAgentsid(String ftype, String ftitle, String fmessage, long objectid, String objectname, long tagentsid) {
+        return createSystemMessage(ftype, ftitle, fmessage, objectid, objectname, getMainUser(tagentsid).getLong("tenterprise_usersid"));
+    }
+
     public static HashMap<String, Row> tableColumnRowmap = new HashMap<>();
 
     public String[] getTableColumns(String tablename) {

src/dsb/com/cnd3b/common/data/SQL/系统消息插入.sql

@@ -1,7 +1,8 @@
 declare @tmessageid bigint
 set @tmessageid=(select isnull(MAX(tmessageid),0) from tmessage)
 insert into tmessage
-(tmessageid, siteid, createdate, rmkenable, fmessage, ftype, fisread, freaddate, tenterprise_userid)
-select @tmessageid+ROW_NUMBER()over(order by fphonenumber), siteid, getDate(), 0, $fmessage$, $ftype$, 0, null, tenterprise_userid
+(tmessageid, siteid, createdate, rmkenable, fmessage, ftype, fisread, freaddate, tenterprise_userid,ftitle,objectid,objectname)
+select @tmessageid+ROW_NUMBER()over(order by fphonenumber), siteid, getDate(), 0, $fmessage$, $ftype$, 0, null, tenterprise_userid,$ftitle$,
+$objectid$,$objectname$
 from tenterprise_users
 where fphonenumber is not null and siteid=$siteid$ and ($tenterprise_userid$=0 or tenterprise_userid = $tenterprise_userid$)

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

@@ -120,7 +120,7 @@ public class tagents extends Controller {
                     tagents_msgchangeapp.setValue("fstatus", "审核", 11L);
                     tagents_msgchangeapp.setValue("checkby", username, 11L);
                     tagents_msgchangeapp.setValue("checkdate", sysdate, 11L);
-                    createSystemMessage(getMainUser(tagentsid).getLong("tenterprise_usersid"), "商户信息修改审核成功！");
+                    createSystemMessage("商户", "商户审核通知", "商户信息修改审核成功！", userid);
                 }
             }
             tagents_msgchangeappSet.save();
@@ -200,6 +200,8 @@ public class tagents extends Controller {
         tagents_cooperation.setValue("tagentsid", tcooperationagentsid, 11L);
         tagents_cooperation.setValue("tcooperationagentsid", tagentsid, 11L);
         tagents_cooperationSet.save();
+
+        createSystemMessageByAgentsid("商户", "申请合作通知", getAgent(tagentsid).getString("fbrand") + "申请建立合作关系！", tagents_cooperation.getUniqueIDValue(), "tagents_cooperation", tcooperationagentsid);
         return getSucReturnObject().toString();
     }
 
@@ -230,6 +232,8 @@ public class tagents extends Controller {
         tagents_cooperation2.setValue("tcooperationagentsid", tagentsid, 11L);
 
         tagents_cooperationSet.save();
+        createSystemMessageByAgentsid("商户", "新合作通知", "与" + getAgent(tagentsid).getString("fbrand") + "建立新合作成功！", tcooperationagentsid);
+        createSystemMessageByAgentsid("商户", "新合作通知", "与" + getAgent(tcooperationagentsid).getString("fbrand") + "建立新合作成功！", tagentsid);
         return getSucReturnObject().toString();
     }
 
@@ -247,6 +251,11 @@ public class tagents extends Controller {
         PaoRemote tagents_cooperation = tagents_cooperationSet.getPao(0);
         tagents_cooperation.setValue("ftype", ftype, 11L);//需要发布tcooperationagentsid商户进行设置，1：上游；2下游；3双向
         tagents_cooperationSet.save();
+
+        Row row = getMainUser(tagents_cooperation.getLong("tcooperationagentsid"));
+        if (row != null) {
+            createSystemMessageByAgentsid("商户", "合作方式调整通知", "与" + getAgent(tcooperationagentsid).getString("fbrand") + "合作方式调整成功！", userid);
+        }
         return getSucReturnObject().toString();
     }
 
@@ -258,12 +267,17 @@ public class tagents extends Controller {
      */
     public String delete_cooperation() throws P2Exception {
         long tcooperationagentsid = content.getLong("tcooperationagentsid");//合作商ID
+
         SQLFactory sqlFactory = new SQLFactory(this, "解除合作关系");
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("tagentsid", tagentsid);
         sqlFactory.addParameter("tcooperationagentsid", tcooperationagentsid);
         String status = dbConnect.runSqlUpdate(sqlFactory.getSQL());
         if ("true".equals(status)) {
+            Row row = getMainUser(tcooperationagentsid);
+            if (row != null) {
+                createSystemMessageByAgentsid("商户", "取消合作通知", "与" + getAgent(tcooperationagentsid).getString("fbrand") + "取消合作成功！", userid);
+            }
             return getSucReturnObject().toString();
         } else {
             return getErrReturnObject().setErrMsg(status).toString();
@@ -280,12 +294,11 @@ public class tagents extends Controller {
         SQLFactory sql = new SQLFactory(this, "合作经销商详情查询");
         sql.addParameter("siteid", siteid);
         sql.addParameter("tagentsid", content.getString("tagentsid"));
-        sql.addParameter_SQL("orderby"," t2.changedate DESC,t1.changedate DESC");
-        System.err.println(sql.getSQL());
+        sql.addParameter_SQL("orderby", " t2.changedate DESC,t1.changedate DESC");
         Rows rows = dbConnect.runSqlQuery(sql.getSQL());
         for (Row row : rows) {
             row.put("saleprodclass", JSONArray.parseArray(row.getString("saleprodclass")));
-            row.put("attinfos", getAttachmentUrl("tagents",content.getString("tagentsid")));
+            row.put("attinfos", getAttachmentUrl("tagents", content.getString("tagentsid")));
         }
         return getSucReturnObject().setData(rows).toString();
     }

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

@@ -66,6 +66,7 @@ public class teammsg extends Controller {
         boolean fisused = content.getBoolean("fisused");
         JSONArray subusersArray = content.getJSONArray("subusers");
 
+        boolean toBeAdded = false;
         PaoSetRemote tenterprise_usersSet = getP2ServerSystemPaoSet("tenterprise_users", "siteid='" + siteid + "' and tagentsid='" + tagentsid + "' and tenterprise_userid='" + tenterprise_userid + "'");
         PaoRemote pao = null;
         if (tenterprise_userid <= 0 || tenterprise_usersSet.isEmpty()) {
@@ -74,6 +75,7 @@ public class teammsg extends Controller {
             pao.setValue("siteid", siteid, 11L);
             pao.setValue("fusertype", "¾­ÏúÉÌ", 11L);
             tenterprise_userid = pao.getUniqueIDValue();
+            toBeAdded = true;
         } else {
             pao = tenterprise_usersSet.getPao(0);
         }
@@ -130,6 +132,9 @@ public class teammsg extends Controller {
             }
         }
         tenterprise_usersSet.save();
+        if (toBeAdded) {
+            createSystemMessage("ÍŶÓ", "ÍŶӼÓÈë֪ͨ", "¹§Ï²¼ÓÈë" + getAgent(tagentsid).getString("fbrand") + "ÍŶÓ", tenterprise_userid);
+        }
         return getSucReturnObject().toString();
     }
 

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

@@ -254,9 +254,9 @@ public class tagents extends Controller {
             tagentsSet.close();
 
             if (ftype.equals("商户认证") || ftype.equals("新增")) {
-                createSystemMessage(getMainUser(tagentsid).getLong("tenterprise_usersid"), "恭喜商户入驻审核成功，布万家将竭诚为你服务！");
+                createSystemMessageByAgentsid("商户", "商户审核通知", "恭喜商户入驻审核成功，布万家将竭诚为你服务！", tagentsid);
             } else {
-                createSystemMessage(getMainUser(tagentsid).getLong("tenterprise_usersid"), "商户信息修改审核成功！");
+                createSystemMessageByAgentsid("商户", "商户审核通知", "商户信息修改审核成功！", tagentsid);
             }
         }
         return getSucReturnObject().toString();

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

@@ -36,6 +36,7 @@ public class Users extends Controller {
             tagents.setValue("fjoindate", getDateTime(), 11L);
             tagents.setValue("ftype", "个人", 11L);
             tagentsSet.save();
+            createSystemMessageByAgentsid("公共", "", "恭喜！注册成功！", tagents.getUniqueIDValue());
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -81,6 +82,7 @@ public class Users extends Controller {
             tagents.setValue("fjoindate", getDateTime(), 11L);
             tagents.setValue("ftype", "个人", 11L);
             tagentsSet.save();
+            createSystemMessageByAgentsid("公共", "", "恭喜！注册成功！", tagents.getUniqueIDValue());
 
             WebClientRest rest = new WebClientRest();
             String password = rest.createPassWord();

src/dsb/com/cnd3b/restcontroller/system/message/SQL/消息查询全部.sql

@@ -1,2 +1,2 @@
-select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid from tMessage t1
+select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid,ftitle from tMessage t1
 where siteid=$siteid$ and tenterprise_userid=$tenterprise_userid$

src/dsb/com/cnd3b/restcontroller/system/message/SQL/消息查询分类.sql

@@ -1,2 +1,2 @@
-select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid from tMessage t1
+select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid,ftitle from tMessage t1
 where siteid=$siteid$ and ftype=$ftype$ and tenterprise_userid=$tenterprise_userid$

src/dsb/com/cnd3b/restcontroller/system/message/SQL/消息详情.sql

@@ -1,2 +1,2 @@
-select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid from tMessage t1
+select tmessageid,createdate,fmessage,ftype,fisread,freaddate,objectname,objectid,ftitle from tMessage t1
 where siteid=$siteid$ and tenterprise_userid=$tenterprise_userid$ and tmessageid=$tmessageid$