Merge branch '20200603'

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

@@ -287,7 +287,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
-        String receiver = "sdaya";
 
         Integer userId = sporadicPayDto.getUserId();
         String orderNo = idGeneratorService.generatorId("payment") + "";
@@ -349,6 +348,22 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         classFee.put("accessories", BigDecimal.ZERO);
         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";
+        }
+
         Map payMap = payService.getPayMap(
                 amount,
                 orderNo,

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

@@ -134,6 +134,8 @@ public class PayServiceImpl implements PayService {
         if (companies.contains(receiver)) {
             company = receiver;
             receiver = null;
+        }else {
+            receiver = null;
         }
 
         //支付通道决策