修改小课续费接口

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

@@ -204,7 +204,7 @@ public class YqPayController extends BaseController {
         renewals.setBranchId(mecUser.getBranchId());
 
         //课程组价格
-        ArrayList<MecCourse> courses = (ArrayList<MecCourse>) applyInfoService.queryUserCourse(renewals.getUserId());//获取续费课程
+        List<MecCourse> courses = applyInfoService.queryUserCourse(renewals.getUserId());//获取续费课程
         MecCourse mecCourse4json = JSON.parseObject(renewals.getCourses(), MecCourse.class);
         if (mecCourse4json == null) {
             return failed("请选择续费课程");
@@ -216,12 +216,10 @@ public class YqPayController extends BaseController {
         String remark = "";
         for (int i = 0; i < courses.size(); i++) {
             MecCourse course = courses.get(i);
-            if (mecCourse4json.getCourseId().equals(course.getCourseId())) {
-                BigDecimal price = course.getClassType() == 1 ? course.getPrice().multiply(BigDecimal.valueOf(buyCount)) : course.getPrice().multiply(BigDecimal.valueOf(course.getBuyCount()));
+            if (mecCourse4json.getCourseId().equals(course.getCourseId().intValue())) {
+                BigDecimal price = course.getClassType().equals(1)? course.getPrice().multiply(BigDecimal.valueOf(buyCount)) : course.getPrice().multiply(BigDecimal.valueOf(course.getBuyCount()));
                 amount = amount.add(price);
                 remark += course.getClassName();
-            } else {
-                courses.remove(i);
             }
         }
         if (courses.size() == 0) {
@@ -494,7 +492,7 @@ public class YqPayController extends BaseController {
             order.setPay(order.getAmount());
             order.setPayTime(new Date());
             //推送mec
-            if(order.getTuiFee() != null){
+            if (order.getTuiFee() != null) {
                 ApplyInfo applyInfo = applyInfoService.get(order.getUserId());
                 applyInfoService.userRegister(applyInfo.getPatriarchPhone()); //推送mec
             }

src/main/java/com/ym/mec/collectfee/dao/RenewalsDao.java

@@ -7,10 +7,11 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.List;
 
 @Component
 public interface RenewalsDao extends BaseDAO<Integer, Renewals> {
 
-    public void renewalsInsert(@Param("renewalses") ArrayList<Renewals> renewalsArrayList);
+    public void renewalsInsert(@Param("renewalses") List<Renewals> renewalsArrayList);
 
 }

src/main/java/com/ym/mec/collectfee/service/RenewalsService.java

@@ -2,6 +2,7 @@ package com.ym.mec.collectfee.service;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.List;
 
 import com.ym.mec.collectfee.common.service.BaseService;
 import com.ym.mec.collectfee.entity.MecCourse;
@@ -16,7 +17,7 @@ public interface RenewalsService extends BaseService<Integer, Renewals> {
      * @param mecCourses
      * @return
      */
-    Order addRenewalsOrder(Renewals renewals,BigDecimal amount, String orderNo, ArrayList<MecCourse> mecCourses, String routingMerNo,String remark);
+    Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, String remark);
 
     void renewalsInsert(ArrayList<Renewals> renewalsArrayList);
 

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

@@ -19,6 +19,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @Service
 public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> implements RenewalsService {
@@ -45,7 +46,7 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, ArrayList<MecCourse> mecCourses, String routingMerNo, String remark) {
+    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, String remark) {
 
         Order order = new Order();
         order.setBranchId(renewals.getBranchId());