Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

src/main/java/com/ym/mec/collectfee/controller/YqPayController.java

@@ -415,7 +415,7 @@ public class YqPayController extends BaseController {
     }
 
     @Transactional
-    public void updateOrder(Map<String, String> rpMap) {
+    public void updateOrder(Map<String, String> rpMap) throws Exception {
         int status = rpMap.get("tradeState").equals("1") ? 2 : 0;
         Order order = orderService.getOrderByOrderNo(rpMap.get("merOrderNo"));
         if (order == null) {

src/main/java/com/ym/mec/collectfee/service/impl/RenewalsServiceImpl.java

@@ -61,17 +61,18 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
         order.setUAccount(String.valueOf(routingAccount.getId()));
         order.setCreateTime(new Date());
 
-
+        Integer type = mecCourses.get(0).getClassType() == 2 ? 2 : 3;
+        order.setType(type);
+        order.setVoicyPart(mecCourses.get(0).getSubNames());
+        order.setClassId(mecCourses.get(0).getClassId());
+        order.setUserName(mecCourses.get(0).getSubNames());
+        //1、插入订单
+        orderService.insert(order);
+        
         ArrayList<Renewals> renewalsArrayList = new ArrayList<>();
 
         for (int i = 0; i < mecCourses.size(); i++) {
             MecCourse course = mecCourses.get(i);
-            order.setClassId(course.getClassId());
-            order.setUserName(course.getSubNames());
-            Integer type = course.getClassType() == 2 ? 2 : 3;
-            order.setType(type);
-            order.setVoicyPart(course.getSubNames());
-
             Renewals rws = new Renewals();
             rws.setUserId(course.getStudentId());
             rws.setBranchId(renewals.getBranchId());
@@ -85,8 +86,6 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
             rws.setOrderId(order.getId());
             renewalsArrayList.add(rws);
         }
-        //1、插入订单
-        orderService.insert(order);
 
         //2、添加续费记录
         renewalsService.renewalsInsert(renewalsArrayList);