Merge remote-tracking branch 'origin/master'

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

@@ -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,16 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         classFee.put("accessories", BigDecimal.ZERO);
         classFee.put("other", amount);
 
+        String receiver = "daya";
+        //深圳的零星缴费是在深圳
+        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(
                 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;
         }
 
         //支付通道决策