Merge remote-tracking branch 'origin/saas' into saas

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -669,12 +669,14 @@ public class UserChannelContext {
 		LOGGER.debug("------------ correctedStartTime:{}  correctedEndTime:{}------------", correctedStartTime, correctedEndTime);
 		
 		//根据完整度取部分有效信号
-		int elementSize = chunkAnalysisList.size() * hardLevel.getIntegrityRange() / 100;
+		int elementSize = chunkAnalysisList.size() * (100 - hardLevel.getTempoEffectiveRange(musicXmlNote.getDenominator(), musicXmlNote.getDuration())) / 100;
 		chunkAnalysisList = chunkAnalysisList.subList(0, elementSize);
 		if(chunkAnalysisList == null || chunkAnalysisList.size() == 0){
 			return -1;
 		}
 		
+		reduceNoise(chunkAnalysisList, EvaluationCriteriaEnum.FREQUENCY);
+		
 		ChunkAnalysis firstChunkAnalysis = chunkAnalysisList.get(0);
 		
 		LOGGER.debug("-------startTime:{}  endTime:{}------", firstChunkAnalysis.getStartTime(), chunkAnalysisList.get(chunkAnalysisList.size() - 1)
@@ -714,36 +716,23 @@ public class UserChannelContext {
 		
 		chunkAnalysisList = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getStartTime()) >= Double.doubleToLongBits(correctedStartTime) && Double.doubleToLongBits(t.getEndTime()) <= Double.doubleToLongBits(correctedEndTime)).collect(Collectors.toList());
 		
-		//根据完整度取部分有效信号，取中间的
-		int elementSize = chunkAnalysisList.size() * hardLevel.getIntegrityRange() / 100;
-		
-		int startIndex = (chunkAnalysisList.size() - elementSize) / 2 - 1;
-		startIndex = startIndex < 1 ? 0 : startIndex;
-		List<ChunkAnalysis> chunkList = chunkAnalysisList.subList(startIndex, elementSize + startIndex);
+		//根据完整度取部分有效信号
+		int elementSize = chunkAnalysisList.size() * (100 - hardLevel.getTempoEffectiveRange(musicXmlNote.getDenominator(), musicXmlNote.getDuration())) / 100;
+		List<ChunkAnalysis> chunkList = chunkAnalysisList.subList(0, elementSize);
 		
 		if(chunkList == null || chunkList.size() == 0){
 			return false;
 		}
 		
+		reduceNoise(chunkList, EvaluationCriteriaEnum.FREQUENCY);
+		
 		if (musicXmlNote.getFrequency() == -1) {// 休止符
 			return chunkList.stream().filter(t -> t.getFrequency() > MIN_FREQUECY).count() <= 1;
 		}
 
 		ChunkAnalysis firstChunkAnalysis = chunkAnalysisList.get(0);
-		//取出前面忽略的块
-		List<ChunkAnalysis> ignoreHeaderList = chunkAnalysisList.subList(0, startIndex);
-		if(ignoreHeaderList != null && ignoreHeaderList.size() > 0){
-			for(ChunkAnalysis ca : ignoreHeaderList){
-				if(ca.getFrequency() < MIN_FREQUECY){
-					firstChunkAnalysis.setFrequency(-1);
-					break;
-				}
-			}
-		}
-		
-		double firstChunkStartTime = firstChunkAnalysis.getStartTime();
 		
-		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkStartTime)).reduce((first, second) -> second);
+		Optional<ChunkAnalysis> chunkAnalysisOptional = totalChunkAnalysisList.stream().filter(t -> Double.doubleToLongBits(t.getEndTime()) < Double.doubleToLongBits(firstChunkAnalysis.getStartTime())).reduce((first, second) -> second);
 
 		ChunkAnalysis lastChunkAnalysis = null;
 		if (chunkAnalysisOptional.isPresent()) {
@@ -1054,6 +1043,13 @@ public class UserChannelContext {
 						chunkAnalysis.setAmplitude(0);
 						//chunkAnalysisList.set(i, chunkAnalysis);
 					}
+				}else if(EvaluationCriteriaEnum.FREQUENCY == criteria) {
+					if (chunkAnalysisList.get(i - 1).getFrequency() == -1 && chunkAnalysisList.get(i + 1).getFrequency() == -1
+							&& chunkAnalysis.getFrequency() > 0) {
+						
+						chunkAnalysis.setFrequency(-1);
+						//chunkAnalysisList.set(i, chunkAnalysis);
+					}
 				}
 			}
 		}
@@ -1061,8 +1057,4 @@ public class UserChannelContext {
 	}
 	
 	
-	public static void main(String[] args) {
-		
-	}
-	
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/YeepayMember.java

