|
@@ -6,6 +6,7 @@ import (
|
|
IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/rpc/init"
|
|
IC "bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXSubscribe/rpc/init"
|
|
"context"
|
|
"context"
|
|
"fmt"
|
|
"fmt"
|
|
|
|
+ "github.com/gogf/gf/v2/frame/g"
|
|
"strconv"
|
|
"strconv"
|
|
"strings"
|
|
"strings"
|
|
"time"
|
|
"time"
|
|
@@ -145,7 +146,12 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
|
|
// 判断有没有省份订阅包
|
|
// 判断有没有省份订阅包
|
|
o_buyset_p, o_buyset_p_b := subinfo["o_buyset_p"].(map[string]interface{})
|
|
o_buyset_p, o_buyset_p_b := subinfo["o_buyset_p"].(map[string]interface{})
|
|
if o_buyset_p != nil && o_buyset_p_b {
|
|
if o_buyset_p != nil && o_buyset_p_b {
|
|
- resp.Data.Subsetinfo.Areacount += common.Int64All(o_buyset_p["areacount"])
|
|
|
|
|
|
+ if common.Int64All(o_buyset_p["areacount"]) > 0 {
|
|
|
|
+ resp.Data.Subsetinfo.Areacount += common.Int64All(o_buyset_p["areacount"])
|
|
|
|
+ } else if common.Int64All(o_buyset_p["districtcount"]) == -1 {
|
|
|
|
+ resp.Data.Subsetinfo.Areacount = -1
|
|
|
|
+ }
|
|
|
|
+
|
|
if o_area_p, ok := subinfo["o_area_p"].(map[string]interface{}); ok {
|
|
if o_area_p, ok := subinfo["o_area_p"].(map[string]interface{}); ok {
|
|
resp.Data.Subsetinfo.Area = common.MapToJson(o_area_p)
|
|
resp.Data.Subsetinfo.Area = common.MapToJson(o_area_p)
|
|
}
|
|
}
|
|
@@ -173,6 +179,7 @@ func (l *GetSubSomeInfoLogic) GetSubSomeInfo(in *bxsubscribe.SomeInfoReq) (*bxsu
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ g.Dump("ccccc", resp)
|
|
return resp, nil
|
|
return resp, nil
|
|
}
|
|
}
|
|
|
|
|