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

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

@@ -976,7 +976,7 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         }
         String order = queryInfo.getOrder();
         switch (sort){
-            case "totalAmount":
+            case "buyAmount":
                 if("DESC".equalsIgnoreCase(order)){
                     resultList = resultList.stream().sorted(Comparator.comparing(CloudTeacherActiveTargetDto::getBuyAmount,Comparator.reverseOrder())).collect(Collectors.toList());
                 }else {

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

@@ -157,6 +157,7 @@
 	<select id="querySysCouponUseList" resultMap="SysCouponCodeDto">
 		SELECT
 			organ.name_ organ_name_,
+		    scc.user_id_,
 			su.username_,
 			su.phone_,
 			scc.coupon_id_,