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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserOrderRefundServiceImpl.java

@@ -316,6 +316,11 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
         }
         String join = StringUtil.join(detilIds, ",");
 
+        List<UserOrderRefund> list = list(Wrappers.<UserOrderRefund>lambdaQuery().eq(UserOrderRefund::getOrderNo, detail.getOrderNo()));
+        if(!CollectionUtils.isEmpty(list)){
+            return HttpResponseResult.failed("已经存在退款单");
+        }
+
         UserOrderRefund orderRefunds = new UserOrderRefund();
         orderRefunds.setUserId(detail.getUserId());
         orderRefunds.setOrderId(detail.getId());
@@ -327,7 +332,7 @@ public class UserOrderRefundServiceImpl extends ServiceImpl<UserOrderRefundDao,
         save(orderRefunds);
 
         for (UserOrderDetailVo vo : detail.getOrderDetailList()) {
-            List<Long> collect = orderRefundReq.getOredrDetilIds().stream().filter(o -> o.equals(vo.getId())).collect(Collectors.toList());
+            List<Long> collect = detilIds.stream().filter(o -> o.equals(vo.getId())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
                 Consumer<UserOrderDetailVo> refundAfterConsumer = refundAfter.get(vo.getGoodType());
                 if (!Objects.isNull(refundAfterConsumer)) {

cooleshow-user/user-biz/src/main/resources/config/mybatis/VideoLessonGroupMapper.xml

@@ -259,7 +259,10 @@
 				AND g.teacher_id_ = #{param.teacherId}
 			</if>
 			<if test="param.auditVersion != null">
-				and g.audit_version_ = #{param.auditVersion}
+				AND g.audit_version_ = #{param.auditVersion}
+			</if>
+			<if test="param.lessonSubject != null">
+				AND s.id_ = #{param.lessonSubject}
 			</if>
 		</where>
 		ORDER BY g.create_time_ DESC