Merge branch '230516_yeepay' into master_saas

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

@@ -98,15 +98,6 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             throw new Exception("PaymentParam query is null");
         }
         
-        StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
-        if(studentPaymentOrder == null) {
-        	throw new BizException("参数错误");
-        }
-        
-        payParam.setPayerName(studentPaymentOrder.getPaymentChannel());
-        
-        //签名验证
-        checkSing(payParam);
         //返回值
         Map<String, Object> payment;
 
@@ -116,6 +107,17 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
             //主动延迟检查订单
             delayCheckTenant();
         } else {
+            
+            StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(payParam.getOrderNo());
+            if(studentPaymentOrder == null) {
+            	throw new BizException("参数错误");
+            }
+            
+            payParam.setPayerName(studentPaymentOrder.getPaymentChannel());
+
+            //签名验证
+            checkSing(payParam);
+            
             //如果以上操作都没有 则应该是这一个，因为老代码就是这样写的。
             payment = student(payParam);
         }
@@ -160,7 +162,12 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         if (tenantOrderRecord.getOrderState() != 0) {
             throw new BizException("订单已处理！");
         }
+        payParam.setPayerName(tenantOrderRecord.getPaymentChannel());
         payParam.setMerNo(tenantOrderRecord.getMerNos());
+
+        //签名验证
+        checkSing(payParam);
+        
         //获取支付数据
         Map<String, Object> payment;
         try {

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

@@ -969,11 +969,21 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
     @Override
     public TenantOrderRecord createOrderRecord(Integer tenantId, BigDecimal payAmount, String orderNo, TenantOrderRecordEnum
             tenantEnum, Integer orderState, String merNos) {
+    	
+    	//获取支付渠道
+		String paymentChannelStr = sysConfigDao.findConfigValue(SysConfigService.PAYMENT_CHANNEL);
+		
+		if(StringUtils.isBlank(paymentChannelStr)) {
+			paymentChannelStr = PaymentChannelEnum.ADAPAY.getCode();
+		}
+		
+		PaymentChannelEnum paymentChannel = PaymentChannelEnum.codeOf(paymentChannelStr);
+    			
         TenantOrderRecord record = new TenantOrderRecord();
         record.setTenantId(tenantId);
         record.setOrderNo(orderNo);
         record.setOrderType(tenantEnum.getCode());
-        record.setPaymentChannel(PaymentChannelEnum.ADAPAY.getCode());
+        record.setPaymentChannel(paymentChannel.getCode());
         record.setExpectAmount(payAmount);
         record.setActualAmount(payAmount);
         record.setOrderState(orderState);