优惠卷过滤

consume-business/src/main/java/cn/wise/sc/consume/business/controller/SysCouponController.java

@@ -6,6 +6,7 @@ import cn.wise.sc.consume.business.entity.SysCoupon;
 import cn.wise.sc.consume.business.entity.SysCouponDetail;
 import cn.wise.sc.consume.business.entity.SysUser;
 import cn.wise.sc.consume.business.mapper.SysCouponDetailMapper;
+import cn.wise.sc.consume.business.mapper.SysCouponMapper;
 import cn.wise.sc.consume.business.model.CouponDetailDTO;
 import cn.wise.sc.consume.business.model.CouponDetailVO;
 import cn.wise.sc.consume.business.model.CouponListVO;
@@ -68,6 +69,8 @@ public class SysCouponController {
 	private SysCouponDetailMapper couponDetailMapper;
 	@Autowired
 	private CommonService  commonService;
+	@javax.annotation.Resource
+	private SysCouponMapper sysCouponMapper;
 
 	@ApiOperation(value = "优惠券列表")
 	@ApiImplicitParams(value = {
@@ -81,14 +84,15 @@ public class SysCouponController {
 	public Wrapper getCouponPage(PageTableRequest request, String couponName, Long enterpriseId, Integer status) {
 		try {
 			couponDetailService.beVerdue();
-			IPage<CouponListVO> page = new Page<>(request.getCurrent(), request.getSize());
+			Page<CouponListVO> page = new Page<>(request.getCurrent(), request.getSize());
 			Map<String, Object> map = new HashMap<>();
 			map.put("couponName", couponName);
 			map.put("enterpriseId", enterpriseId);
 			map.put("status", status);
-			List<CouponListVO> couponListVOS = couponService.getPage(map);
-			page.setRecords(couponListVOS).setTotal(couponListVOS.size());
-			return WrapMapper.wrap(200,"成功",page);
+			IPage<CouponListVO> pages=sysCouponMapper.getCouponPage(page,map);
+//			List<CouponListVO> couponListVOS = couponService.getPage(request,map);
+//			page.setRecords(couponListVOS).setTotal(couponListVOS.size());
+			return WrapMapper.wrap(200,"成功",pages);
 		} catch (Exception e) {
 			log.debug("优惠券列表{}", e);
 		}

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

 package cn.wise.sc.consume.business.mapper;
 
-import cn.hutool.db.Page;
 import cn.wise.sc.consume.business.entity.SysCoupon;
+import cn.wise.sc.consume.business.entity.SysCouponDetail;
 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.model.PageTableRequest;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -22,13 +25,13 @@ import java.util.Map;
  */
 public interface SysCouponMapper extends BaseMapper<SysCoupon> {
 
-	List<CouponListVO> getCouponPage(@Param("map") Map<String,Object> map);
+	IPage<CouponListVO> getCouponPage(@Param("page") Page page, @Param("map") Map<String,Object> map);
 
 	CouponDetailVO getCouponDetail(Long id);
 
 	List<CouponAppListVO> getCouponAppList(@Param("coridc") String coridc, @Param("usridc") String usridc, QueryWrapper<CouponAppListVO> qw);
 
-
+	List<SysCoupon> getById(@Param("param")Long id);
 
 
 

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

@@ -46,7 +46,11 @@
 
 
 
-
+    <select id="getById" resultType="cn.wise.sc.consume.business.entity.SysCoupon">
+            select sc.*
+            from sys_coupon sc
+            where id = #{param};
+        </select>
 
 
 

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

@@ -4,6 +4,9 @@ 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 cn.wise.sc.consume.business.model.PageTableRequest;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import java.util.List;
 import java.util.Map;
@@ -18,7 +21,7 @@ import java.util.Map;
  */
 public interface ISysCouponService extends IService<SysCoupon> {
 
-	List<CouponListVO> getPage(Map<String,Object> map);
+	IPage<CouponListVO> getPage(Page request, Map<String, Object> map);
 
 	CouponDetailVO getCouponDetail(Long id);
 

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

@@ -8,9 +8,12 @@ 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.model.PageTableRequest;
 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.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
@@ -42,9 +45,12 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
 	@Resource
 	private SysCouponDetailMapper sysCouponDetailMapper;
 
+	@Resource
+	private SysCouponMapper sysCouponMapper;
+
 	@Override
-	public List<CouponListVO> getPage(Map<String, Object> map) {
-		List<CouponListVO> couponListVOS = couponMapper.getCouponPage(map);
+	public IPage<CouponListVO> getPage(Page request, Map<String, Object> map) {
+		IPage<CouponListVO> couponListVOS = couponMapper.getCouponPage(request,map);
 		log.debug("优惠券列表{}");
 		return couponListVOS;
 	}
@@ -64,11 +70,11 @@ public class SysCouponServiceImpl extends ServiceImpl<SysCouponMapper, SysCoupon
 		if (list!=null){
 			for (CouponAppListVO couponAppListVO:list){
 				Long coupId = couponAppListVO.getId();
-				List<SysCouponDetail> byCouponId = sysCouponDetailMapper.getByCouponId(coupId);
+				List<SysCoupon> byCouponId = sysCouponMapper.getById(coupId);
 
-				for (SysCouponDetail sysCouponDetail:byCouponId){
-					boolean equals = sysCouponDetail.getIsReceive() == 0;
-					boolean equals1 = sysCouponDetail.getIsDelete() == 1;
+				for (SysCoupon sysCoupon:byCouponId){
+					boolean equals = sysCoupon.getStatus() == 1;
+					boolean equals1 = sysCoupon.getIsDelete() == 1;
 					if ((equals && equals1)){
 						rts.add(couponAppListVO);
 					}