Merge branch 'dev_v4.9.69_wh' of qmx/jy into feature/v4.9.69

src/jfw/modules/publicapply/src/config.json

@@ -75,5 +75,7 @@
   "configuration": {
     "bulletFrameStart": 1698020000,
     "bulletFrameEnd": 1698020000
-  }
+  },
+  "frequentContinuous": 2,
+  "screenNumb": 2
 }

src/jfw/modules/publicapply/src/subscribe/service/service.go

@@ -1,12 +1,12 @@
 package service
 
 import (
+	. "app.yhyue.com/moapp/jybase/api"
+	qu "app.yhyue.com/moapp/jybase/common"
 	"fmt"
+	"jy/src/jfw/modules/publicapply/src/config"
 	"jy/src/jfw/modules/publicapply/src/subscribe/entity"
 	"strings"
-
-	. "app.yhyue.com/moapp/jybase/api"
-	qu "app.yhyue.com/moapp/jybase/common"
 )
 
 func (this *ServiceStruct) OneProvinceSet() {
@@ -29,7 +29,12 @@ func (this *ServiceStruct) IsSub() {
 			return Result{Data: nil, Error_msg: Error_msg_1005}
 		}
 		newFN := entity.NewParamInfo(userId, this.Session())
-		return Result{Data: newFN.IsSub()}
+		returnData := map[string]interface{}{
+			"frequentContinuous": config.Config.FrequentContinuous,
+			"screenNumb":         config.Config.ScreenNumb,
+			"isSubscribe":        newFN.IsSub(),
+		}
+		return Result{Data: returnData}
 	}()
 	this.ServeJson(r)
 }