Merge branch '220624_HF' into master_saas

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

@@ -218,7 +218,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         Map<String, Object> paymentParams = getPaymentParam(payParam, clazz, hfMerchantConfig.getPlatformPayeeMemberId());
         paymentParams.put("time_expire", timeExpire);
         paymentParams.put("expend", getExpend(hfMerchantConfig, payParam));
-        paymentParams.put("notify_url", payParam.getReturnUrl());
+        paymentParams.put("notify_url", payParam.getNotifyUrl());
         //向第三方发起支付，获取第三方的支付的信息
         Map<String, Object> payment = Payment.executePayment(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentParams);
         log.info("executePayment create order param >>>>> {}", JSON.toJSONString(payment));

mec-student/src/main/resources/logback-spring.xml

@@ -43,7 +43,7 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="WARN" />
+	<logger name="com.ym.mec" level="INFO" />
 
 	<logger name="com.ym.mec.thirdparty" level="INFO"
 			additivity="false">