Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/billing/FeeTypeEnum.java

@@ -6,9 +6,10 @@ public enum FeeTypeEnum {
     SMS_PACKAGE(4, "短信套餐包明细(余额支付)"),
     SMS(3, "国内短信消费明细"),
     INTERNATIONAL_SMS(8, "海外短信消费明细"),
-    VOICE_CODE(2, "语音验证码消费明细"),
-    DOUBLE_CALLING(6, "双向呼叫消费明细"),
-    RECORDING_STORAGE(5, "录音存储消费明细");
+//    VOICE_CODE(2, "语音验证码消费明细"),
+//    DOUBLE_CALLING(6, "双向呼叫消费明细"),
+//    RECORDING_STORAGE(5, "录音存储消费明细"),
+    ;
 
     private int code;
     private String message;

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/FeeChartUtils.java

 package com.gic.enterprise.utils.chart;
 
+import com.gic.enterprise.constant.billing.FeeTypeEnum;
+import com.gic.enterprise.dto.HomeStatisticsDTO;
+import com.gic.enterprise.qo.HomeStatisticsQO;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-import com.gic.enterprise.constant.billing.FeeTypeEnum;
-import com.gic.enterprise.dto.HomeStatisticsDTO;
-import com.gic.enterprise.qo.HomeStatisticsQO;
 /**
  * 计费中心首页图表
  * @ClassName: FeeChartUtils

@@ -20,11 +20,11 @@ public class FeeChartUtils {
 
     static {
         getPageMap.put(FeeTypeEnum.ACCOUNT_BALANCE.getCode(), new BillingAccountBalanceRecord());
-        getPageMap.put(FeeTypeEnum.DOUBLE_CALLING.getCode(), new BillingDoubleCallingRecord());
-        getPageMap.put(FeeTypeEnum.RECORDING_STORAGE.getCode(), new BillingRecordingStorageRecord());
+//        getPageMap.put(FeeTypeEnum.DOUBLE_CALLING.getCode(), new BillingDoubleCallingRecord());
+//        getPageMap.put(FeeTypeEnum.RECORDING_STORAGE.getCode(), new BillingRecordingStorageRecord());
         getPageMap.put(FeeTypeEnum.SMS.getCode(), new BillingSmsRecord());
         getPageMap.put(FeeTypeEnum.SMS_PACKAGE.getCode(), new BillingSmsPackageRecord());
-        getPageMap.put(FeeTypeEnum.VOICE_CODE.getCode(), new BillingVoiceCodeRecord());
+//        getPageMap.put(FeeTypeEnum.VOICE_CODE.getCode(), new BillingVoiceCodeRecord());
     }
 
     /**