Merge branch 'feature-2023-01-目标配置' into 'developer'

Feature 2023 01 目标配置

See merge request !918

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/target/TargetController.java

@@ -190,16 +190,14 @@ public class TargetController {
 
     private JSONObject getCommon(QueryDataStatisticsCommonQO qo, boolean app) {
         JSONObject jsonObject = new JSONObject();
-        if (app) {
-            jsonObject.put("entId", qo.getEnterpriseId());
-            jsonObject.put("monthDate", qo.getTime());
+        jsonObject.put("entId", qo.getEnterpriseId());
+        jsonObject.put("enterpriseId", qo.getEnterpriseId());
+        if (qo.getTimeType() == 1) {
+            jsonObject.put("year", qo.getTime());
+            jsonObject.put("yearDate", qo.getTime());
         } else {
-            jsonObject.put("enterpriseId", qo.getEnterpriseId());
-            if (qo.getTimeType() == 1) {
-                jsonObject.put("year", qo.getTime());
-            } else {
-                jsonObject.put("month", qo.getTime());
-            }
+            jsonObject.put("month", qo.getTime());
+            jsonObject.put("monthDate", qo.getTime());
         }
         if (StringUtils.isBlank(qo.getStoreId())) {
             List<String> storeIdList = storeAuthUtils.queryClerkStoreIds(qo.getClerkId(), qo.getWxEnterpriseId());

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/target/TargetAnalysisUtils.java

@@ -13,7 +13,7 @@ public class TargetAnalysisUtils {
     /**
      * 实际会员销售额
      */
-    private static List<String> mbrPayAmt = Arrays.asList("mbrPayAmt", "mbrPayAmtLast", "mbrPayAmtTarget", "mbrPayAmtActualRate");
+    private static List<String> mbrPayAmt = Arrays.asList("mbrPayAmt", "mbrPayAmtLast", "mbrPayAmtRollTarget", "mbrPayAmtActualRate");
 
     /**
      * 实际新增会员数
@@ -22,7 +22,7 @@ public class TargetAnalysisUtils {
     /**
      * 会员消费总次数
      */
-    private static List<String> mbrCsmeTimes = Arrays.asList("mbrCsmeTimes", "mbrCsmeTimesLast", "mbrCsmeTimesTarget", "mbrCsmeTimesActualRate");
+    private static List<String> mbrCsmeTimes = Arrays.asList("mbrCsmeTimes", "mbrCsmeTimesLast", "mbrCsmeTimesRollTarget", "mbrCsmeTimesActualRate");
     /**
      * 客单价
      */