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

src/custom/restcontroller/webmanage/sale/agents/agents.java

@@ -36,6 +36,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 
+import static beans.enterprise.Enterprise.getEnterprise;
+
 @API(title = "经销商管理")
 public class agents extends Controller {
     public agents(JSONObject content) throws YosException {
@@ -67,11 +69,11 @@ public class agents extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_agents", "sys_enterpriseid", "isservice",
-                "sa_agentsid","agentnum","priceadjustment","type","signdate","createby","createdate","islimitaccessories","islimitorder","signingstate","delivery","salearea","paymans","regiontype","u8subject","recommendedservice","servicetype");
+                "sa_agentsid", "agentnum", "priceadjustment", "type", "signdate", "createby", "createdate", "islimitaccessories", "islimitorder", "signingstate", "delivery", "salearea", "paymans", "regiontype", "u8subject", "recommendedservice", "servicetype");
         querySQL.setTableAlias("t1");
-        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid","enterprisename","abbreviation"
-                ,"contact","address","phonenumber","province","city","county","grade","saleclassauth");
-        querySQL.addQueryFields("status","case when t1.status='1' then '审核' else '新建' end");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t1.siteid = t2.siteid and t1.sys_enterpriseid = t2.sys_enterpriseid", "enterprisename", "abbreviation"
+                , "contact", "address", "phonenumber", "province", "city", "county", "grade", "saleclassauth");
+        querySQL.addQueryFields("status", "case when t1.status='1' then '审核' else '新建' end");
         querySQL.setSiteid(siteid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
@@ -112,68 +114,68 @@ public class agents extends Controller {
             Rows salerrows = dbConnect.runSqlQuery(salersql.getSQL());
             agentRow.put("salers", salerrows);
 
-            QuerySQL querySQL=SQLFactory.createQuerySQL(this,"sa_bankabcxccard","*");
+            QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_bankabcxccard", "*");
             querySQL.setTableAlias("t1");
-            querySQL.setWhere("t1.siteid",siteid);
-            querySQL.setWhere("t1.sa_agentsid",sa_agentsid);
-            Rows bankabcxccardrows=querySQL.query();
+            querySQL.setWhere("t1.siteid", siteid);
+            querySQL.setWhere("t1.sa_agentsid", sa_agentsid);
+            Rows bankabcxccardrows = querySQL.query();
             agentRow.put("bankabcxccard", bankabcxccardrows);
         }
         return getSucReturnObject().setData(agentRows.isNotEmpty() ? agentRows.get(0) : new Row()).toString();
     }
 
