Merge branch 'zx_saas_notify' of http://git.dayaedu.com/yonge/mec into zx_saas_goods

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java
#	mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayUtil.java

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

@@ -16,7 +16,7 @@ public class PaymentParam {
     
     private String payerName;
     
-    private String notifyUrl;
+//    private String notifyUrl;
     
     private String ip;
     
@@ -114,13 +114,13 @@ public class PaymentParam {
 		this.payerName = payerName;
 	}
 
-	public String getNotifyUrl() {
+	/*public String getNotifyUrl() {
 		return notifyUrl;
 	}
 
 	public void setNotifyUrl(String notifyUrl) {
 		this.notifyUrl = notifyUrl;
-	}
+	}*/
 
 	public String getIp() {
 		return ip;

mec-biz/src/main/java/com/ym/mec/biz/service/PayService.java

@@ -22,16 +22,13 @@ public interface PayService {
 	* @return
 	* @throws Exception
 	*/
-	Map<String, Object> getPayMap(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl, String orderSubject,
+	Map<String, Object> getPayMap(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String returnUrl, String orderSubject,
 			String orderBody, Integer organId, String receiver) throws Exception;
 
 	/**
 	 *
-	 * @param paymentChannel 支付渠道
-	 * @param payeeMerNo 收款商户号
 	 * @param amount 支付金额
 	 * @param orderNo 订单编号
-	 * @param notifyUrl 回调地址
 	 * @param returnUrl 返回地址
 	 * @param orderSubject 订单主题
 	 * @param orderBody 订单内容
@@ -39,5 +36,5 @@ public interface PayService {
 	 * @throws Exception
 	 */
 	Map<String, Object> getPayToPlatformMap(Integer tenantId, BigDecimal amount, BigDecimal balanceAmount, String orderNo,
-			String notifyUrl, String returnUrl, String orderSubject, String orderBody) throws Exception;
+			String returnUrl, String orderSubject, String orderBody) throws Exception;
 }

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

@@ -341,7 +341,6 @@ public class ChildrenDayReserveServiceImpl extends BaseServiceImpl<Integer, Chil
                 orderAmount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 orderSubject,
                 orderSubject,

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

@@ -284,7 +284,6 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
                     payAmount,
                     BigDecimal.ZERO,
                     orderNo,
-                    baseApiUrl + "/api-web/tenantInfo/callback/" + orderNo,
                     baseApiUrl + "/api-web/tenantInfo/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg()

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

@@ -584,7 +584,6 @@ public class CoursesGroupServiceImpl extends BaseServiceImpl<Long, CoursesGroup>
                     amount,
                     balance,
                     orderNo,
-                    baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                     baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                     "对外课程组购买",
                     coursesGroup.getName(),

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

@@ -195,7 +195,6 @@ public class DegreeRegistrationServiceImpl extends BaseServiceImpl<Integer, Degr
                 money,
                 BigDecimal.ZERO,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 "考级报名活动",
                 "考级报名活动",

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

@@ -2078,7 +2078,9 @@ public class ExportServiceImpl implements ExportService {
                             break;
                         case ACCESSORIES:
                         case TEACHING:
-                            row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            if(row.getGroupType() != GroupType.GOODS_SELL){
+                                row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            }
                             break;
                         case OTHER:
                             row.setOtherFee(row.getOtherFee().add(orderDetail.getPrice()));
@@ -2453,19 +2455,23 @@ public class ExportServiceImpl implements ExportService {
                             row.setMusicGroupCourseFee(row.getMusicGroupCourseFee().add(orderDetail.getPrice()));
                             break;
                         case MUSICAL:
-                            if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
-                                BigDecimal leaseFee = BigDecimal.ZERO;
-                                if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
-                                    leaseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
+                            if (row.getGroupType() != GroupType.GOODS_SELL) {
+                                if (orderDetail.getKitGroupPurchaseType() != null && orderDetail.getKitGroupPurchaseType().equals(KitGroupPurchaseTypeEnum.LEASE)) {
+                                    BigDecimal leaseFee = BigDecimal.ZERO;
+                                    if (row.getExpectAmount().compareTo(BigDecimal.ZERO) > 0) {
+                                        leaseFee = orderDetail.getPrice().multiply(row.getActualAmount()).divide(row.getExpectAmount(), 2, BigDecimal.ROUND_DOWN);
+                                    }
+                                    row.setLeaseFee(leaseFee);
+                                } else {
+                                    row.setMusicalFee(orderDetail.getPrice());
                                 }
-                                row.setLeaseFee(leaseFee);
-                            } else {
-                                row.setMusicalFee(orderDetail.getPrice());
                             }
                             break;
                         case ACCESSORIES:
                         case TEACHING:
-                            row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            if (row.getGroupType() != GroupType.GOODS_SELL) {
+                                row.setTeachingFee(row.getTeachingFee().add(orderDetail.getPrice()));
+                            }
                             break;
                         case OTHER:
                             row.setOtherFee(row.getOtherFee().add(orderDetail.getPrice()));

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

@@ -986,7 +986,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 chargeInfo.getTitle(),
                 chargeInfo.getTitle(),
@@ -1117,7 +1116,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + studentPaymentOrder.getOrderNo(),
                 "续费",
                 "乐团续费",
@@ -1481,7 +1479,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 orderSubject,
                 orderSubject,

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

@@ -137,7 +137,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
         signParams.put("appId", hfMerchantConfig.getAppId());
         signParams.put("amount", param.getAmount().setScale(2, RoundingMode.HALF_UP));
         signParams.put("orderNo", param.getOrderNo());
-        signParams.put("notifyUrl", param.getNotifyUrl());
+//        signParams.put("notifyUrl", param.getNotifyUrl());
         signParams.put("returnUrl", param.getReturnUrl());
         signParams.put("orderSubject", param.getOrderSubject());
         signParams.put("orderBody", param.getOrderBody());
@@ -258,7 +258,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.getNotifyUrl());
+//	        paymentParams.put("notify_url", payParam.getNotifyUrl());
 	        //向第三方发起支付，获取第三方的支付的信息
 	        payment = Payment.executePayment(hfMerchantConfig.getAppId(), hfMerchantConfig.getMerKey(), paymentParams);
 	        
@@ -272,7 +272,7 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 			params.put("merchantNo", hfMerchantConfig.getPlatformPayeeMemberId());
 			params.put("orderId", payParam.getOrderNo());
 			params.put("orderAmount", payParam.getAmount());
-			params.put("notifyUrl", payParam.getNotifyUrl());
+//			params.put("notifyUrl", payParam.getNotifyUrl());
 			params.put("redirectUrl", payParam.getReturnUrl());
 			params.put("scene", "OFFLINE");
 			params.put("goodsName", payParam.getOrderSubject());

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

@@ -76,7 +76,7 @@ public class PayServiceImpl implements PayService {
     private StudentPaymentOrderDao studentPaymentOrderDao;
 
     @Override
-    public Map<String, Object> getPayMap(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, Integer organId, String receiver) throws Exception {
+    public Map<String, Object> getPayMap(BigDecimal amount, BigDecimal balanceAmount, String orderNo, String returnUrl, String orderSubject, String orderBody, Integer organId, String receiver) throws Exception {
 
         StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findOrderByOrderNo(orderNo);
         
@@ -123,7 +123,7 @@ public class PayServiceImpl implements PayService {
             Map<String, Object> unionPay = new HashMap<>();
             Map<String, Object> payMap = null;
 
-        	payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody);
+        	payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, returnUrl, orderSubject, orderBody);
             
             unionPay.put("orderNo", orderNo);
             unionPay.put("type", paymentChannel.getCode());
@@ -178,7 +178,7 @@ public class PayServiceImpl implements PayService {
 	            Map<String, Object> unionPay = new HashMap<>();
 	            Map<String, Object> payMap = null;
 
-            	payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody);
+            	payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, returnUrl, orderSubject, orderBody);
 
 	            unionPay.put("orderNo", orderNo);
 	            unionPay.put("type", paymentChannel.getCode());
@@ -441,7 +441,7 @@ public class PayServiceImpl implements PayService {
         	routeScaleDtos.add(routeScaleDtoForGoodsSell);
         }*/
         
-        Map<String, Object> map = getPayRoute(hfMerchantConfig, amount, balanceAmount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody, routeScaleDtos, subCashAmount);
+        Map<String, Object> map = getPayRoute(hfMerchantConfig, amount, balanceAmount, orderNo, returnUrl, orderSubject, orderBody, routeScaleDtos, subCashAmount);
         
 		if (routeScaleDtoForGoodsSell != null) {
 			String routingMerNos = (String) map.get("routingMerNos");
@@ -461,7 +461,7 @@ public class PayServiceImpl implements PayService {
     }
 
     @Override
-	public Map<String, Object> getPayToPlatformMap(Integer tenantId, BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl,
+	public Map<String, Object> getPayToPlatformMap(Integer tenantId, BigDecimal amount, BigDecimal balanceAmount, String orderNo, String returnUrl,
 			String orderSubject, String orderBody) throws Exception {
         
         //获取支付渠道
@@ -478,7 +478,7 @@ public class PayServiceImpl implements PayService {
         	throw new BizException("机构[{}][{}]商户信息找不到", tenantId, paymentChannel.getCode());
         }
     	
-        Map<String, Object> payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, notifyUrl, returnUrl, orderSubject, orderBody);
+        Map<String, Object> payMap = Payment.getPayMap(hfMerchantConfig, amount, orderNo, returnUrl, orderSubject, orderBody);
         
         Map<String, Object> unionPay = new HashMap<>();
         unionPay.put("orderNo", orderNo);
@@ -714,7 +714,7 @@ public class PayServiceImpl implements PayService {
         return amount.add(totalHasReceipt).compareTo(totalMaxReceipt) >= 0;
     }
 
-    private Map<String, Object> getPayRoute(HfMerchantConfig hfMerchantConfig, BigDecimal amount, BigDecimal balanceAmount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, List<RouteScaleDto> routeScaleDtos, BigDecimal shareAmount) throws Exception {
+    private Map<String, Object> getPayRoute(HfMerchantConfig hfMerchantConfig, BigDecimal amount, BigDecimal balanceAmount, String orderNo, String returnUrl, String orderSubject, String orderBody, List<RouteScaleDto> routeScaleDtos, BigDecimal shareAmount) throws Exception {
         Map<String, List<RouteScaleDto>> routeScaleDtosMap = routeScaleDtos.stream().collect(Collectors.groupingBy(RouteScaleDto::getMerNo));
 
         //合并同账号的数据
@@ -819,9 +819,9 @@ public class PayServiceImpl implements PayService {
             if (tempRoutingList.size() == 1 && YqPayUtil.merNo.equals(tempRoutingList.get(0).get("routingMerNo").toString())) {
                 tempRoutingList = null;
             }
-            payMap = YqPayUtil.getPayMap(amount.add(shareAmount), orderNo, notifyUrl, returnUrl, orderSubject, orderBody, YqPayUtil.merNo, tempRoutingList);
+            payMap = YqPayUtil.getPayMap(amount.add(shareAmount), orderNo, returnUrl, orderSubject, orderBody, YqPayUtil.merNo, tempRoutingList);
         } else {
-            payMap = Payment.getPayMap(hfMerchantConfig, amount.add(shareAmount), orderNo, notifyUrl, returnUrl, orderSubject, orderBody);
+            payMap = Payment.getPayMap(hfMerchantConfig, amount.add(shareAmount), orderNo, returnUrl, orderSubject, orderBody);
         }
         String routingMerNos = String.join(",", routingMerNoSet);
 

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

@@ -2619,7 +2619,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     amount,
                     balance,
                     orderNo,
-                    baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                     baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                     "网管课购买",
                     practiceGroupBuyParams.getName(),
@@ -3086,7 +3085,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                     amount,
                     balance,
                     orderNo,
-                    baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                     baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                     "网管课购买",
                     practiceGroupBuyParams.getName(),
@@ -3599,7 +3597,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 newOrder.getActualAmount(),
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 "网管课购买",
                 practiceGroup.getName(),
@@ -4302,7 +4299,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 "网管课购买",
                 practiceGroup.getName(),
@@ -4484,7 +4480,6 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
                 activityFee,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 orderSubject,
                 orderSubject,

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

@@ -402,7 +402,6 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 orderSubject,
                 orderSubject,

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

@@ -193,7 +193,6 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 orderSubject,
                 orderSubject,

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

@@ -210,9 +210,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             return notifyMap;
         }
 
-        Map<String, Object> payMap = payService.getPayMap(cashAmount, balance, studentPaymentOrder.getOrderNo(), 
-                baseApiUrl + "/api-student/studentOrder/callback/" + studentPaymentOrder.getOrderNo(), baseApiUrl
-                + "/api-student/studentOrder/paymentResult?orderNo=" + studentPaymentOrder.getOrderNo(), studentPaymentOrder.getMemo(), studentPaymentOrder.getMemo(), studentPaymentOrder.getOrganId(), payReceiver);
+        Map<String, Object> payMap = payService.getPayMap(cashAmount, balance, studentPaymentOrder.getOrderNo()
+                , baseApiUrl
+                + "/api-student/studentOrder/paymentResult?orderNo=" + studentPaymentOrder.getOrderNo(), studentPaymentOrder.getMemo(), studentPaymentOrder.getMemo(),
+                studentPaymentOrder.getOrganId(), payReceiver);
 
         studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
         studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
@@ -274,10 +275,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         List<String> orderNoList = payingOrders.stream().map(StudentPaymentOrder::getOrderNo).collect(Collectors.toList());
         String merOrderNos = payingOrders.stream().map(StudentPaymentOrder::getOrderNo).collect(Collectors.joining(","));
 
-        String notifyUrl = ""; //回调地址
+//        String notifyUrl = ""; //回调地址
         Map<String, Object> resultMap = new LinkedHashMap<>();
         resultMap.put("merOrderNoList", merOrderNos);
-        Map<String, Object> requestMap = YqPayUtil.getRequestMap(notifyUrl, resultMap);
+        Map<String, Object> requestMap = YqPayUtil.getRequestMap(resultMap);
 
         RsqMsg rsqMsg = new RsqMsg(requestMap);
 
@@ -886,10 +887,10 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
                 return PayStatus.PAYING;
             }
         } else if (StringUtils.equals(paymentChannel, "YQPAY")) {
-            String notifyUrl = ""; // 回调地址
+//            String notifyUrl = ""; // 回调地址
             Map<String, Object> resultMap = new LinkedHashMap<>();
             resultMap.put("merOrderNoList", orderNo);
-            Map<String, Object> requestMap = YqPayUtil.getRequestMap(notifyUrl, resultMap);
+            Map<String, Object> requestMap = YqPayUtil.getRequestMap(resultMap);
 
             RsqMsg rsqMsg = new RsqMsg(requestMap);
 
@@ -1331,7 +1332,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
         String baseApiUrl = sysConfigDao.findConfigValue("base_api_url");
         //获取支付渠道
-        String paymentChannelStr = sysConfigDao.findConfigValue(SysConfigService.PAYMENT_CHANNEL);
+        /*String paymentChannelStr = sysConfigDao.findConfigValue(SysConfigService.PAYMENT_CHANNEL);
         if(StringUtils.isBlank(paymentChannelStr)) {
             paymentChannelStr = PaymentChannelEnum.ADAPAY.getCode();
         }
@@ -1343,13 +1344,12 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
             notifyUrl = baseApiUrl + "/api-mall-portal/payment/callback";
         }else {
             throw new BizException("支付渠道错误");
-        }
+        }*/
         //  receiver类型
         payMap = payService.getPayMap(
                 studentPaymentOrder.getActualAmount(),
                 studentPaymentOrder.getBalancePaymentAmount(),
                 model.getOrderNo(),
-                notifyUrl,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?type=edu&orderNo=" + model.getOrderNo(),
                 "商品销售",
                 "商品销售",

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

@@ -81,7 +81,7 @@ public class StudentRechargeServiceImpl extends BaseServiceImpl<String, StudentR
         String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
 		try {
-			return payService.getPayMap(amount, BigDecimal.ZERO,studentRecharge.getOrderNo(), baseApiUrl + "/api-student/studentOrder/callback/" + studentRecharge.getOrderNo(), baseApiUrl, "充值",
+			return payService.getPayMap(amount, BigDecimal.ZERO,studentRecharge.getOrderNo(), baseApiUrl, "充值",
 					"充值",userId,null);
 		} catch (Exception e) {
 			throw new BizException("调用支付接口出错", e);

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

@@ -389,7 +389,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?type=edu&orderNo=" + orderNo,
                 "商品销售",
                 "商品销售",
@@ -511,7 +510,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?type=edu&orderNo=" + orderNo,
                 "商品销售",
                 "商品销售",
@@ -732,7 +730,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?type=edu&orderNo=" + orderNo,
                 "乐器维修",
                 "乐器维修",
@@ -1000,7 +997,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 "乐器维修",
                 "乐器维修",

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

@@ -384,7 +384,6 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 "声部更换",
                 "声部更换",

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

@@ -82,8 +82,16 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 		}
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
-		return sysMusicScoreAccompanimentDao.queryAccPage(params);
-	}
+        List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = sysMusicScoreAccompanimentDao.queryAccPage(params);
+        for (SysMusicScoreAccompaniment sysMusicScoreAccompaniment : sysMusicScoreAccompaniments) {
+            if (sysMusicScoreAccompaniment.getIsOpenMetronome() ==null || sysMusicScoreAccompaniment.getIsOpenMetronome()) {
+                if (StringUtils.isNotBlank(sysMusicScoreAccompaniment.getUrl())) {
+                    sysMusicScoreAccompaniment.setMetronomeUrl(sysMusicScoreAccompaniment.getUrl());
+                }
+            }
+        }
+        return sysMusicScoreAccompaniments;
+    }
 
 	@Override
 	public List<Subject> querySubjectIds(Integer categoriesId) {

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

@@ -804,7 +804,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     productInfo.getPayAmount(),
                     BigDecimal.ZERO,
                     orderNo,
-                    baseApiUrl + "/api-web/tenantInfo/callback/" + orderNo,
                     baseApiUrl + "/api-web/tenantInfo/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg()
@@ -850,7 +849,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     amount,
                     BigDecimal.ZERO,
                     orderNo,
-                    baseApiUrl + "/api-web/tenantInfo/callback/" + orderNo,
                     baseApiUrl + "/api-web/tenantInfo/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg()
@@ -1146,7 +1144,6 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
                     amount,
                     BigDecimal.ZERO,
                     orderNo,
-                    baseApiUrl + "/api-web/tenantInfo/callback/" + orderNo,
                     baseApiUrl + "/api-web/tenantInfo/paymentResult?orderNo=" + orderNo,
                     tenantEnum.getMsg(),
                     tenantEnum.getMsg()

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

@@ -182,7 +182,6 @@ public class TenantPaymentOrderServiceImpl extends BaseServiceImpl<Long, TenantP
                     tenantPaymentOrder.getExpectAmount(),
                     BigDecimal.ZERO,
                     tenantPaymentOrder.getOrderNo(),
-                    baseApiUrl + "/api-teacher/teacherOrder/callback",
                     baseApiUrl + "/api-teacher/teacherOrder/paymentResult?orderNo=" + tenantPaymentOrder.getOrderNo(),
                     "商户入驻",
                     "商户充值",

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

@@ -675,7 +675,6 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				amount,
 				studentPaymentOrder.getBalancePaymentAmount(),
 				orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
 				baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
 				"学员活动购买",
 				vipGroupActivity.getName(),
@@ -857,7 +856,6 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				studentPaymentOrder.getActualAmount(),
 				studentPaymentOrder.getBalancePaymentAmount(),
 				orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
 				baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
 				orderSubject,
 				orderSubject,

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

@@ -2797,7 +2797,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
                 amount,
                 balance,
                 orderNo,
-                baseApiUrl + "/api-student/studentOrder/callback/" + orderNo,
                 baseApiUrl + "/api-student/studentOrder/paymentResult?orderNo=" + orderNo,
                 groupType.getDesc() + "购买",
                 vipGroup.getName(),

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/Payment.java

@@ -128,13 +128,13 @@ public class Payment {
         return payment;
     }
 
-    public static Map<String, Object> getPayMap(HfMerchantConfig hfMerchantConfig, BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody) throws Exception {
+    public static Map<String, Object> getPayMap(HfMerchantConfig hfMerchantConfig, BigDecimal amount, String orderNo, String returnUrl, String orderSubject, String orderBody) throws Exception {
 
         Map<String, Object> paymentParams = new LinkedHashMap<>();
         paymentParams.put("appId", hfMerchantConfig.getAppId());
         paymentParams.put("amount", amount.setScale(2, BigDecimal.ROUND_HALF_UP));
         paymentParams.put("orderNo", orderNo);
-        paymentParams.put("notifyUrl", notifyUrl);
+//        paymentParams.put("notifyUrl", notifyUrl);
         paymentParams.put("returnUrl", returnUrl);
         paymentParams.put("orderSubject", orderSubject);
         paymentParams.put("orderBody", orderBody);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/lingxinpay/ContractSignService.java

@@ -48,7 +48,7 @@ public class ContractSignService {
 		jsonObject.put("outMemberNo", outMemberNo);// 公司商户号
 		jsonObject.put("serialNo", serialNo);// 流水号（商户唯一标识）
 		jsonObject.put("contractNo", contractNo);// 合同模板号
-		jsonObject.put("notifyUrl", notifyUrl);// 返回结果异步通知地址
+//		jsonObject.put("notifyUrl", notifyUrl);// 返回结果异步通知地址
 
 		JSONObject jsonObject2 = new JSONObject();
 		jsonObject2.put("name", realName);

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/union/UnionPay.java

@@ -92,7 +92,7 @@ public class UnionPay {
         json.put("merOrderId", "1017" + orderNo);
         json.put("requestTimestamp", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));
         json.put("expireTime", DateFormatUtils.format(new Date().getTime() + 300000, "yyyy-MM-dd HH:mm:ss"));
-        json.put("notifyUrl", notifyUrl);
+//        json.put("notifyUrl", notifyUrl);
         json.put("returnUrl", returnUrl);
         String param = getOpenBodySig(H5AppId, h5AppKey, timestamp, nonce, json.toString(), "GET");
         PayMap.put("aliPay", aliPayUrl + "?" + param);

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

@@ -84,7 +84,7 @@ public class YeepayMerchantService {
 		settlementAccountInfoMap.put("bankCardNo", merchantInfo.getBankCardNo());
 		request.addParam("settlementAccountInfo", JSONObject.toJSONString(settlementAccountInfoMap));
 
-		request.addParam("notifyUrl", notifyURL + "/" + request.getParamValue("requestNo"));
+//		request.addParam("notifyUrl", notifyURL + "/" + request.getParamValue("requestNo"));
 		request.addParam("productInfo", "[{\"productCode\":\"D1\",\"rateType\":\"SINGLE_FIXED\",\"fixedRate\":\"0\",\"paymentMethod\":\"REAL_TIME\"}]");
 		//request.addParam("functionService", "[\"SHARE\"]");
 		//request.addParam("functionServiceQualificationInfo", "{\"shareScene\":\"FZ_ALL001\"}");

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

@@ -35,7 +35,7 @@ public class YeepayPaymentService {
 		request.addParam("orderId", params.get("orderId"));
 		request.addParam("orderAmount", params.get("orderAmount"));
 		request.addParam("expiredTime", DateUtil.addMinutes(new Date(), 30));
-		request.addParam("notifyUrl", params.get("notifyUrl"));
+//		request.addParam("notifyUrl", params.get("notifyUrl"));
 		request.addParam("redirectUrl", params.get("redirectUrl"));
 		request.addParam("scene", params.get("scene"));
 		request.addParam("goodsName", params.get("goodsName"));

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/RsqMsg.java

@@ -5,7 +5,7 @@ import java.util.Map;
 public class RsqMsg {
     private String merNo;
     private String version;
-    private String notifyUrl;
+//    private String notifyUrl;
     private String timestamp;
     private String apiContent;
     private String signType;
@@ -14,7 +14,7 @@ public class RsqMsg {
     public RsqMsg(Map<String, Object> payMap) {
         merNo = (String) payMap.get("merNo");
         version = (String) payMap.get("version");
-        notifyUrl = (String) payMap.get("notifyUrl");
+//        notifyUrl = (String) payMap.get("notifyUrl");
         timestamp = (String) payMap.get("timestamp");
         apiContent = (String) payMap.get("apiContent");
         signType = (String) payMap.get("signType");
@@ -37,13 +37,13 @@ public class RsqMsg {
         this.version = version;
     }
 
-    public String getNotifyUrl() {
+    /*public String getNotifyUrl() {
         return notifyUrl;
     }
 
     public void setNotifyUrl(String notifyUrl) {
         this.notifyUrl = notifyUrl;
-    }
+    }*/
 
     public String getTimestamp() {
         return timestamp;

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/yqpay/YqPayUtil.java

@@ -13,11 +13,12 @@ public class YqPayUtil {
     private static final String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付提交地址
     private static final String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置
 
-    public static Map<String, Object> getRequestMap(String notifyUrl, Map<String, Object> resultMap) throws Exception {
+    public static Map<String, Object> getRequestMap(Map<String, Object> resultMap) throws Exception {
         Map<String, Object> rqMap = new LinkedHashMap<>();
 //        rqMap.put("notifyUrl", notifyUrl);
         rqMap.put("merNo", merNo);
         rqMap.put("version", version);
+//        rqMap.put("notifyUrl", notifyUrl);
         rqMap.put("timestamp", DateUtils.getDateTime());
         rqMap.put("apiContent", JSON.toJSONString(resultMap));
         rqMap.put("signType", signType);
@@ -40,7 +41,7 @@ public class YqPayUtil {
      * @return
      * @throws Exception
      */
-    public static Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String sellerNo, String routingMerNo) throws Exception {
+    public static Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String returnUrl, String orderSubject, String orderBody, String sellerNo, String routingMerNo) throws Exception {
         List<Map> tempRoutingList = new ArrayList<>();
         Map<String, Object> routingList = new HashMap<>();
         routingList.put("routingMerNo", routingMerNo);//分佣账户
@@ -60,7 +61,7 @@ public class YqPayUtil {
         if (routingMerNo != null && !routingMerNo.isEmpty() && !sellerNo.equals(routingMerNo)) {
             contentMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
         }
-        Map<String, Object> payMap = getRequestMap(notifyUrl, contentMap);
+        Map<String, Object> payMap = getRequestMap(contentMap);
         payMap.put("host", payUrl);
         return payMap;
     }
@@ -70,7 +71,6 @@ public class YqPayUtil {
      *
      * @param amount
      * @param orderNo
-     * @param notifyUrl
      * @param returnUrl
      * @param orderSubject
      * @param orderBody
@@ -79,7 +79,7 @@ public class YqPayUtil {
      * @return
      * @throws Exception
      */
-    public static Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody, String sellerNo, List<Map<String, Object>> tempRoutingList) throws Exception {
+    public static Map<String, Object> getPayMap(BigDecimal amount, String orderNo, String returnUrl, String orderSubject, String orderBody, String sellerNo, List<Map<String, Object>> tempRoutingList) throws Exception {
         Map<String, Object> contentMap = new LinkedHashMap<>();
         contentMap.put("sellerNo", sellerNo); //收款商户号
         contentMap.put("payChannels", payChannels); //支付方式
@@ -93,7 +93,7 @@ public class YqPayUtil {
         if (tempRoutingList != null) {
             contentMap.put("tempRoutingList", JSON.toJSONString(tempRoutingList));//分账设置
         }
-        Map<String, Object> payMap = getRequestMap(notifyUrl, contentMap);
+        Map<String, Object> payMap = getRequestMap( contentMap);
         payMap.put("host", payUrl);
         return payMap;
     }