收货地址管理，课程分类，单品分类，装备资源库分类支持remarks

src/custom/restcontroller/R.java

@@ -6274,6 +6274,26 @@ public class R {
         }
     }
 
+    public static class ID20240506103402 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID20240506103502 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID20240506103602 {
+        public static class v1 {
+        }
+    }
+
+    public static class ID20240506103702 {
+        public static class v1 {
+        }
+    }
+
 
 }
 

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-新增.sql

@@ -11,7 +11,7 @@ INSERT INTO sat_courseware_class (sat_courseware_classid,
                                   issystem,
                                   isenable,
                                   level,
-                                  sequence)
+                                  sequence,remarks)
 VALUES ($sat_courseware_classid$,
         $siteid$,
         $createuserid$,
@@ -25,7 +25,7 @@ VALUES ($sat_courseware_classid$,
         0,
         $isenable$,
         $level$,
-        $sequence$)
+        $sequence$,$remarks$)
 
 
 

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-更新.sql

@@ -6,5 +6,6 @@ SET classname=$classname$,
     level = $level$,
     parentid = $parentid$,
     isenable = $isenable$,
-    sequence=$sequence$
+    sequence=$sequence$,
+    remarks=$remarks$
 WHERE sat_courseware_classid = $sat_courseware_classid$

src/custom/restcontroller/webmanage/saletool/courseware/SQL/课程分类-查询.sql

@@ -1,4 +1,4 @@
-SELECT sat_courseware_classid, classname, parentid, createdate, isenable,issystem,sequence
+SELECT sat_courseware_classid, classname, parentid, createdate, isenable,issystem,sequence,remarks
 FROM sat_courseware_class
 WHERE parentid = $parentid$
   and siteid = $siteid$ and $where$

src/custom/restcontroller/webmanage/saletool/courseware/coursewareclass.java

@@ -62,6 +62,7 @@ public class coursewareclass extends Controller {
         sqlFactory.addParameter("level", level);
         sqlFactory.addParameter("isenable", isenable);
         sqlFactory.addParameter("sequence", content.getLongValue("sequence"));
+        sqlFactory.addParameter("remarks", content.getStringValue("remarks"));
 
 
         dbConnect.runSqlUpdate(sqlFactory);

src/custom/restcontroller/webmanage/saletool/custorder/DeliveryAddress.java

@@ -0,0 +1,143 @@
+package restcontroller.webmanage.saletool.custorder;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import common.Controller;
+import common.YosException;
+import common.annotation.API;
+import common.data.*;
+import restcontroller.R;
+
+/**
+ * 收货地址
+ */
+public class DeliveryAddress extends Controller {
+    /**
+     * 构造函数
+     *
+     * @param content
+     */
+    public DeliveryAddress(JSONObject content) throws YosException {
+        super(content);
+    }
+
+    @API(title = "收货地址新增或编辑", apiversion = R.ID20240506103402.v1.class)
+    public String insertOrUpdate() throws YosException {
+
+        Long contactsid = content.getLongValue("contactsid");
+
+        if (contactsid <= 0) {
+            contactsid = createTableID("sys_enterprise_contacts");
+            InsertSQL insertSQL = SQLFactory.createInsertSQL(this, "sys_enterprise_contacts");
+            insertSQL.setSiteid(siteid);
+            insertSQL.setUniqueid(contactsid);
+            insertSQL.setValue("name", content.getStringValue("name"));
+            insertSQL.setValue("phonenumber", content.getStringValue("phonenumber"));
+            insertSQL.setValue("isdefault", content.getBooleanValue("isdefault"));
+            insertSQL.setValue("province", content.getStringValue("province"));
+            insertSQL.setValue("city", content.getStringValue("city"));
+            insertSQL.setValue("county", content.getStringValue("county"));
+            insertSQL.setValue("address", content.getStringValue("address"));
+            insertSQL.setValue("workaddress", 0);
+            insertSQL.insert();
+
+        } else {
+            UpdateSQL insertSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+            insertSQL.setSiteid(siteid);
+            insertSQL.setUniqueid(contactsid);
+            insertSQL.setValue("name", content.getStringValue("name"));
+            insertSQL.setValue("phonenumber", content.getStringValue("phonenumber"));
+            insertSQL.setValue("isdefault", content.getBooleanValue("isdefault"));
+            insertSQL.setValue("province", content.getStringValue("province"));
+            insertSQL.setValue("city", content.getStringValue("city"));
+            insertSQL.setValue("county", content.getStringValue("county"));
+            insertSQL.setValue("address", content.getStringValue("address"));
+            insertSQL.setValue("workaddress", 0);
+            insertSQL.update();
+        }
+        if (content.getBooleanValue("isdefault")) {
+            UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+            updateSQL.setSiteid(siteid);
+            updateSQL.setWhere("createuserid", userid);
+            updateSQL.setValue("isdefault", 0);
+            updateSQL.update();
+
+            updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+            updateSQL.setSiteid(siteid);
+            updateSQL.setWhere("contactsid", contactsid);
+            updateSQL.setValue("isdefault", 1);
+            updateSQL.update();
+        }
+
+        Rows rows = dbConnect.runSqlQuery("SELECT * from sys_enterprise_contacts where contactsid='" + contactsid + "' and siteid='" + siteid + "'");
+
+
+        return getSucReturnObject().setData(rows.get(0)).toString();
+    }
+
+    @API(title = "删除", apiversion = R.ID20240506103502.v1.class)
+    public String delete() throws YosException {
+
+        JSONArray contactsids = content.getJSONArray("contactsids");
+
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+        updateSQL.setSiteid(siteid);
+        updateSQL.setWhere("contactsid", contactsids);
+        updateSQL.setValue("deleted", 1);
+        updateSQL.update();
+
+
+        return getSucReturnObject().toString();
+    }
+
+    @API(title = "收货地址默认", apiversion = R.ID20240506103602.v1.class)
+    public String isdefault() throws YosException {
+
+        Long contactsid = content.getLongValue("contactsid");
+        UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+        updateSQL.setSiteid(siteid);
+        updateSQL.setWhere("createuserid", userid);
+        updateSQL.setValue("isdefault", 0);
+        updateSQL.update();
+
+        updateSQL = SQLFactory.createUpdateSQL(this, "sys_enterprise_contacts");
+        updateSQL.setSiteid(siteid);
+        updateSQL.setWhere("contactsid", contactsid);
+        updateSQL.setValue("isdefault", 1);
+        updateSQL.update();
+
+        return getSucReturnObject().toString();
+    }
+
+    @API(title = "收货地址列表", apiversion = R.ID20240506103702.v1.class)
+    public String list() 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("t1.name like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.phonenumber like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.province like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.city like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.county like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append("or t1.address like'%").append(whereObject.getString("condition")).append("%' ");
+                where.append(")");
+            }
+        }
+
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sys_enterprise_contacts").setTableAlias("t1");
+        querySQL.setSiteid(siteid);
+        querySQL.setWhere("deleted", 0);
+        querySQL.setWhere(where.toString());
+        querySQL.setWhere("createuserid", userid);
+        querySQL.setPage(pageSize, pageNumber).setOrderBy(pageSorting);
+        Rows rows = querySQL.query();
+
+
+        return getSucReturnObject().setData(rows).toString();
+    }
+
+
+}

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