-    public void changeagentvalidate(boolean ischange,long sa_agentsid,String toagentnum,Rows agents_toagentslogRows,String agentnum,Rows agentsRows) throws YosException {
+    public void changeagentvalidate(boolean ischange, long sa_agentsid, String toagentnum, Rows agents_toagentslogRows, String agentnum, Rows agentsRows) throws YosException {
         if (ischange) {
             if (StringUtils.isBlank(toagentnum)) {
                 throw new YosException("授权经销商编号不能为空");
             }
             if (agentnum.equals(toagentnum)) {
-                throw new YosException( "授权经销商不可等于当前经销商");
+                throw new YosException("授权经销商不可等于当前经销商");
             }
             if (!agents_toagentslogRows.isEmpty()) {
                 throw new YosException("已授权，不能重复授权，如需变更，请先取消授权");
             }
-            if(StringUtils.isNotBlank(agentsRows.get(0).getString("toagentnum"))){
+            if (StringUtils.isNotBlank(agentsRows.get(0).getString("toagentnum"))) {
                 throw new YosException("已授权，不能重复授权");
             }
         } else {// 取消授权
-            if(StringUtils.isBlank(agentsRows.get(0).getString("toagentnum"))){
+            if (StringUtils.isBlank(agentsRows.get(0).getString("toagentnum"))) {
                 throw new YosException("未授权，无法取消授权");
             }
             if (agents_toagentslogRows.isEmpty()) {
                 throw new YosException("不存在授权其他经销商变更记录，无法取消授权");
             }
-            ArrayList sa_warrantycardids= agents_toagentslogRows.toRowsMap("sourceobject").get("sa_warrantycard").toArrayList("sourceid");
-            ArrayList sa_customersids= agents_toagentslogRows.toRowsMap("sourceobject").get("sa_customers").toArrayList("sourceid");
+            ArrayList sa_warrantycardids = agents_toagentslogRows.toRowsMap("sourceobject").get("sa_warrantycard").toArrayList("sourceid");
+            ArrayList sa_customersids = agents_toagentslogRows.toRowsMap("sourceobject").get("sa_customers").toArrayList("sourceid");
 
-            QuerySQL warrantycardquerySQL=SQLFactory.createQuerySQL(this,"sa_warrantycard","*");
+            QuerySQL warrantycardquerySQL = SQLFactory.createQuerySQL(this, "sa_warrantycard", "*");
             warrantycardquerySQL.setTableAlias("t1");
-            warrantycardquerySQL.setWhere("t1.siteid",siteid);
-            warrantycardquerySQL.setWhere("t1.sa_warrantycardid",sa_warrantycardids);
-            Rows warrantycardrows=warrantycardquerySQL.query();
-            RowsMap warrantycardrowsMap =warrantycardrows.toRowsMap("sa_warrantycardid");
+            warrantycardquerySQL.setWhere("t1.siteid", siteid);
+            warrantycardquerySQL.setWhere("t1.sa_warrantycardid", sa_warrantycardids);
+            Rows warrantycardrows = warrantycardquerySQL.query();
+            RowsMap warrantycardrowsMap = warrantycardrows.toRowsMap("sa_warrantycardid");
 
-            QuerySQL customersquerySQL=SQLFactory.createQuerySQL(this,"sa_customers","*");
+            QuerySQL customersquerySQL = SQLFactory.createQuerySQL(this, "sa_customers", "*");
             customersquerySQL.setTableAlias("t1");
             customersquerySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t2", " t1.sa_agentsid_to = t2.sa_agentsid and t1.siteid = t2.siteid");
-            customersquerySQL.setWhere("t1.siteid",siteid);
-            customersquerySQL.setWhere("t1.sa_customersid",sa_customersids);
-            customersquerySQL.addQueryFields("toagentnum","t2.agentnum");
-            Rows customersrows=customersquerySQL.query();
+            customersquerySQL.setWhere("t1.siteid", siteid);
+            customersquerySQL.setWhere("t1.sa_customersid", sa_customersids);
+            customersquerySQL.addQueryFields("toagentnum", "t2.agentnum");
+            Rows customersrows = customersquerySQL.query();
             RowsMap customersrowsMap = customersrows.toRowsMap("sa_customersid");
-            for(Row row : agents_toagentslogRows){
-                if(row.getString("sourceobject").equals("sa_warrantycard")){
-                    if(warrantycardrowsMap.containsKey(row.getString("sourceid"))){
-                        if(!warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))){
+            for (Row row : agents_toagentslogRows) {
+                if (row.getString("sourceobject").equals("sa_warrantycard")) {
+                    if (warrantycardrowsMap.containsKey(row.getString("sourceid"))) {
+                        if (!warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))) {
                             throw new YosException("保修卡的授权经销商已变为"
                                     + warrantycardrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum")
                                     + "不可取消授权");
                         }
                     }
                 }
-                if(row.getString("sourceobject").equals("sa_customers")){
-                    if(customersrowsMap.containsKey(row.getString("sourceid"))){
-                        if(!customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))){
+                if (row.getString("sourceobject").equals("sa_customers")) {
+                    if (customersrowsMap.containsKey(row.getString("sourceid"))) {
+                        if (!customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum").equals(agentsRows.get(0).getString("toagentnum"))) {
                             throw new YosException("客户档案的授权经销商已变为"
                                     + customersrowsMap.get(row.getString("sourceid")).get(0).getString("toagentnum")
                                     + "不可取消授权");
@@ -188,34 +190,34 @@ public class agents extends Controller {
     @CACHEING_CLEAN(apiClass = {agents.class, warrantycard.class, Customer.class})
     public String changeagent() throws YosException {
         boolean ischange = content.getBoolean("ischange");
-        String toagentnum=content.getString("toagentnum");
-        long sa_agentsid_to=content.getLong("sa_agentsid_to");
-        long sa_agentsid=content.getLong("sa_agentsid");
+        String toagentnum = content.getString("toagentnum");
+        long sa_agentsid_to = content.getLong("sa_agentsid_to");
+        long sa_agentsid = content.getLong("sa_agentsid");
         ArrayList<String> sqlList = new ArrayList<>();
-        Rows agents_toagentslogRows =dbConnect.runSqlQuery("select * from sa_agents_toagentslog where isvoid=0 and sa_agentsid="+sa_agentsid);
+        Rows agents_toagentslogRows = dbConnect.runSqlQuery("select * from sa_agents_toagentslog where isvoid=0 and sa_agentsid=" + sa_agentsid);
         String agentnum = "";
 
-        Rows agentsRows =dbConnect.runSqlQuery("select agentnum,toagentnum from sa_agents where sa_agentsid="+sa_agentsid);
-        if(agentsRows.isEmpty()){
+        Rows agentsRows = dbConnect.runSqlQuery("select agentnum,toagentnum from sa_agents where sa_agentsid=" + sa_agentsid);
+        if (agentsRows.isEmpty()) {
             throw new YosException("该经销商不存在");
-        }else{
-            agentnum=agentsRows.get(0).getString("agentnum");
+        } else {
+            agentnum = agentsRows.get(0).getString("agentnum");
         }
 
-        changeagentvalidate(ischange,sa_agentsid,toagentnum,agents_toagentslogRows,agentnum,agentsRows);
+        changeagentvalidate(ischange, sa_agentsid, toagentnum, agents_toagentslogRows, agentnum, agentsRows);
 
 
         if (ischange) {
-            sqlList.add("update sa_agents set toagentnum ='"+toagentnum+"' where sa_agentsid="+sa_agentsid);
+            sqlList.add("update sa_agents set toagentnum ='" + toagentnum + "' where sa_agentsid=" + sa_agentsid);
 
-            Rows customersRows=dbConnect.runSqlQuery("select * from sa_customers where sa_agentsid=sa_agentsid_to and sa_agentsid="+sa_agentsid);
-            Rows warrantycardRows=dbConnect.runSqlQuery("select * from sa_warrantycard  where toagentnum='"+agentnum+"' and sa_agentsid="+sa_agentsid);
+            Rows customersRows = dbConnect.runSqlQuery("select * from sa_customers where sa_agentsid=sa_agentsid_to and sa_agentsid=" + sa_agentsid);
+            Rows warrantycardRows = dbConnect.runSqlQuery("select * from sa_warrantycard  where toagentnum='" + agentnum + "' and sa_agentsid=" + sa_agentsid);
 
-            long[] sa_agents_toagentslogsid = createTableID("sa_agents_toagentslog", customersRows.size()+warrantycardRows.size());
+            long[] sa_agents_toagentslogsid = createTableID("sa_agents_toagentslog", customersRows.size() + warrantycardRows.size());
             int i = 0;
-            for(Row row :customersRows){
-                sqlList.add("update sa_customers set sa_agentsid_to="+sa_agentsid_to+" where sa_customersid="+row.getLong("sa_customersid"));
-                InsertSQL insertSQL =SQLFactory.createInsertSQL(this,"sa_agents_toagentslog");
+            for (Row row : customersRows) {
+                sqlList.add("update sa_customers set sa_agentsid_to=" + sa_agentsid_to + " where sa_customersid=" + row.getLong("sa_customersid"));
+                InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_agents_toagentslog");
                 insertSQL.setUniqueid(sa_agents_toagentslogsid[i]);
                 insertSQL.setSiteid(siteid);
                 insertSQL.setValue("sa_agentsid", sa_agentsid);
@@ -229,9 +231,9 @@ public class agents extends Controller {
                 i++;
             }
 
-            for(Row row :warrantycardRows){
-                sqlList.add("update sa_warrantycard set toagentnum="+toagentnum+" where sa_warrantycardid="+row.getLong("sa_warrantycardid"));
-                InsertSQL insertSQL =SQLFactory.createInsertSQL(this,"sa_agents_toagentslog");
+            for (Row row : warrantycardRows) {
+                sqlList.add("update sa_warrantycard set toagentnum=" + toagentnum + " where sa_warrantycardid=" + row.getLong("sa_warrantycardid"));
+                InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sa_agents_toagentslog");
                 insertSQL.setUniqueid(sa_agents_toagentslogsid[i]);
                 insertSQL.setSiteid(siteid);
                 insertSQL.setValue("sa_agentsid", sa_agentsid);
@@ -245,16 +247,16 @@ public class agents extends Controller {
                 i++;
             }
         } else {// 取消授权
-            for(Row row : agents_toagentslogRows){
-                if(row.getString("sourceobject").equals("sa_warrantycard")){
-                    sqlList.add("update sa_warrantycard set toagentnum='"+agentnum+"' where sa_warrantycardid="+row.getLong("sourceid"));
+            for (Row row : agents_toagentslogRows) {
+                if (row.getString("sourceobject").equals("sa_warrantycard")) {
+                    sqlList.add("update sa_warrantycard set toagentnum='" + agentnum + "' where sa_warrantycardid=" + row.getLong("sourceid"));
                 }
-                if(row.getString("sourceobject").equals("sa_customers")){
-                    sqlList.add("update sa_customers set sa_agentsid_to="+sa_agentsid+" where sa_customersid="+row.getLong("sourceid"));
+                if (row.getString("sourceobject").equals("sa_customers")) {
+                    sqlList.add("update sa_customers set sa_agentsid_to=" + sa_agentsid + " where sa_customersid=" + row.getLong("sourceid"));
                 }
-                sqlList.add("update sa_agents_toagentslog set isvoid=1 where sa_agents_toagentslogid="+row.getLong("sa_agents_toagentslogid"));
+                sqlList.add("update sa_agents_toagentslog set isvoid=1 where sa_agents_toagentslogid=" + row.getLong("sa_agents_toagentslogid"));
             }
-            sqlList.add("update sa_agents set toagentnum ='' where sa_agentsid="+sa_agentsid);
+            sqlList.add("update sa_agents set toagentnum ='' where sa_agentsid=" + sa_agentsid);
         }
 
         dbConnect.runSqlUpdate(sqlList);
@@ -272,9 +274,9 @@ public class agents extends Controller {
         String presalesphonenumber = content.getStringValue("presalesphonenumber");
         String aftersalesphonenumber = content.getStringValue("aftersalesphonenumber");
 
-        boolean islimitaccessories=content.getBooleanValue("islimitaccessories");
-        boolean islimitorder=content.getBooleanValue("islimitorder");
-        String signingstate=content.getStringValue("signingstate");
+        boolean islimitaccessories = content.getBooleanValue("islimitaccessories");
+        boolean islimitorder = content.getBooleanValue("islimitorder");
+        String signingstate = content.getStringValue("signingstate");
 
         String type = content.getString("type");
         String signdate = content.getStringValue("signdate");
@@ -294,6 +296,7 @@ public class agents extends Controller {
         Rows rows = dbConnect.runSqlQuery("select sa_agentsid,sys_enterpriseid from sa_agents where agentnum='" + agentnum + "'");
         ArrayList<String> sqllist = new ArrayList<>();
         SQLFactory sqlFactory = new SQLFactory(this, "经销商新增");
+        boolean isAdd = false;
         if (sa_agentsid <= 0 || dbConnect.runSqlQuery("select sa_agentsid from sa_agents where sa_agentsid=" + sa_agentsid).isEmpty()) {
             if (dbConnect.runSqlQuery("select sa_agentsid from sa_agents where sys_enterpriseid=" + sys_enterpriseid).isNotEmpty()) {
                 return getErrReturnObject().setErrMsg("当前商户已经创建经销商档案，不可重复创建").toString();
@@ -309,6 +312,7 @@ public class agents extends Controller {
                 Executor.sendEml(this, "customers_agent_add", id, siteid, userids);
             }
             sqllist.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增", "新增经销商").getSQL());
+            isAdd = true;
         } else {
             if (rows.isNotEmpty()) {
                 if (rows.get(0).getLong("sa_agentsid") != sa_agentsid || rows.get(0).getLong("sys_enterpriseid") != sys_enterpriseid) {
@@ -332,18 +336,18 @@ public class agents extends Controller {
         sqlFactory.addParameter("submitautocheck", content.getLongValue("submitautocheck", 1L));
         sqlFactory.addParameter("priceadjustment", content.getBigDecimal("priceadjustment"));
         sqlFactory.addParameter("presalesphonenumber", presalesphonenumber);
-        sqlFactory.addParameter("aftersalesphonenumber",aftersalesphonenumber);
+        sqlFactory.addParameter("aftersalesphonenumber", aftersalesphonenumber);
 
-        sqlFactory.addParameter("islimitaccessories",islimitaccessories);
-        sqlFactory.addParameter("islimitorder",islimitorder);
-        sqlFactory.addParameter("signingstate",signingstate);
-        sqlFactory.addParameter("delivery",delivery);
-        sqlFactory.addParameter("salearea",salearea);
-        sqlFactory.addParameter("paymans",paymans);
-        sqlFactory.addParameter("regiontype",regiontype);
-        sqlFactory.addParameter("u8subject",u8subject);
-        sqlFactory.addParameter("recommendedservice",recommendedservice);
-        sqlFactory.addParameter("servicetype",servicetype);
+        sqlFactory.addParameter("islimitaccessories", islimitaccessories);
+        sqlFactory.addParameter("islimitorder", islimitorder);
+        sqlFactory.addParameter("signingstate", signingstate);
+        sqlFactory.addParameter("delivery", delivery);
+        sqlFactory.addParameter("salearea", salearea);
+        sqlFactory.addParameter("paymans", paymans);
+        sqlFactory.addParameter("regiontype", regiontype);
+        sqlFactory.addParameter("u8subject", u8subject);
+        sqlFactory.addParameter("recommendedservice", recommendedservice);
+        sqlFactory.addParameter("servicetype", servicetype);
 
 
         sqllist.add(sqlFactory.getSQL());
@@ -398,7 +402,7 @@ public class agents extends Controller {
             sqlFactory = new SQLFactory(this, "客户新增");
         }
 
-        Row enterpriseRow = Enterprise.getEnterprise(this, sys_enterpriseid);
+        Row enterpriseRow = getEnterprise(this, sys_enterpriseid);
 
         sqlFactory.addParameter("siteid", siteid);
         sqlFactory.addParameter("userid", userid);
@@ -451,6 +455,19 @@ public class agents extends Controller {
 
         //打经销商标签
         DataTag.createTag(this, "sa_customers", sa_customersid, "经销商");
+        if (isAdd) {
+
+            InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sys_enterprise_finance");
+            insertSQL.setSiteid(siteid);
+            insertSQL.setValue("sys_enterpriseid", sys_enterpriseid);
+            insertSQL.setValue("taxno", enterpriseRow.getString("taxno"));
+            insertSQL.setValue("isdefault", 1);
+            insertSQL.setValue("address", enterpriseRow.getString("address"));
+            insertSQL.setValue("enterprisename", enterpriseRow.getString("enterprisename"));
+            insertSQL.insert();
+            DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增", "自动新增默认开票信息").insert();
+        }
+
 
         return query_agentMain();
     }
@@ -458,15 +475,15 @@ public class agents extends Controller {
     @API(title = "查询区域对应的新经销商编码", apiversion = R.ID2025121815484803.v1.class)
     @CACHEING
     public String query_agentNum() throws YosException {
-        long sa_saleareaid =content.getLong("sa_saleareaid");
-        String agentnum="";
-        Rows arearows = dbConnect.runSqlQuery("select t2.agentnum from sys_enterprise_tradefield t1 inner join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid where t1.sa_saleareaid="+sa_saleareaid);
-        if(arearows.isNotEmpty()){
-            if(isNumeric(arearows.get(0).getString("agentnum"))){
+        long sa_saleareaid = content.getLong("sa_saleareaid");
+        String agentnum = "";
+        Rows arearows = dbConnect.runSqlQuery("select t2.agentnum from sys_enterprise_tradefield t1 inner join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid where t1.sa_saleareaid=" + sa_saleareaid);
+        if (arearows.isNotEmpty()) {
+            if (isNumeric(arearows.get(0).getString("agentnum"))) {
                 String maxagentnum = arearows.get(0).getString("agentnum");
                 String firstTwo = maxagentnum.substring(0, 2);
-                Rows maxagentnumrows = dbConnect.runSqlQuery("select max(t1.agentnum) maxagentnum from sa_agents t1 where t1.agentnum like '"+firstTwo+"%'");
-                agentnum=incrementWithLeadingZeros(maxagentnumrows.get(0).getString("maxagentnum"));
+                Rows maxagentnumrows = dbConnect.runSqlQuery("select max(t1.agentnum) maxagentnum from sa_agents t1 where t1.agentnum like '" + firstTwo + "%'");
+                agentnum = incrementWithLeadingZeros(maxagentnumrows.get(0).getString("maxagentnum"));
             }
         }
         return getSucReturnObject().setData(agentnum).toString();
@@ -518,7 +535,7 @@ public class agents extends Controller {
 //            Rows logRows = dbConnect.runSqlQuery(sqlFactory.getSQL());
             QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_userrequestlog", "*");
             querySQL.setWhere("userid!=0");
-            querySQL.setWhere("userid",useridlist);
+            querySQL.setWhere("userid", useridlist);
             Rows logRows = querySQL.query();
             if (logRows.isNotEmpty()) {
                 batchDeleteErr.addErr(sys_enterpriseid, "该商户下属账号存在访问记录，不可进行作废操作");
@@ -571,7 +588,7 @@ public class agents extends Controller {
     @CACHEING_CLEAN(apiClass = {agents.class, bankabcxccard.class})
     public String insertormodify_agentXnAbcCard() throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
-        long sa_bankabcxccardid=content.getLong("sa_bankabcxccardid");
+        long sa_bankabcxccardid = content.getLong("sa_bankabcxccardid");
         String xncardnoabc = content.getString("xncardnoabc");
         long sa_agentsid = content.getLong("sa_agentsid");
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_bankabcxccard");
@@ -583,7 +600,7 @@ public class agents extends Controller {
         updateSQL.setDateValue("createdate");
         updateSQL.setValue("changeby", username);
         updateSQL.setDateValue("changedate");
-        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增", "经销商虚拟账户【"+xncardnoabc+"】新增成功").getSQL());
+        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "新增", "经销商虚拟账户【" + xncardnoabc + "】新增成功").getSQL());
         sqlList.add(updateSQL.getSQL());
         dbConnect.runSqlUpdate(sqlList);
         return getSucReturnObject().toString();
@@ -594,7 +611,7 @@ public class agents extends Controller {
     @CACHEING_CLEAN(apiClass = {agents.class, bankabcxccard.class})
     public String delete_agentXnAbcCard() throws YosException {
         ArrayList<String> sqlList = new ArrayList<>();
-        long sa_bankabcxccardid=content.getLong("sa_bankabcxccardid");
+        long sa_bankabcxccardid = content.getLong("sa_bankabcxccardid");
         String xncardnoabc = content.getString("xncardnoabc");
         long sa_agentsid = content.getLong("sa_agentsid");
         UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sa_bankabcxccard");
@@ -606,14 +623,13 @@ public class agents extends Controller {
         updateSQL.setDateValue("createdate");
         updateSQL.setValue("changeby", username);
         updateSQL.setDateValue("changedate");
-        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "删除", "经销商虚拟账户【"+xncardnoabc+"】删除成功").getSQL());
+        sqlList.add(DataContrlLog.createLog(this, "sa_agents", sa_agentsid, "删除", "经销商虚拟账户【" + xncardnoabc + "】删除成功").getSQL());
         sqlList.add(updateSQL.getSQL());
         dbConnect.runSqlUpdate(sqlList);
         return getSucReturnObject().toString();
     }
 
 
-
     @API(title = "经销商联系人信息及地址信息新增修改", apiversion = R.ID20221009155703.v1.class)
     @CACHEING_CLEAN(apiversions = R.ID20221009155803.v1.class)
     public String insertormodify_agentEnterpriseContacts() throws YosException {
@@ -666,7 +682,7 @@ public class agents extends Controller {
             if (workaddress == 1) {
                 sqlFactory.addParameter("isdefault", isdefault);
                 if (isdefault) {
-                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid+" and type='"+type+"'");
+                    sqllist.add("update sys_enterprise_contacts set isdefault=0 where contactsid !=" + contactsid + " and sys_enterpriseid=" + sys_enterpriseid + " and type='" + type + "'");
                 }
             } else {
                 sqlFactory.addParameter("isdefault", 0);
@@ -739,11 +755,11 @@ public class agents extends Controller {
 //        sqlFactory.addParameter("siteid", siteid);
 //        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_contacts", "contactsid", "sys_enterpriseid",
-                "name","sex","depname","position","isleader","birthday","phonenumber","email","province","city","county","remarks","address","workaddress","isdefault","type","cardno");
+                "name", "sex", "depname", "position", "isleader", "birthday", "phonenumber", "email", "province", "city", "county", "remarks", "address", "workaddress", "isdefault", "type", "cardno");
         querySQL.setTableAlias("t1");
         querySQL.setSiteid(siteid);
         querySQL.setWhere("ifnull(t1.deleted,0)=0");
-        querySQL.setWhere("t1.sys_enterpriseid",sys_enterpriseid);
+        querySQL.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -770,7 +786,7 @@ public class agents extends Controller {
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_bankabcxccard", "*");
         querySQL.setTableAlias("t1");
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t1.sa_agentsid",sa_agentsid);
+        querySQL.setWhere("t1.sa_agentsid", sa_agentsid);
         querySQL.setWhere(where.toString());
         querySQL.setPage(pageSize, pageNumber);
         Rows rows = querySQL.query();
@@ -1187,7 +1203,7 @@ public class agents extends Controller {
         return sheet;
     }
 
-    public  boolean isNumeric(String str) {
+    public boolean isNumeric(String str) {
         if (str == null || str.isEmpty()) {
             return false;
         }