过滤优惠卷

consume-business/src/main/java/cn/wise/sc/consume/business/mapper/SysCouponDetailMapper.java

@@ -26,5 +26,7 @@ public interface SysCouponDetailMapper extends BaseMapper<SysCouponDetail> {
 	@Select("select * from sys_coupon_detail scd where scd.is_receive=0  and  to_days(now()) - to_days(scd.end_date) >0")
 	List<SysCouponDetail> getVerdueList();
 
+	List<SysCouponDetail> getByCouponId(@Param("param")Long couponId);
+
 //    void updateByCouponCode(@Param("param") String couponCode,@Param("status") Integer status);
 }

consume-business/src/main/java/cn/wise/sc/consume/business/mapper/SysCouponMapper.java

@@ -4,6 +4,7 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
 import cn.wise.sc.consume.business.model.CouponAppListVO;
 import cn.wise.sc.consume.business.model.CouponDetailVO;
 import cn.wise.sc.consume.business.model.CouponListVO;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -24,7 +25,7 @@ public interface SysCouponMapper extends BaseMapper<SysCoupon> {
 
 	CouponDetailVO getCouponDetail(Long id);
 
-	List<CouponAppListVO> getCouponAppList(@Param("coridc") String coridc, @Param("usridc") String usridc );
+	List<CouponAppListVO> getCouponAppList(@Param("coridc") String coridc, @Param("usridc") String usridc, QueryWrapper<CouponAppListVO> qw);
 
 
 

consume-business/src/main/java/cn/wise/sc/consume/business/mapper/xml/SysCouponDetailMapper.xml

@@ -20,5 +20,10 @@
     </select>
 
 
+        <select id="getByCouponId" resultType="cn.wise.sc.consume.business.entity.SysCouponDetail">
+            select scd.*
+            from sys_coupon_detail scd
+            where coupon_id = #{param};
+        </select>
 
 </mapper>

consume-business/src/main/java/cn/wise/sc/consume/business/service/impl/SysCouponServiceImpl.java

 package cn.wise.sc.consume.business.service.impl;
 
 import cn.wise.sc.consume.business.entity.SysCoupon;
+import cn.wise.sc.consume.business.entity.SysCouponDetail;
 import cn.wise.sc.consume.business.entity.SysEnterprise;
+import cn.wise.sc.consume.business.mapper.SysCouponDetailMapper;
 import cn.wise.sc.consume.business.mapper.SysCouponMapper;
 import cn.wise.sc.consume.business.model.CouponAppListVO;
 import cn.wise.sc.consume.business.model.CouponDetailVO;
 import cn.wise.sc.consume.business.model.CouponListVO;
 import cn.wise.sc.consume.business.service.ISysCouponService;
+import cn.wise.sc.consume.business.wrapper.page.Query;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
@@ -14,6 +18,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -33,6 +39,9 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
 	@Autowired
 	private SysCouponMapper couponMapper;
 
+	@Resource
+	private SysCouponDetailMapper sysCouponDetailMapper;
+
 	@Override
 	public List<CouponListVO> getPage(Map<String, Object> map) {
 		List<CouponListVO> couponListVOS = couponMapper.getCouponPage(map);
@@ -47,8 +56,27 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
 
 	@Override
 	public List<CouponAppListVO> getCouponAppList(String coridc, String usridc) {
-		List<CouponAppListVO> list = couponMapper.getCouponAppList(coridc, usridc);
-		return list;
+		QueryWrapper<CouponAppListVO> qw=new QueryWrapper<>();
+		qw.eq("status",1);
+		qw.eq("isDelete",1);
+		List<CouponAppListVO> list = couponMapper.getCouponAppList(coridc, usridc ,qw);
+		List<CouponAppListVO> rts = new ArrayList<>(list.size());
+		if (list!=null){
+			for (CouponAppListVO couponAppListVO:list){
+				Long coupId = couponAppListVO.getId();
+				List<SysCouponDetail> byCouponId = sysCouponDetailMapper.getByCouponId(coupId);
+
+				for (SysCouponDetail sysCouponDetail:byCouponId){
+					boolean equals = sysCouponDetail.getIsReceive() == 0;
+					boolean equals1 = sysCouponDetail.getIsDelete() == 1;
+					if ((equals && equals1)){
+						rts.add(couponAppListVO);
+					}
+				}
+			}
+		}
+
+		return rts;
 	}
 
 }

consume-business/src/main/resources/application.yml

@@ -8,7 +8,7 @@ spring:
     active: dev
   datasource:
     # 192.168.110.84  admin!@#123
-    url: jdbc:mysql://192.168.110.84:3306/cmb_consumption?useUnicode=true&characterEncoding=UTF-8&useSSL=false&useTimezone=true&serverTimezone=CTT
+    url: jdbc:mysql://localhost:3306/cmb_consumption?useUnicode=true&characterEncoding=UTF-8&useSSL=false&useTimezone=true&serverTimezone=CTT
     username: root
     password: admin!@#123
     driverClassName: com.mysql.jdbc.Driver