1、调整是否已领取的校验展示

2、发布优惠卷过期时间的调整

fs-service/src/main/java/com/fs/his/domain/FsCoupon.java

@@ -66,6 +66,18 @@ public class FsCoupon extends BaseEntity
 
     private String cateIds;
 
+    /** 是否已领取 */
+    private Boolean claimed;
+
+
+    public Boolean getClaimed() {
+        return claimed;
+    }
+
+    public FsCoupon setClaimed(Boolean claimed) {
+        this.claimed = claimed;
+        return this;
+    }
 
     public String getCateIds() {
         return cateIds;

fs-service/src/main/java/com/fs/his/service/IFsCouponService.java

@@ -19,6 +19,14 @@ import com.fs.his.vo.FsCouponListVO;
  */
 public interface IFsCouponService
 {
+    /**
+     * 查询优惠券
+     *
+     * @param couponId 优惠券主键
+     * @return 优惠券
+     */
+    public FsCoupon selectFsCouponByCouponId(Long couponId,Long userId);
+
     /**
      * 查询优惠券
      *

fs-service/src/main/java/com/fs/his/service/impl/FsCouponServiceImpl.java

@@ -4,6 +4,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.utils.DateUtils;
@@ -45,9 +46,25 @@ public class FsCouponServiceImpl implements IFsCouponService
      * @return 优惠券
      */
     @Override
+    public FsCoupon selectFsCouponByCouponId(Long couponId,Long userId)
+    {
+        FsCoupon fsCoupon = fsCouponMapper.selectFsCouponByCouponId(couponId);
+        if(ObjectUtils.isNotEmpty(userId)){
+            fsCoupon.setClaimed(fsUserCouponMapper.checkReceive(userId,fsCoupon.getCouponId())>0);
+        }
+        return fsCoupon;
+    }
+    /**
+     * 查询优惠券
+     *
+     * @param couponId 优惠券主键
+     * @return 优惠券
+     */
+    @Override
     public FsCoupon selectFsCouponByCouponId(Long couponId)
     {
-        return fsCouponMapper.selectFsCouponByCouponId(couponId);
+        FsCoupon fsCoupon = fsCouponMapper.selectFsCouponByCouponId(couponId);
+        return fsCoupon;
     }
 
     /**

fs-service/src/main/java/com/fs/his/service/impl/FsUserCouponServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.his.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
 import com.fs.common.exception.CustomException;
@@ -163,6 +164,15 @@ public class FsUserCouponServiceImpl implements IFsUserCouponService
             fsUserCoupon.setCompanyId(param.getCompanyId());
             System.out.println("销售发送人id:"+ fsUserCoupon.getCompanyUserId());
         }
+
+        if (coupon.getLimitType() == 2){
+            long limitDay = coupon.getLimitDay().longValue() * 24 * 60 * 60 * 1000;
+            long time = new Date().getTime();
+            fsUserCoupon.setLimitTime(new Date(limitDay+time));
+        }else {
+            fsUserCoupon.setLimitTime(coupon.getLimitTime());
+        }
+
         fsUserCoupon.setStatus(0);
         int i = fsUserCouponMapper.insertFsUserCoupon(fsUserCoupon);
         coupon.setRemainNumber(coupon.getRemainNumber()-1);

fs-user-app/src/main/java/com/fs/app/controller/CouponController.java

@@ -63,7 +63,7 @@ public class CouponController extends  AppBaseController {
     @GetMapping("/getCouponById")
     public R getCouponById(@RequestParam("couponId")Long couponId)
     {
-        FsCoupon coupon =couponService.selectFsCouponByCouponId(couponId);
+        FsCoupon coupon =couponService.selectFsCouponByCouponId(couponId,Long.parseLong(getUserId()));
         return R.ok().put("data",coupon);
     }