云教练活动

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

@@ -8,6 +8,9 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 public interface SysCouponCodeService extends BaseService<Long, SysCouponCode> {
 
     /**
@@ -38,4 +41,12 @@ public interface SysCouponCodeService extends BaseService<Long, SysCouponCode> {
      * @return
      */
     PageInfo<HorseRaceLampDto> queryHorseRaceLampDtoList(QueryInfo queryInfo);
+
+    /**
+     * 获取用户优惠券列表
+     * @param amount
+     * @param userId
+     * @return
+     */
+    List<SysCouponCode> queryCouponPage(BigDecimal amount, Integer userId);
 }

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

@@ -26,6 +26,7 @@ import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -150,4 +151,10 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
 		pageInfo.setRows(dataList);
 		return pageInfo;
     }
+
+    @Override
+    public List<SysCouponCode> queryCouponPage(BigDecimal amount, Integer userId) {
+
+		return null;
+    }
 }

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

@@ -1324,11 +1324,12 @@
         LEFT JOIN sys_user su  ON sr.user_id_ = su.id_
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         -- 新用户
-        WHERE su.id_ NOT IN (SELECT DISTINCT(cssp.`user_id_`)  FROM `course_schedule_student_payment` cssp
-        LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
-        LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
-        WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
-        GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) <= 4)
+        WHERE su.id_ NOT IN (SELECT DISTINCT(sr.`user_id_`) FROM student_registration sr
+        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        LEFT JOIN course_schedule cs on cs.`music_group_id_` = mg.`id_` AND cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND cs.del_flag_ = 0
+        LEFT JOIN `course_schedule_student_payment` cssp on cssp.`course_schedule_id_` = cs.`id_`
+        WHERE mg.`status_` = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL'
+        GROUP BY sr.`user_id_` HAVING COUNT(cs.`id_`) <= 4)
         -- 			非管乐
         AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
         -- 			声部排除

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

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
+
 @RequestMapping("sysCouponCode")
 @Api(tags = "优惠券明细")
 @RestController
@@ -51,4 +53,14 @@ public class SysCouponCodeController extends BaseController {
 		}
 		return succeed(sysCouponCodeService.exchangeCouponTest(sysUser.getId(), couponId, paymentOrderId, exchangeNum));
 	}
+
+	@ApiOperation("获取用户待使用的优惠券")
+	@PostMapping(value = "queryCouponPage")
+	public HttpResponseResult queryCouponPage(BigDecimal amount){
+		SysUser sysUser = sysUserFeignService.queryUserInfo();
+		if (sysUser == null) {
+			return failed("用户信息获取失败");
+		}
+		return succeed(sysCouponCodeService.queryCouponPage(amount,sysUser.getId()));
+	}
 }