Merge branch 'feature-2023-06-目标配置' into 'master'

Feature 2023 06 目标配置

See merge request !1344

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/target/DataTargetMemberPyramidQO.java

+package com.gic.haoban.manage.web.qo.target;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 会员金字塔分层&漏斗查询
+ * @author yangzhang
+ */
+@Data
+public class DataTargetMemberPyramidQO extends QueryDataStatisticsCommonQO  implements Serializable {
+
+//    private String storeGroupId;
+
+//    private String storeId;
+
+//    private String enterpriseId;
+
+    /**
+     * 1新增会员  0存量会员    不传为全部
+     */
+    private Integer memberType;
+
+    /**
+     * 1 今年未复购会员    2今年未消费会员 3今年仅消费一次会员
+     */
+    private Integer memberConsume;
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/target/QueryDataStatisticsCommonQO.java

@@ -92,4 +92,8 @@ public class QueryDataStatisticsCommonQO implements Serializable {
         this.enterpriseId = enterpriseId;
         return this;
     }
+
+    public boolean isYearQuery() {
+        return timeType == null || timeType == 1;
+    }
 }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/target/StoreTargetDisassemblyDetailVO.java

+package com.gic.haoban.manage.web.vo.target;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2023/6/9 9:21
+ */
+@Data
+public class StoreTargetDisassemblyDetailVO implements Serializable {
+    private String storeId;
+
+    private String storeName;
+
+    private String storeGroupId;
+
+    private String storeGroupName;
+
+    private String storeCode;
+
+    /**
+     * 会员消费次数实际值 排序7
+     */
+    private Integer mbrCsmeCnt;
+
+    /**
+     * 会员消费次数去年同期值 排序8
+     */
+    private Integer mbrCsmeCntSply;
+
+    /**
+     * 会员消费次数全年目标值 排序9
+     */
+    private Integer mbrCsmeCntTarget;
+
+    /**
+     * 会员消费次数当前应达目标值 排序10
+     */
+    private Integer mbrCsmeCntCurTarget;
+
+    /**
+     * 会员消费次数滚动达成率 排序11
+     */
+    private Double mbrCsmeCntRollAch;
+
+    /**
+     * 会员消费次数累计达成率 排序12
+     */
+    private Double mbrCsmeCntAccAch;
+
+    /**
+     * 存量会员消费总次数实际值 排序19
+     */
+    private Integer stockMbrCsmeCnt;
+
+    /**
+     * 存量会员消费总次数去年同期值 排序20
+     */
+    private Integer stockMbrCsmeCntSply;
+
+    /**
+     * 存量会员消费总次数全年目标值 排序21
+     */
+    private Integer stockMbrCsmeCntTarget;
+
+    /**
+     * 存量会员消费总次数当前应达目标值 排序22
+     */
+    private Integer stockMbrCsmeCntCurTarget;
+
+    /**
+     * 存量会员消费总次数滚动达成率 排序23
+     */
+    private Double stockMbrCsmeCntRollAch;
+
+    /**
+     * 存量会员消费总次数累计达成率 排序24
+     */
+    private Double stockMbrCsmeCntAccAch;
+
+    /**
+     * 新增会员消费总次数实际值 排序25
+     */
+    private Integer newMbrCsmeCnt;
+
+    /**
+     * 新增会员消费总次数去年同期值 排序26
+     */
+    private Integer newMbrCsmeCntSply;
+
+    /**
+     * 新增会员消费总次数全年目标值 排序27
+     */
+    private Integer newMbrCsmeCntTarget;
+
+    /**
+     * 新增会员消费总次数当前应达目标值 排序28
+     */
+    private Integer newMbrCsmeCntCurTarget;
+
+    /**
+     * 新增会员消费总次数滚动达成率 排序29
+     */
+    private Double newMbrCsmeCntRollAch;
+
+    /**
+     * 新增会员消费总次数累计达成率 排序30
+     */
+    private Double newMbrCsmeCntAccAch;
+
+}

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/vo/target/StoreTargetReachDetailVO.java

+package com.gic.haoban.manage.web.vo.target;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author guojx
+ * @Date 2023/6/9 9:21
+ */
+@Data
+public class StoreTargetReachDetailVO implements Serializable {
+    private String storeId;
+
+    private String storeName;
+
+    private String storeGroupId;
+
+    private String storeGroupName;
+
+    private String storeCode;
+
+    /**
+     * 总销售额(目标值)  排序1
+     */
+    private Double payAmtTarget;
+
+    /**
+     * 总销售额(实际值)  排序9
+     */
+    private Double payAmt;
+
+    /**
+     * 总销售额(去年同期)  排序17
+     */
+    private Double payAmtSply;
+
+    /**
+     * 总销售额(当前应达目标值)  排序25
+     */
+    private Double payAmtCurTarget;
+
+    /**
+     * 滚动达成率(总销售额)  排序33
+     */
+    private Double payAmtRollAch;
+
+    /**
+     * 累计达成率(总销售额)  排序34
+     */
+    private Double payAmtAccAch;
+
+    /**
+     * 会员销售额（消费门店）(目标值)  排序2
+     */
+    private Double mbrPayAmtTarget;
+
+    /**
+     * 会员销售额（消费门店）(实际值)  排序10
+     */
+    private Double mbrPayAmt;
+
+    /**
+     * 会员销售额（消费门店）(去年同期)   排序18
+     */
+    private Double mbrPayAmtSply;
+
+    /**
+     * 会员销售额（消费门店）(当前应达目标值)  排序26
+     */
+    private Double mbrPayAmtCurTarget;
+
+    /**
+     * 滚动达成率(会员销售额)  排序39
+     */
+    private Double mbrPayAmtRollAch;
+
+    /**
+     * 累计达成率(会员销售额)  排序40
+     */
+    private Double mbrPayAmtAccAch;
+
+    /**
+     * 会员订单率(目标值)  排序7
+     */
+    private Double mbrOrderRateTarget;
+
+    /**
+     * 会员订单率(实际值)  排序15
+     */
+    private Double mbrOrderRate;
+
+    /**
+     * 会员订单率(去年同期)  排序23
+     */
+    private Double mbrOrderRateSply;
+
+    /**
+     * 会员订单率(当前应达目标值)  排序31
+     */
+    private Double mbrOrderRateCurTarget;
+
+    /**
+     * 滚动达成率(会员订单率)  排序45
+     */
+    private Double mbrOrderRateRollAch;
+
+    /**
+     * 累计达成率(会员订单率)  排序46
+     */
+    private Double mbrOrderRateAccAch;
+
+}

haoban-manage3-wx/src/main/webapp/WEB-INF/dubbo-haoban-manage-wx.xml

@@ -143,5 +143,7 @@
 
     <dubbo:reference interface="com.gic.haoban.task.manage.api.service.IMarketClueTaskApiService" id="iMarketClueTaskApiService" timeout="10000" retries="0" check="false" />
     <dubbo:reference interface="com.gic.haoban.task.api.service.TelTaskApiService" id="telTaskApiService" timeout="10000" retries="0" check="false" />
+    <dubbo:reference id="dataTargetConfigNewVersionsApiService" interface="com.gic.enterprise.api.service.target.DataTargetConfigNewVersionsApiService" timeout="100000" retries="0" check="false" />
+    <dubbo:reference id="storeGroupService" interface="com.gic.enterprise.api.service.StoreGroupService" timeout="10000" retries="0" check="false" />
 
 </beans>