优惠卷过滤

consume-business/src/main/java/cn/wise/sc/consume/business/entity/cmbnoenet/CMBOneNetController.java

 package cn.wise.sc.consume.business.entity.cmbnoenet;
 
+import cn.hutool.core.lang.Assert;
 import cn.wise.sc.consume.business.entity.SysMember;
 import cn.wise.sc.consume.business.entity.cmbnoenet.model.AuthCodeEntry;
 import cn.wise.sc.consume.business.entity.cmbnoenet.model.BaseResponse;
@@ -9,6 +10,7 @@ import cn.wise.sc.consume.business.model.SysEnterpriseDto;
 import cn.wise.sc.consume.business.service.impl.CMBOneNetPayService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.http.util.Asserts;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.*;
@@ -126,6 +128,10 @@ public class CMBOneNetController {
 	@ApiOperation(value = "领券列表")
 	@GetMapping("/getCouponAppList")
 	public BaseResponse getCouponAppList(String coridc, String usridc) {
+    	log.debug("======{}=======",coridc );
+    	log.debug("================{}=============",usridc);
+		Asserts.notEmpty(coridc,"coridc字段不允许为空！");
+		Assert.notEmpty(usridc,"usridc当前值为{},不允许为空！",usridc);
 		return CMBOneNetPayService.getCouponAppList(coridc, usridc);
 	}
 

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

@@ -27,4 +27,6 @@ public interface SysUserCouponMapper extends BaseMapper<SysUserCoupon> {
 
 	void updateByCouponCode(@Param("param") String couponCode, @Param("status") Integer status);
 
+//	List<SysUserCoupon> getByCouponId(@Param("param") String couponId);
+
 }

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

@@ -2,15 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.wise.sc.consume.business.mapper.SysUserCouponMapper">
 
-
         <update id="updateByCouponCode">
             update sys_user_counp set is_use = #{status} where coupon_code = #{param};
         </update>
+
     <select id="getCouponCode" resultType="cn.wise.sc.consume.business.entity.SysUserCoupon">
         SELECT suc.*,scd.coupon_code AS couponcodes
         FROM sys_user_coupon suc
         LEFT JOIN sys_coupon_detail scd ON  suc.coupon_detail_id = scd.id
-
     </select>
 
+<!--    <select id="getByCouponId" resultType="cn.wise.sc.consume.business.entity.SysUserCoupon">-->
+<!--        SELECT suc.*,scd.id AS couponId-->
+<!--        FROM sys_user_coupon suc-->
+<!--        LEFT JOIN sys_coupon_detail scd ON  suc.coupon_detail_id = scd.id-->
+<!--    </select>-->
+
 </mapper>

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

@@ -4,13 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.wise.sc.consume.business.entity.SysCouponDetail;
-import cn.wise.sc.consume.business.entity.SysEnterprise;
-import cn.wise.sc.consume.business.entity.SysMember;
-import cn.wise.sc.consume.business.entity.SysUserCoupon;
+import cn.wise.sc.consume.business.entity.*;
 import cn.wise.sc.consume.business.entity.cmbnoenet.AllInOneNetUtil;
 import cn.wise.sc.consume.business.entity.cmbnoenet.model.*;
 import cn.wise.sc.consume.business.mapper.SysEnterpriseMapper;
+import cn.wise.sc.consume.business.mapper.SysUserCouponMapper;
 import cn.wise.sc.consume.business.model.CouponAppListVO;
 import cn.wise.sc.consume.business.model.EnterpriseAppListVO;
 import cn.wise.sc.consume.business.model.ReceivedAppListVO;
@@ -35,12 +33,11 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 招行一卡通 支付
@@ -207,6 +204,8 @@ public class CMBOneNetPayService {
 	}
 
 
+	@Resource
+	private SysUserCouponMapper sysUserCouponMapper;
 
 	/**领取优惠券
 	 *
@@ -224,6 +223,15 @@ public class CMBOneNetPayService {
 			if(list == null || list.size()<=0){
 				return BaseResponse.error("无可用优惠券!", this.getClass().getName());
 			}
+
+			Set<Long> detailIds = list.stream().map(SysCouponDetail::getId).collect(Collectors.toSet());
+			QueryWrapper<SysUserCoupon> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("user_id",usridc);
+			queryWrapper.in("coupon_detail_id",detailIds);
+			Integer count = sysUserCouponMapper.selectCount(queryWrapper);
+			if (count > 0){
+				return BaseResponse.error("已领取！", this.getClass().getName());
+			}
 			SysCouponDetail couponDetail = list.get(0);
 			SysUserCoupon userCoupon = new SysUserCoupon();
 			userCoupon.setUserId(usridc);

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

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