@@ -16,6 +16,8 @@ public class YeepayMember extends HfMember {
 	private String licenceUrl; //商户证件照片
 	
 	private String openAccountLicenceUrl; //开户许可证照片
+	
+    private String merchantType;//商家类型（企业-ENTERPRISE，个体户-INDIVIDUAL）
 
 	public String getLegalLicenceFrontUrl() {
 		return legalLicenceFrontUrl;
@@ -48,4 +50,12 @@ public class YeepayMember extends HfMember {
 	public void setOpenAccountLicenceUrl(String openAccountLicenceUrl) {
 		this.openAccountLicenceUrl = openAccountLicenceUrl;
 	}
+
+	public String getMerchantType() {
+		return merchantType;
+	}
+
+	public void setMerchantType(String merchantType) {
+		this.merchantType = merchantType;
+	}
 }

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

@@ -268,6 +268,7 @@ public class HfMemberServiceImpl extends BaseServiceImpl<Integer, HfMember> impl
 		merchantInfo.setLegalName(member.getLegalPerson());
 		merchantInfo.setLicenceNo(member.getSocialCreditCode());
 		merchantInfo.setLicenceUrl(member.getLicenceUrl());
+		merchantInfo.setMerchantType(member.getMerchantType());
 		merchantInfo.setMerchantName(member.getName());
 		merchantInfo.setMobile(member.getLegalMp());
 		merchantInfo.setOpenAccountLicenceUrl(member.getOpenAccountLicenceUrl());

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

@@ -210,12 +210,12 @@ public class PayServiceImpl implements PayService {
 		List<Integer> ignoreOrganList = Arrays.asList(4, 55, 59);
 		
 		//查询商品收款账户配置
-        String goodsSellReceiptMerNo = sysConfigDao.findConfigValue("goodsSellReceiptMerNo");
+        String goodsSellReceiptOrganId = sysConfigDao.findConfigValue("goodsSellReceiptOrganId");
         
-        if(!ignoreOrganList.contains(organId) && StringUtils.isNotBlank(goodsSellReceiptMerNo)){
+        if(!ignoreOrganList.contains(organId) && StringUtils.isNotBlank(goodsSellReceiptOrganId)){
 			
         	//根据商户号查询对应分部
-        	SysPaymentConfig sysPaymentConfig = sysPaymentConfigService.findPaymentConfigByMerNo(StringUtils.trim(goodsSellReceiptMerNo));
+        	SysPaymentConfig sysPaymentConfig = sysPaymentConfigService.findPaymentConfigByOrganId(paymentChannel, Integer.parseInt(goodsSellReceiptOrganId));
         	
         	if(sysPaymentConfig != null){
 
@@ -377,7 +377,7 @@ public class PayServiceImpl implements PayService {
     	            studentPaymentRouteOrder.setFeeFlag("Y");
     	            studentPaymentRouteOrder.setRouteAmount(subCashAmount);
     	            studentPaymentRouteOrder.setRouteBalanceAmount(subBalance);
-    	            studentPaymentRouteOrder.setMerNo(goodsSellReceiptMerNo);
+    	            studentPaymentRouteOrder.setMerNo(sysPaymentConfig.getHfMerNo());
     	            studentPaymentRouteOrder.setSaleAmount(BigDecimal.ZERO);
     	            studentPaymentRouteOrder.setServiceAmount(subCashAmount);
     	            studentPaymentRouteOrder.setTenantId(tenantId);
@@ -392,7 +392,7 @@ public class PayServiceImpl implements PayService {
     	            routeScaleDtoForGoodsSell.setPayType(PaymentChannelEnum.ADAPAY);
     	            routeScaleDtoForGoodsSell.setFeeType(FeeTypeEnum.SERVICE);
     	            routeScaleDtoForGoodsSell.setScale(100);
-    	            routeScaleDtoForGoodsSell.setMerNo(goodsSellReceiptMerNo);
+    	            routeScaleDtoForGoodsSell.setMerNo(sysPaymentConfig.getHfMerNo());
     	            routeScaleDtoForGoodsSell.setFeeFlag("Y");
         		}
         	}

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/YeepayMerchantService.java

@@ -47,7 +47,7 @@ public class YeepayMerchantService {
 		Map<String, String> merchantSubjectInfoMap = new HashMap<String, String>();
 		merchantSubjectInfoMap.put("licenceUrl", merchantInfo.getLicenceUrl());
 		merchantSubjectInfoMap.put("signName", merchantInfo.getMerchantName());
-		merchantSubjectInfoMap.put("signType", "ENTERPRISE");
+		merchantSubjectInfoMap.put("signType", merchantInfo.getMerchantType());
 		merchantSubjectInfoMap.put("licenceNo", merchantInfo.getLicenceNo());
 		merchantSubjectInfoMap.put("shortName", merchantInfo.getMerchantName());
 		merchantSubjectInfoMap.put("openAccountLicenceUrl", merchantInfo.getOpenAccountLicenceUrl());

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yeepay/entity/MerchantInfo.java

@@ -5,6 +5,8 @@ public class MerchantInfo {
 	private String requestNo;
 
 	//-----企业信息
+    private String merchantType;//商家类型（企业-ENTERPRISE，个体户-INDIVIDUAL）
+    
 	private String merchantName; //企业名称
 	
 	private String licenceNo; //商户证件编号
@@ -65,6 +67,14 @@ public class MerchantInfo {
 		this.requestNo = requestNo;
 	}
 
+	public String getMerchantType() {
+		return merchantType;
+	}
+
+	public void setMerchantType(String merchantType) {
+		this.merchantType = merchantType;
+	}
+
 	public String getMerchantName() {
 		return merchantName;
 	}

mec-web/src/main/java/com/ym/mec/web/controller/payment/YeepayController.java

@@ -150,7 +150,7 @@ public class YeepayController extends BaseController {
 			}else if("REVIEW_BACK".equals(dataObj.getString("applicationStatus"))) {
 				//审核驳回
 				hfMember.setStatus("failed");
-				hfMember.setMemo(dataObj.getString("returnMsg"));
+				hfMember.setMemo(dataObj.getString("auditOpinion"));
 				hfMemberService.update(hfMember);
 			}