增加乐器采购清单确认接口

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

@@ -668,32 +668,34 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             amount = musicGroupStudentFee.getCourseFee();
         }
 
-        Date date = new Date();
-        StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
-        studentPaymentOrder.setUserId(userId);
-        studentPaymentOrder.setOrderNo(idGeneratorService.generatorId("RENEW") + "");
-        studentPaymentOrder.setType(OrderTypeEnum.RENEW);
-        studentPaymentOrder.setExpectAmount(amount);
-        studentPaymentOrder.setActualAmount(amount);
-        studentPaymentOrder.setStatus(DealStatusEnum.ING);
-        studentPaymentOrder.setPaymentChannel("银联");
-        studentPaymentOrder.setMusicGroupId(musicGroupId);
-        studentPaymentOrderService.insert(studentPaymentOrder);
-
-        ArrayList<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
-        StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
-        studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
-        studentPaymentOrderDetail.setPrice(amount);
-        studentPaymentOrderDetail.setCreateTime(date);
-        studentPaymentOrderDetail.setUpdateTime(date);
-        studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
-        studentPaymentOrderDetailList.add(studentPaymentOrderDetail);
-
-        studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetailList);
-
         try {
-            return payService.getPayMap(amount, idGeneratorService.generatorId("payment") + "", "https://pay.dayaedu.com/api/yqpay/notify",
+            Map<String, Object> payMap = payService.getPayMap(amount, idGeneratorService.generatorId("payment") + "", "https://pay.dayaedu.com/api/yqpay/notify",
                     "http://dev.dayaedu.com", "测试订单", "测试订单");
+
+            Date date = new Date();
+            StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
+            studentPaymentOrder.setUserId(userId);
+            studentPaymentOrder.setOrderNo(idGeneratorService.generatorId("RENEW") + "");
+            studentPaymentOrder.setType(OrderTypeEnum.RENEW);
+            studentPaymentOrder.setExpectAmount(amount);
+            studentPaymentOrder.setActualAmount(amount);
+            studentPaymentOrder.setStatus(DealStatusEnum.ING);
+            studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
+            studentPaymentOrder.setMusicGroupId(musicGroupId);
+            studentPaymentOrderService.insert(studentPaymentOrder);
+
+            ArrayList<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
+            StudentPaymentOrderDetail studentPaymentOrderDetail = new StudentPaymentOrderDetail();
+            studentPaymentOrderDetail.setType(OrderDetailTypeEnum.COURSE);
+            studentPaymentOrderDetail.setPrice(amount);
+            studentPaymentOrderDetail.setCreateTime(date);
+            studentPaymentOrderDetail.setUpdateTime(date);
+            studentPaymentOrderDetail.setPaymentOrderId(studentPaymentOrder.getId());
+            studentPaymentOrderDetailList.add(studentPaymentOrderDetail);
+
+            studentPaymentOrderDetailService.batchAdd(studentPaymentOrderDetailList);
+
+            return payMap;
         } catch (Exception e) {
             throw new BizException("调用支付接口出错", e);
         }