Merge branch '20200603'

mec-biz/src/main/java/com/ym/mec/biz/service/SysConfigService.java

@@ -189,6 +189,9 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
 
     String PRACTICE_FREE_APPLY_EXPIRE_DATE = "practice_free_apply_expire_date";
 
+    //零星支付收到深圳大雅的分部
+    public static final String SZ_DA_YA_ORGAN_IDS = "sz_da_ya_organ_ids";
+
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig
      * @params paramName

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -349,19 +349,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         classFee.put("other", amount);
 
         String receiver = "daya";
-        //广州、深圳、中山、珠海、惠州、江门、福州、厦门 这几个分部的零星缴费是在深圳
-        Set<Integer> sDaYaOrganIdSet = new HashSet<>(8);
-        sDaYaOrganIdSet.add(3);
-        sDaYaOrganIdSet.add(16);
-        sDaYaOrganIdSet.add(7);
-        sDaYaOrganIdSet.add(37);
-        sDaYaOrganIdSet.add(11);
-        sDaYaOrganIdSet.add(12);
-        sDaYaOrganIdSet.add(25);
-        sDaYaOrganIdSet.add(40);
-
-        if(sDaYaOrganIdSet.contains(chargeInfo.getOrganId())){
-            receiver = "sdaya";
+        //深圳的零星缴费是在深圳
+        String sDaYaOrganIds = sysConfigDao.findConfigValue(SysConfigService.SZ_DA_YA_ORGAN_IDS);
+        if(StringUtils.isNotBlank(sDaYaOrganIds)){
+            List<String> sDaYaOrganIdList = Arrays.asList(sDaYaOrganIds.split(","));
+            if(sDaYaOrganIdList.contains(chargeInfo.getOrganId().toString())){
+                receiver = "sdaya";
+            }
         }
 
         Map payMap = payService.getPayMap(