+1

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

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

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

@@ -1388,12 +1388,12 @@ public class ContractServiceImpl implements ContractService {
 
                 c.setSaleName(saleMap.containsKey(c.getSale()) ? saleMap.get(c.getSale()) : "");
 
-                if ("tkio".equals(platform)) {
-                    c.setPriceLevelName(typeMap.containsKey(c.getPriceLevel()) ? typeMap.get(c.getPriceLevel()).getPackageName() : "");
-                } else {
+                //if ("tkio".equals(platform)) {
+                //    c.setPriceLevelName(typeMap.containsKey(c.getPriceLevel()) ? typeMap.get(c.getPriceLevel()).getPackageName() : "");
+                //} else {
 
                     c.setPriceLevelName(packageBaseMap.get(c.getPriceLevel()) == null ? "" : packageBaseMap.get(c.getPriceLevel()).getPackageName());
-                }
+                //}
 
 //                c.setCreateName(saleMap.containsKey(c.getCreateAccount()) ? saleMap.get(c.getCreateAccount()) : "");
 
@@ -1416,14 +1416,14 @@ public class ContractServiceImpl implements ContractService {
             }
         }
 
-        if (typeMap != null) {
+        /*if (typeMap != null) {
             List<PackageType> typeList = packageTypeRepository.findAll();
             if (ValidateUtil.isValid(typeList)) {
                 for (PackageType s : typeList) {
                     typeMap.put(s.getId(), s);
                 }
             }
-        }
+        }*/
 
         if (incremenMap != null) {
             List<ContractIncrement> incrementList = contractIncrementRepository.findAll();
@@ -1471,12 +1471,12 @@ public class ContractServiceImpl implements ContractService {
         this.getDicMapDatas(saleMap, typeMap, null, null, packageBaseMap, platform);
 
         contract.setSaleName(saleMap.containsKey(contract.getSale()) ? saleMap.get(contract.getSale()) : "");
-        if ("tkio".equals(platform)) {
-            contract.setPriceLevelName(typeMap.containsKey(contract.getPriceLevel()) ? typeMap.get(contract.getPriceLevel()).getPackageName() : "");
-        } else {
+        //if ("tkio".equals(platform)) {
+         //   contract.setPriceLevelName(typeMap.containsKey(contract.getPriceLevel()) ? typeMap.get(contract.getPriceLevel()).getPackageName() : "");
+        //} else {
 
             contract.setPriceLevelName(packageBaseMap.get(contract.getPriceLevel()) == null ? "" : packageBaseMap.get(contract.getPriceLevel()).getPackageName());
-        }
+        //}
 
         contract.setCreateName(saleMap.containsKey(contract.getCreateAccount()) ? saleMap.get(contract.getCreateAccount()) : "");
 
@@ -2021,7 +2021,7 @@ public class ContractServiceImpl implements ContractService {
 
                 cm.setSalseName(saleMap.get(cm.getSalse()));
 
-                if ("tkio".equals(platfrom)) {
+                /*if ("tkio".equals(platfrom)) {
 
                     PackageType packageType = packageTypeMap.get(cm.getPriceLevel());
 
@@ -2034,9 +2034,9 @@ public class ContractServiceImpl implements ContractService {
                         cm.setPackageName("");
                     }
 
-                } else {
+                } else {*/
                     cm.setPackageName(packageBaseMap.get(cm.getPriceLevel()) == null ? "" : packageBaseMap.get(cm.getPriceLevel()).getPackageName());
-                }
+                //}
 
             }
         }