Merge branch '1608_bugfix' into 1619_bugfix

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

@@ -108,7 +108,14 @@ public class ShareIncomeServiceImpl implements ShareIncomeService {
 
         try (Stream<Contract> streamContract = contracts.parallelStream()) {
             streamContract.forEachOrdered(v -> {
-                this.shareIncome4Contract(v, start, end);
+
+                switch (platform){
+                    case "type_one":this.shareIncome4Contract(v, start, end);
+                        break;
+                    case "type_two":this.shareIncome4Contract(v, start, end);
+                        break;
+                }
+
                 v.setMyBodyName(bodiesNameMap.get(v.getMyBodyCode()));
                 if(v.getBarrioId()!=null)
                 v.setBarrioName(barrioCitiesNameMap.get(barrioCitiesNameMap.get(v.getBarrioId()).getParentId()).getName());

src/main/java/util/ContractBranchUtil.java

+package util;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author liyin
+ * @description
+ * @date
+ */
+public class ContractBranchUtil {
+    private static Map<String,String> map = new HashMap<>();
+
+    static {
+        map.put("dmp", "type_one");
+        map.put("fake", "type_one");
+        map.put("adi", "type_one");
+        map.put("ads", "type_one");
+        map.put("abtest", "type_one");
+        map.put("tkio", "type_two");
+    }
+    public static String getValue(String key){
+        return map.get(key);
+    }
+}