!增加查询广告是否开启接口

src/main/java/io/renren/application/common/controller/ChaoXiangController.java

@@ -43,8 +43,8 @@ public class ChaoXiangController {
         return sysPublicParamService.modifyAdsTime(dto);
     }
     @GetMapping("/hasStock")
-    @ApiOperation("查询领券库存情况 data>0 有库存 data=0 不看广告 data<0 无库存")
-    public Results hasStock(){
-        return sysPublicParamService.hasStock();
+    @ApiOperation("查询领券库存情况 data>0 有库存看广告 data=0 不看广告 data<0 无库存 ")
+    public Results hasStock(Integer checkTime){
+        return sysPublicParamService.hasStock(checkTime);
     }
 }

src/main/java/io/renren/application/common/service/SysPublicParamService.java

@@ -20,5 +20,5 @@ public interface SysPublicParamService extends IService<SysPublicParam> {
 
     Results modifyAdsTime(@RequestBody ChaoXiangTimeDto dto);
 
-    Results hasStock();
+    Results hasStock(Integer checkTime);
 }

src/main/java/io/renren/application/common/service/imp/SysPublicParamServiceImpl.java

@@ -147,7 +147,7 @@ public class SysPublicParamServiceImpl extends ServiceImpl<SysPublicParamMapper,
     }
 
     @Override
-    public Results hasStock() {
+    public Results hasStock(Integer checkTime) {
         SysPublicParam publicParam = getOne(Wrappers.<SysPublicParam>lambdaQuery().eq(SysPublicParam::getPublicKey,CHAO_XIANG_ADS_END_TIME));
         String time = "20:05:00";
         if (publicParam!=null&&StringUtils.isNotBlank(publicParam.getPublicValue())){
@@ -158,15 +158,26 @@ public class SysPublicParamServiceImpl extends ServiceImpl<SysPublicParamMapper,
         String endTimeStr = today.format(formatter)+" "+time;
         DateTimeFormatter endFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         LocalDateTime endTime = LocalDateTime.parse(endTimeStr,endFormatter);
-        if (today.isAfter(endTime)){
-            log.info("超出限制时间，不再强制要求观看广告");
-            return Results.success(0);
+        int i = LocalDateTime.now().getDayOfWeek().getValue();
+        SysPublicParam idParam = getOne(Wrappers.<SysPublicParam>lambdaQuery().eq(SysPublicParam::getPublicKey,CHAO_XIANG_PARAM_PRE+i));
+        String id = null;
+        if (Integer.valueOf(1).equals(checkTime)){
+            id = getWeekParam().getData();
+        }else{
+            if (publicParam ==null){
+                id = idParam.getPublicValue();
+            }
         }
+
         try {
-            String id = getWeekParam().getData();
+            getWeekParam().getData();
             log.info("开始查询库存 id:{}",getWeekParam().getData());
             Integer stock = ChaoXiangUtils.getStock(id);
             if (stock!=null&&stock>0){
+                if (today.isAfter(endTime)){
+                    log.info("超出限制时间，不再强制要求观看广告");
+                    return Results.success(0);
+                }
                 return Results.success(stock);
             }
         } catch (IOException e) {