Merge remote-tracking branch 'origin/cloud_teacher_active_2021_09' into cloud_teacher_active_2021_09

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CloudTeacherOrderDao.java

@@ -66,4 +66,15 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
      * @return
      */
     List<CloudTeacherActiveTargetDetailDto> queryCloudTeacherActiveDetail(Map<String, Object> param);
+
+    /**
+     * 获取学员购买的云教练活动订单
+     * @param userId
+     * @param activeRemark
+     * @param remark
+     * @return
+     */
+    List<CloudTeacherOrder> queryActiveOrderPage(@Param("userId") Integer userId,
+                                                 @Param("activeRemark") Integer activeRemark,
+                                                 @Param("remark") String remark);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentPaymentOrderDao.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import com.ym.mec.biz.dal.entity.CloudTeacherOrder;
 import org.apache.ibatis.annotations.Param;
 
 import com.ym.mec.biz.dal.dto.BasicUserDto;
@@ -447,4 +448,5 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
     StudentPaymentOrder findByUserAndActive(@Param("userId") Integer userId,
                                             @Param("activeRemark") Integer activeRemark,
                                             @Param("remark") String remark);
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/CloudTeacherOrderService.java

@@ -87,4 +87,13 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
     CloudTeacherOrderDto queryOrderInfoByOrderId(Long orderId);
 
     List<Map<Long, String>> queryNoStartByUserIds(Set<Integer> userIds,Boolean isMusicMember);
+
+    /**
+     * 获取学员购买的云教练活动订单
+     * @param userId
+     * @param activeRemark
+     * @param remark
+     * @return
+     */
+    List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark);
 }

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

@@ -248,4 +248,9 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     public List<Map<Long, String>> queryNoStartByUserIds(Set<Integer> userIds,Boolean isMusicMember) {
         return cloudTeacherOrderDao.queryNoStartByUserIds(userIds,isMusicMember);
     }
+
+    @Override
+    public List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark) {
+        return cloudTeacherOrderDao.queryActiveOrderPage(userId,activeRemark,remark);
+    }
 }

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

@@ -842,6 +842,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         resultMap.put("totalNum",totalNum);
         Integer targetNum = resultList.stream().mapToInt(CloudTeacherActiveTargetDto::getTargetNum).sum();
         resultMap.put("targetNum",targetNum);
+        resultMap.put("avgBuyAmount",0);
+        resultMap.put("buyScale",0);
+        resultMap.put("targetFinishScale",0);
         if(buyAmount.doubleValue() > 0d && buyNum > 0){
             BigDecimal avgBuyAmount = buyAmount.divide(new BigDecimal(buyNum), CommonConstants.DECIMAL_FINAL_PLACE, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
             resultMap.put("avgBuyAmount",avgBuyAmount);

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

@@ -248,6 +248,15 @@
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_ AND mg.status_ = 'PROGRESS'
         <include refid="queryCloudTeacherActiveDetailSql"/>
     </select>
+    <select id="queryActiveOrderPage" resultMap="CloudTeacherOrder">
+        SELECT cto.* FROM cloud_teacher_order cto
+        LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
+        WHERE spo.status_ != 'FAILED' AND cto.active_remark_ = #{activeRemark}
+        AND cto.student_id_ = #{userId}
+        <if test="remark != null and remark != ''">
+            AND cto.remark_ = #{remark}
+        </if>
+    </select>
     <sql id="queryCloudTeacherActiveDetailSql">
         <where>
             cto.status_ != 0 AND cto.active_remark_ = '202109'

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

@@ -1700,6 +1700,6 @@
     <select id="queryHasMemberGroupStudent" resultType="java.lang.Integer">
         SELECT DISTINCT sr.user_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.ststus_ NOT IN ('CANCELED','CLOSE')
+        WHERE sr.music_group_status_ != 'QUIT' AND mg.status_ NOT IN ('CANCELED','CLOSE') AND mg.course_view_type_ = 2
     </select>
 </mapper>

mec-student/src/main/java/com/ym/mec/student/controller/MemberRankController.java

@@ -1,5 +1,6 @@
 package com.ym.mec.student.controller;
 
+import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysConfigDao;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.util.date.DateUtil;
@@ -120,4 +121,14 @@ public class MemberRankController extends BaseController {
         return succeed(cloudTeacherOrderService.queryPage(queryInfo));
     }
 
+    @ApiOperation(value = "获取学员购买的云教练活动订单")
+    @GetMapping("/queryActiveOrderPage")
+    public Object queryActiveOrderPage() {
+    	SysUser user = sysUserFeignService.queryUserInfo();
+		if (user == null) {
+			return failed(HttpStatus.FORBIDDEN, "请登录");
+		}
+        return succeed(cloudTeacherOrderService.queryActiveOrderPage(user.getId(),202109,null));
+    }
+
 }