Merge branch 'feature-2024-08-喜好洞察优化' into 'developer'

看数据-商品洞察-时间趋势默认排序调整

See merge request !2145

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/GoodsAnalysisController.java

@@ -92,6 +92,8 @@ public class GoodsAnalysisController {
             allList.add("no_clerk_id");
         }
 
+        //转化金额
+        qo.setOrderByFields(qo.getOrderByFields() == null ? 12 : qo.getOrderByFields());
         JSONObject jsonObject = (JSONObject) JSONObject.toJSON(qo);
         jsonObject.put("clerkId", normalList.stream().collect(Collectors.joining(",")));
         //8:合计 非8：列表

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/data/goodsanalysis/GoodsAnalysisClerkDetailQO.java

@@ -43,11 +43,6 @@ public class GoodsAnalysisClerkDetailQO implements Serializable {
         return pageSize == null ? 10 : pageSize;
     }
 
-    public Integer getOrderByFields() {
-        //12转化金额
-        return orderByFields == null ? 12 : orderByFields;
-    }
-
     public Integer getOrderByType() {
         return orderByType == null ? 2 : orderByType;
     }