|
|
@@ -3,7 +3,6 @@ package bankapi
|
|
|
import (
|
|
|
"dashoo.cn/backend/api/business/paymentinfo"
|
|
|
"dashoo.cn/backend/api/models"
|
|
|
- baseparameter "dashoo.cn/business/parameter"
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
"io/ioutil"
|
|
|
@@ -38,22 +37,10 @@ func (this *ICBCController) GetBillList() {
|
|
|
json.Unmarshal(ret, &datainfo)
|
|
|
if datainfo.CurrentItemCount > 0 {
|
|
|
var errInfo ErrorInfo
|
|
|
- paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
|
|
|
- startDayStr := paramSvc.GetBaseparameterMessage("PAYCHECK", "paramset", "permitPayStartDay")
|
|
|
- endDayStr := paramSvc.GetBaseparameterMessage("PAYCHECK", "paramset", "permitPayEndDay")
|
|
|
- if startDayStr == "" {
|
|
|
- startDayStr = "2"
|
|
|
- }
|
|
|
- if endDayStr == "" {
|
|
|
- endDayStr = "26"
|
|
|
- }
|
|
|
- startDay, _ := strconv.Atoi(startDayStr)
|
|
|
- endDay, _ := strconv.Atoi(endDayStr)
|
|
|
- today := time.Now().Day()
|
|
|
- if today < startDay || today > endDay {
|
|
|
- // 存在交费订单,但处于不允许交费时间段内
|
|
|
- errInfo.Message = "请于每月" + startDayStr + "日-" + endDayStr + "日确认交费!"
|
|
|
- errInfo.Code = -1
|
|
|
+ // 查询是否在交费时间内
|
|
|
+ isPayTimeRet := svc.IsPayTime()
|
|
|
+ json.Unmarshal(isPayTimeRet, &errInfo)
|
|
|
+ if errInfo.Code == -1 {
|
|
|
this.Data["json"] = &errInfo
|
|
|
this.ServeJSON()
|
|
|
return
|