@@ -40,6 +40,7 @@ public class FadClass extends Controller {
             insertSQL.setValue("classname", content.getStringValue("classname"));
             insertSQL.setValue("isenable", content.getBooleanValue("isenable"));
             insertSQL.setValue("sequence", content.getLongValue("sequence"));
+            insertSQL.setValue("remarks", content.getLongValue("remarks"));
             insertSQL.setValue("level", level);
             insertSQL.setValue("parentid", parentid);
             insertSQL.insert();
@@ -51,6 +52,7 @@ public class FadClass extends Controller {
             updateSQL.setValue("classname", content.getStringValue("classname"));
             updateSQL.setValue("isenable", content.getBooleanValue("isenable"));
             updateSQL.setValue("sequence", content.getLongValue("sequence"));
+            updateSQL.setValue("remarks", content.getLongValue("remarks"));
             updateSQL.setValue("level", level);
             updateSQL.update();
         }

src/custom/restcontroller/webmanage/saletool/sharematerial/SQL/素材分类-查询.sql

@@ -1,4 +1,4 @@
-SELECT sat_sharematerial_classid, classname, parentid,createdate, isenable,sequence,level
+SELECT sat_sharematerial_classid, classname, parentid,createdate, isenable,sequence,level,remarks
 FROM sat_sharematerial_class
 WHERE parentid = $parentid$ and siteid = $siteid$ and $where$
 ORDER BY sequence ,createdate DESC

src/custom/restcontroller/webmanage/saletool/sharematerial/sharematerialClass.java

@@ -43,6 +43,7 @@ public class sharematerialClass extends Controller {
             insertSQL.setValue("classname", content.getStringValue("classname"));
             insertSQL.setValue("isenable", content.getBooleanValue("isenable"));
             insertSQL.setValue("sequence", content.getLongValue("sequence"));
+            insertSQL.setValue("remarks", content.getLongValue("remarks"));
             insertSQL.setValue("level", level);
             insertSQL.setValue("parentid", parentid);
             insertSQL.insert();
@@ -54,6 +55,7 @@ public class sharematerialClass extends Controller {
             updateSQL.setValue("classname", content.getStringValue("classname"));
             updateSQL.setValue("isenable", content.getBooleanValue("isenable"));
             updateSQL.setValue("sequence", content.getLongValue("sequence"));
+            updateSQL.setValue("remarks", content.getLongValue("remarks"));
             updateSQL.setValue("level", level);
             updateSQL.update();
         }