增加台牌支付

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

@@ -582,7 +582,7 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
         List<StudentRegistration> musicGroupStudents = studentRegistrationDao.findMusicGroupStudent(musicGroupId, actualSubjectId);
         for (StudentRegistration musicGroupStudent : musicGroupStudents) {
             for (Subject subject : subjectList) {
-                if (musicGroupStudent.getActualSubjectId().equals(subject.getId().toString())) {
+                if (musicGroupStudent.getActualSubjectId().equals(subject.getId())) {
                     musicGroupStudent.setSubjectName(subject.getName());
                 }
             }

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -96,11 +96,11 @@ public class StudentOrderController extends BaseController {
 
     @ApiOperation(value = "台牌支付")
     @PostMapping("/executePayment")
-    public Object executePayment(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody) throws Exception {
+    public Object executePayment(BigDecimal amount, String orderNo, String notifyUrl, String returnUrl, String orderSubject, String orderBody,String sign) throws Exception {
         String payChannel = PayChannelEnum.ALIPAY_QR.getCode();
-        if (!new Pay().verifySign(amount, orderNo, notifyUrl, notifyUrl, orderSubject, orderBody)) {
-            return failed("签名验证失败");
-        }
+//        if (!new Pay().verifySign(amount, orderNo, notifyUrl, orderSubject, orderBody,sign)) {
+//            return failed("签名验证失败");
+//        }
         Payment payment = new Pay().executePayment(amount, orderNo, payChannel, orderSubject, orderBody);
         return succeed(payment);
     }

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

@@ -90,7 +90,7 @@ public class Pay {
         paymentParams.put("orderSubject", orderSubject);
         paymentParams.put("orderBody", orderBody);
         String originalStr = JSONObject.toJSONString(paymentParams);
-       return AdaPaySign.verifySign(originalStr,sign, AdaPay.pubKey);
+        return AdaPaySign.verifySign(originalStr,sign, AdaPay.pubKey);
     }
 
     /**