1、调整展示时间数据不对

fs-service/src/main/java/com/fs/his/mapper/FsUserCouponMapper.java

@@ -93,7 +93,7 @@ public interface FsUserCouponMapper
     @Select("SELECT COUNT(c.coupon_id) FROM fs_user_coupon u LEFT JOIN fs_coupon c ON u.coupon_id=c.coupon_id WHERE u.user_id=#{userId} and c.coupon_id=#{couponId}")
     Integer selectFsUserCouponByUserIdTypeCount(@Param("userId") Long userId,@Param("couponId")Long couponId);
     @Select({"<script> " +
-            "select uc.coupon_code,uc.status,uc.use_time,c.limit_time,c.title,c.price,c.min_price  from fs_user_coupon uc left join fs_coupon c on c.coupon_id=uc.coupon_id    " +
+            "select uc.coupon_code,uc.status,uc.use_time,IFNULL(uc.limit_time, c.limit_time) as limit_time,c.title,c.price,c.min_price  from fs_user_coupon uc left join fs_coupon c on c.coupon_id=uc.coupon_id    " +
             "where 1=1  " +
             "<if test = ' maps.userId != null '> " +
             "and uc.user_id = #{maps.userId} " +

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

@@ -173,6 +173,13 @@ public class FsCouponServiceImpl implements IFsCouponService
         userCoupon.setCreateTime(new Date());
         userCoupon.setCompanyUserId(param.getCompanyUserId());
         userCoupon.setCompanyId(param.getCompanyId());
+        if (coupon.getLimitType() == 2){
+            long limitDay = coupon.getLimitDay().longValue() * 24 * 60 * 60 * 1000;
+            long time = new Date().getTime();
+            userCoupon.setLimitTime(new Date(limitDay+time));
+        }else {
+            userCoupon.setLimitTime(coupon.getLimitTime());
+        }
         if(fsUserCouponMapper.insertFsUserCoupon(userCoupon)>0){
             //更新剩余数量
             fsCouponMapper.updateRemainCount(coupon.getCouponId());

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

@@ -30,15 +30,18 @@ public class AppBaseController {
 
 	public String getUserId()
 	{
-		String headValue =  ServletUtils.getRequest().getHeader("APPToken");
-		if (StringUtils.isNotEmpty(headValue)){
-			Claims claims=jwtUtils.getClaimByToken(headValue);
+		Object userId = ServletUtils.getRequest().getAttribute("userId");
+		if (userId != null) {
+			return userId.toString();
+		}
+		String token = ServletUtils.getRequest().getHeader(jwtUtils.getHeader());
+		if (StringUtils.isBlank(token)) {
+			token = ServletUtils.getRequest().getParameter(jwtUtils.getHeader());
+		}
+		if (StringUtils.isNotEmpty(token)){
+			Claims claims=jwtUtils.getClaimByToken(token);
 			if(claims!=null){
-				String userId = claims.getSubject().toString();
-				return userId;
-			}
-			else{
-				return null;
+				return claims.getSubject();
 			}
 		}
 		return null;

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

@@ -63,6 +63,7 @@ public class DrugReportController extends AppBaseController {
 
     @ApiOperation("获取报告列表")
     @GetMapping("/getDrugReportList")
+    @Login
     public R getDrugReportList(FsDrugReportListUParam param)
     {
         param.setUserId(Long.parseLong(getUserId()));