客户订单详情查询修复、线索转移新增线索状态更新、经销商团队新增在手线索数量字段

src/custom/restcontroller/crm/agent/custorder/Custorder.java

@@ -47,7 +47,7 @@ public class Custorder extends Controller {
             @Param(paramname = "sa_custorderid", fieldtype = FieldType.BigInt)})
     public String sa_custorder_querymain() throws YosException {
         long sa_custorderid = content.getLongValue("sa_custorderid");
-        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder", "sa_custorderid").setTableAlias("t1");
+        QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_custorder", "*").setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sa_customers", "t2", "t1.sa_customersid=t2.sa_customersid", "address", "community");
         querySQL.addJoinTable(JOINTYPE.left, "sa_store", "t3", "t1.sa_storeid=t3.sa_storeid", "storeno", "storename");
         querySQL.setWhere("sys_enterpriseid", sys_enterpriseid);

src/custom/restcontroller/crm/agent/orderclue/orderclue.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson2.JSONObject;
 import common.Controller;
 import common.YosException;
 import common.annotation.API;
+import common.annotation.Param;
 import common.data.*;
 import restcontroller.R;
 
@@ -307,7 +308,6 @@ public class orderclue extends Controller {
         return getSucReturnObject().setData(detailRow).toString();
     }
 
-
     @API(title = "美大CRM_经销商_线索跟进列表", apiversion = R.ID20221101094602.v1.class)
     public String getFollowList() throws YosException {
         Long sat_orderclueid = content.getLong("sat_orderclueid");
@@ -357,10 +357,15 @@ public class orderclue extends Controller {
         return getSucReturnObject().toString();
     }
 
-    @API(title = "美大CRM_经销商_线索转移")
+    @API(title = "美大CRM_经销商_线索转移", params = {
+            @Param(paramname = "sys_enterprise_hrid", fieldtype = FieldType.BigInt, remarks = "转移人", isrequired = true),
+            @Param(paramname = "sat_orderclueid", fieldtype = FieldType.JSON, remarks = "线索id数组,[1,2,3]", isrequired = true),
+            @Param(paramname = "ordercluestatus", fieldtype = FieldType.Varchar, remarks = "线索状态,不传则不更新状态")
+    })
     public String changeClue() throws YosException {
         Long sys_enterprise_hrid = content.getLong("sys_enterprise_hrid");
         JSONArray sat_orderclueid_array = content.getJSONArray("sat_orderclueid");
+        String ordercluestatus = content.getStringValue("ordercluestatus");
         SQLDump sqlDump = new SQLDump();
         for (Object obj : sat_orderclueid_array) {
             String sat_orderclueid = obj.toString();
@@ -376,6 +381,13 @@ public class orderclue extends Controller {
                 updateSQL.setValue("sys_enterpriseid", sys_enterpriseid);
                 sqlDump.add(updateSQL);
             }
+            if (!ordercluestatus.isBlank()) {
+                UpdateSQL updateSQL = SQLFactory.createUpdateSQL(this, "sat_orderclue");
+                updateSQL.setValue("status", ordercluestatus);
+                updateSQL.setWhere("sat_orderclueid", sat_orderclueid);
+                updateSQL.setSiteid(siteid);
+                sqlDump.add(updateSQL);
+            }
         }
         sqlDump.commit(this);
         //发送消息

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -54,7 +54,7 @@ public class itemgroup extends Controller {
             sys_enterpriseid = content.getLongValue("sys_enterpriseid");
         }
 
-        double pricegrade = 1;
+        int pricegrade = 1;
         try {
             pricegrade = Parameter.getInteger(siteid, "defaultlevelprice");//价格等级
         } catch (Exception ignored) {

src/custom/restcontroller/sale/team/team.java

@@ -69,8 +69,25 @@ public class team extends Controller {
         factory.addParameter_in("userid", hrrows.toArray("userid"));
         RowsMap factoryMap = dbConnect.runSqlQuery(factory.getSQL()).toRowsMap("userid");
 
+
+        QuerySQL orderclue_authQuery = SQLFactory.createQuerySQL(this, "sat_orderclue_auth", "hrid").setTableAlias("t1");
+        orderclue_authQuery.addJoinTable(JOINTYPE.inner, "sat_orderclue", "t2", "t1.sat_orderclueid=t2.sat_orderclueid and t2.status in('待跟进','跟进中')");
+        orderclue_authQuery.addQueryFields("count", "count(0)");
+        orderclue_authQuery.setSiteid(siteid);
+        orderclue_authQuery.setWhere("t1.sys_enterpriseid", sys_enterpriseid);
+        orderclue_authQuery.setWhere("t1.isused", true);
+        orderclue_authQuery.setWhere("t1.hrid", hrrows.toArrayList("sys_enterprise_hrid"));
+        orderclue_authQuery.addGroupBy("hrid");
+        RowsMap orderclue_authRowsMap = orderclue_authQuery.query().toRowsMap("hrid");
+
         RowsMap attinfosmap = getAttachmentUrl("sys_users", hrrows.toArrayList("userid", new ArrayList<>()));
         for (Row row : hrrows) {
+            String sys_enterprise_hrid = row.getString("sys_enterprise_hrid");
+            if (orderclue_authRowsMap.containsKey(sys_enterprise_hrid)) {
+                row.put("ordercluecount", orderclue_authRowsMap.get(sys_enterprise_hrid).get(0).getLong("count"));//在手线索数量
+            } else {
+                row.put("ordercluecount", 0);
+            }
             String userid = row.getString("userid");
             if (roleRolesMap.get(userid).isNotEmpty()) {
                 row.put("roleid", roleRolesMap.get(userid).get(0).getLong("roleid"));