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

src/custom/restcontroller/R.java

@@ -6606,6 +6606,16 @@ public class R {
         public static class v1 {
         }
     }
+
+    public static class ID2024060715503002 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID2024061109144502 {
+        public static class v1 {
+        }
+    }
 }
 
 

src/custom/restcontroller/webmanage/saletool/data/DataDashboard.java

@@ -0,0 +1,31 @@
+package restcontroller.webmanage.saletool.data;
+
+import com.alibaba.fastjson.JSONObject;
+import common.Controller;
+import common.YosException;
+import common.annotation.API;
+import restcontroller.R;
+
+/**
+ * 数据大盘
+ */
+public class DataDashboard extends Controller {
+    /**
+     * 构造函数
+     *
+     * @param content
+     */
+    public DataDashboard(JSONObject content) throws YosException {
+        super(content);
+    }
+
+    @API(title = "账户使用概况", apiversion = R.ID2024061109144502.v1.class)
+    public String accountUseOverview() throws YosException {
+
+
+
+        return getSucReturnObject().toString();
+    }
+
+
+}

src/custom/restcontroller/webmanage/saletool/data/DataDashboardHelper.java

@@ -0,0 +1,17 @@
+package restcontroller.webmanage.saletool.data;
+
+import common.BaseClass;
+import common.Controller;
+import common.data.Rows;
+
+public class DataDashboardHelper extends BaseClass {
+
+
+//    public Long getUsedCount(Controller controller, int usertype) {
+//
+////        Rows rows =controller.dbConnect.runSqlQuery("");
+//
+//    }
+
+
+}

src/custom/restcontroller/webmanage/saletool/fad/FadGoods.java

@@ -421,4 +421,40 @@ public class FadGoods extends Controller {
 
         return getSucReturnObject().setData(rows).toString();
     }
+
+    @API(title = "经销商调整商品", apiversion = R.ID2024060715503002.v1.class)
+    public String adjustList() throws YosException {
+
+        StringBuffer where = new StringBuffer(" 1=1 ");
+        if (content.containsKey("where")) {
+            JSONObject whereObject = content.getJSONObject("where");
+            if (whereObject.containsKey("condition") && !"".equals(whereObject.getString("condition"))) {
+                where.append(" and (");
+                where.append("t2.enterprisename like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+
+
+            if (whereObject.containsKey("isonsale") && !"".equals(whereObject.getString("isonsale"))) {
+                where.append(" and (");
+                where.append("t1.isonsale ='").append(whereObject.getString("isonsale")).append("' ");
+                where.append(")");
+            }
+
+        }
+
+        Long sa_fadid = content.getLongValue("sa_fadid");
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_fadadjust").setTableAlias("t1");
+        querySQL.addJoinTable(JOINTYPE.inner, "sys_enterprise", "t2", "t2.sys_enterpriseid=t1.sys_enterpriseid and t2.siteid=t1.siteid",
+                "enterprisename");
+        querySQL.setPage(pageSize, pageNumber);
+        querySQL.setWhere(where.toString());
+        querySQL.setWhere("sa_fadid", sa_fadid);
+        querySQL.setSiteid(siteid);
+        Rows rows = querySQL.query();
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
 }