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

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

@@ -1,11 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ym.mec.biz.dal.dao.*;
@@ -145,6 +141,9 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                     addGoodies.add(goods);
                 }
             }
+            if (addGoodies.size() > 0) {
+                goodies.addAll(addGoodies);
+            }
         }
 
         if (StringUtils.isNotBlank(originalGoodsIds)) {
@@ -158,11 +157,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 }
             }
         }
-        while (goodies.iterator().hasNext()) {
-            if (goodies.iterator().next().getSellCount() <= 0) {
-                goodies.iterator().remove();
-            }
-        }
+        goodies.removeIf(goods -> goods.getSellCount() <= 0);
         return goodies;
     }
 

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

@@ -99,7 +99,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
         Date date = new Date();
         SubjectChange subjectChange = subjectChangeDao.get(id);
         if (isRepay) {
-            StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.get(subjectChange.getOrganId().longValue());
+            StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.get(subjectChange.getOrderId().longValue());
             studentPaymentOrder.setStatus(DealStatusEnum.CLOSE);
             studentPaymentOrder.setUpdateTime(date);
             studentPaymentOrderService.update(studentPaymentOrder);

mec-biz/src/main/resources/config/mybatis/SubjectChangeMapper.xml

@@ -153,6 +153,9 @@
             <if test="costMargin != null">
                 cost_margin_ = #{costMargin},
             </if>
+            <if test="sellAmount != null">
+                sell_amount_ = #{sellAmount},
+            </if>
             <if test="orderId != null">
                 order_id_ = #{orderId},
             </if>