云教练活动

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.dao;
 
+import com.ym.mec.biz.dal.dto.HorseRaceLampDto;
 import com.ym.mec.biz.dal.dto.SysCouponCodeDto;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.biz.dal.entity.SysCouponCode;
@@ -26,4 +27,17 @@ public interface SysCouponCodeDao extends BaseDAO<Long, SysCouponCode> {
     List<SysCouponCodeDto> querySysCouponUseList(Map<String, Object> params);
     int countSysCouponUseList(Map<String, Object> params);
 
+    /**
+     * 获取优惠券跑马灯
+     * @param params
+     * @return
+     */
+    int countHorseRaceLampDtoList(Map<String, Object> params);
+
+    /**
+     * 获取优惠券跑马灯
+     * @param params
+     * @return
+     */
+    List<HorseRaceLampDto> queryHorseRaceLampDtoList(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/HorseRaceLampDto.java

@@ -0,0 +1,36 @@
+package com.ym.mec.biz.dal.dto;
+
+import java.math.BigDecimal;
+
+public class HorseRaceLampDto {
+
+    private Integer num;
+
+    private BigDecimal faceValue;
+
+    private String username;
+
+    public Integer getNum() {
+        return num;
+    }
+
+    public void setNum(Integer num) {
+        this.num = num;
+    }
+
+    public BigDecimal getFaceValue() {
+        return faceValue;
+    }
+
+    public void setFaceValue(BigDecimal faceValue) {
+        this.faceValue = faceValue;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

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

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dto.HorseRaceLampDto;
 import com.ym.mec.biz.dal.dto.SysCouponCodeDto;
 import com.ym.mec.biz.dal.entity.SysCouponCode;
 import com.ym.mec.biz.dal.page.SysCouponCodeQueryInfo;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
 
 public interface SysCouponCodeService extends BaseService<Long, SysCouponCode> {
@@ -29,4 +31,10 @@ public interface SysCouponCodeService extends BaseService<Long, SysCouponCode> {
      */
     PageInfo<SysCouponCodeDto> querySysCouponUseList(SysCouponCodeQueryInfo queryInfo);
 
+    /**
+     * 获取优惠券跑马灯
+     * @param queryInfo
+     * @return
+     */
+    PageInfo<HorseRaceLampDto> queryHorseRaceLampDtoList(QueryInfo queryInfo);
 }

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

@@ -126,6 +126,9 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 			return;
 		}
 		if(activeRemark.equals(202109)){
+			if(remark.equals("单月")){
+				return;
+			}
 			StudentPaymentOrder studentPaymentOrder = studentPaymentOrderService.findByUserAndActive(userId,activeRemark,remark,null);
 			if(studentPaymentOrder != null){
 				DealStatusEnum status = studentPaymentOrder.getStatus();

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
 import com.ym.mec.biz.dal.dao.SysCouponCodeDao;
 import com.ym.mec.biz.dal.dao.SysCouponDao;
+import com.ym.mec.biz.dal.dto.HorseRaceLampDto;
 import com.ym.mec.biz.dal.dto.SysCouponCodeDto;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.SysCoupon;
@@ -13,6 +14,7 @@ import com.ym.mec.biz.service.SysCouponService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
+import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.IdGeneratorService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
@@ -124,4 +126,21 @@ public class SysCouponCodeServiceImpl extends BaseServiceImpl<Long, SysCouponCod
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}
+
+    @Override
+    public PageInfo<HorseRaceLampDto> queryHorseRaceLampDtoList(QueryInfo queryInfo) {
+		PageInfo<HorseRaceLampDto> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
+		Map<String, Object> params = new HashMap<String, Object>();
+		MapUtil.populateMap(params, queryInfo);
+
+		List<HorseRaceLampDto> dataList = new ArrayList<>();
+		int count = sysCouponCodeDao.countHorseRaceLampDtoList(params);
+		if (count > 0) {
+			pageInfo.setTotal(count);
+			params.put("offset", pageInfo.getOffset());
+			dataList = sysCouponCodeDao.queryHorseRaceLampDtoList(params);
+		}
+		pageInfo.setRows(dataList);
+		return pageInfo;
+    }
 }

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

@@ -252,8 +252,8 @@
     <select id="queryActiveOrderPage" resultType="string">
         SELECT GROUP_CONCAT(DISTINCT cto.remark_) FROM cloud_teacher_order cto
         LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
-        WHERE spo.status_ IN ('ING','SUCCESS') AND cto.active_remark_ = #{activeRemark}
-        AND cto.student_id_ = #{userId}
+        WHERE spo.status_ = 'SUCCESS' AND cto.active_remark_ = #{activeRemark}
+        AND cto.student_id_ = #{userId} AND remark != '单月'
         <if test="remark != null and remark != ''">
             AND cto.remark_ = #{remark}
         </if>

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

@@ -190,4 +190,23 @@
 			LEFT JOIN organization organ ON su.organ_id_=organ.id_
 		<include refid="querySysCouponUseListCondition"></include>
 	</select>
+	<resultMap id="HorseRaceLampDto" type="com.ym.mec.biz.dal.dto.HorseRaceLampDto">
+		<result property="username" column="username_"/>
+		<result property="num" column="num_"/>
+		<result property="faceValue" column="face_value_"/>
+	</resultMap>
+	<select id="queryHorseRaceLampDtoList" resultType="com.ym.mec.biz.dal.dto.HorseRaceLampDto">
+		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
+		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
+		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_
+		<include refid="global.limit"/>
+	</select>
+	<select id="countHorseRaceLampDtoList" resultType="java.lang.Integer">
+		SELECT COUNT(t.num_) FROM (
+		SELECT COUNT(suc.coupon_id_) num_,sc.face_value_,su.username_ FROM sys_coupon_code suc
+		LEFT JOIN sys_user su ON su.id_ = suc.user_id_
+		LEFT JOIN sys_coupon sc ON sc.id_ = suc.coupon_id_
+		GROUP BY suc.user_id_,suc.payment_order_id_,suc.coupon_id_)t
+	</select>
 </mapper>

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

@@ -123,7 +123,7 @@ public class MemberRankController extends BaseController {
 		if (user == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-        return succeed(cloudTeacherOrderService.queryActiveOrderPage(user.getId(),202109,"SUCCESS"));
+        return succeed(cloudTeacherOrderService.queryActiveOrderPage(user.getId(),202109,null));
     }
 
 }

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

@@ -6,6 +6,7 @@ import com.ym.mec.biz.dal.page.SysCouponCodeQueryInfo;
 import com.ym.mec.biz.service.SysCouponCodeService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,9 +36,9 @@ public class SysCouponCodeController extends BaseController {
 		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
 	}
 
-	@ApiOperation("分页查询")
+	@ApiOperation("获取云教练活动跑马灯")
 	@RequestMapping(value = "queryPageAll")
-	public HttpResponseResult queryPageAll(SysCouponCodeQueryInfo queryInfo) {
-		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
+	public HttpResponseResult queryPageAll(QueryInfo queryInfo) {
+		return succeed(sysCouponCodeService.queryHorseRaceLampDtoList(queryInfo));
 	}
 }