+1

src/main/java/common/model/Contract.java

@@ -93,6 +93,8 @@ public class Contract {
     private String barrioName;//行政区域名称
     private String belongGroup;//隶属集团
 
+    private Long trackFlow;//流量，tkio的
+
     @Id
     @GeneratedValue
     public Long getId() {
@@ -567,6 +569,14 @@ public class Contract {
         this.barrioName = barrioName;
     }
 
+    public Long getTrackFlow() {
+        return trackFlow;
+    }
+
+    public void setTrackFlow(Long trackFlow) {
+        this.trackFlow = trackFlow;
+    }
+
     @Override
     public String toString() {
         return "Contract{" +

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -425,7 +425,7 @@ public class ContractServiceImpl implements ContractService {
 
         List list = new ArrayList();
 
-        if ("tkio".equals(platform) || "io".equals(platform)) {
+        if ( "io".equals(platform)) {
             List<PackageType> packageTypeList = packageTypeRepository.findIsNewAll();
             for (PackageType p : packageTypeList) {
                 p.setType("main");

src/main/java/common/service/impl/ShareIncomeServiceImpl.java

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import util.ContractBranchUtil;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -109,11 +110,10 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
         try (Stream<Contract> streamContract = contracts.parallelStream()) {
             streamContract.forEachOrdered(v -> {
 
-                switch (platform){
-                    case "type_one":this.shareIncome4Contract(v, start, end);
-                        break;
-                    case "type_two":this.shareIncome4Contract(v, start, end);
-                        break;
+                switch (ContractBranchUtil.getValue(platform)){
+                    case "type_one":this.shareIncome4Contract(v, start, end);break;
+                    case "type_two":this.shareIncome4Contract(v, start, end);break;
+                    default:this.shareIncome4Contract(v, start, end);break;
                 }
 
                 v.setMyBodyName(bodiesNameMap.get(v.getMyBodyCode()));