feat: 新增亿亿单位转换

jyBXBase/rpc/internal/logic/includedlogic.go

@@ -7,7 +7,6 @@ import (
 	"jyBXBase/rpc/internal/svc"
 	"jyBXBase/rpc/model"
 	"jyBXBase/rpc/type/bxbase"
-	"log"
 
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -39,9 +38,6 @@ func (l *IncludedLogic) Included(in *bxbase.AppIdReq) (*bxbase.IncludedResp, err
 	data := &model.IncludedData{}
 	if jyIncludedData := redis.Get("other", "jyIncludedData"); jyIncludedData != nil {
 		data, _ = common.JsonUnmarshal(jyIncludedData, &model.IncludedData{}).(*model.IncludedData)
-
-		log.Println(data)
-		log.Println(jyIncludedData)
 	} else {
 		includeData, err := include.GetIncludedData()
 		if err != nil || includeData == nil {

jyBXBase/rpc/model/included.go

@@ -117,13 +117,13 @@ func (this *Included) GetIncludedData() (*IncludedData, error) {
 }
 
 //格式输出数据
-//万亿、亿、万 只有一位的时候保留1位小数点 两位及以上不保留  1.1亿  11亿
+//亿亿、万亿、亿、万 只有一位的时候保留1位小数点 两位及以上不保留  1.1亿  11亿
 func formdataNum(num int64) (floatNum float64, unit string) {
 	s_num := strconv.Itoa(int(num))
 	len_m := len(s_num)
 	m := ""
-	indexArr := []int{13, 9, 5}
-	unitArr := []string{"万亿", "亿", "万"}
+	indexArr := []int{17, 13, 9, 5}
+	unitArr := []string{"亿亿", "万亿", "亿", "万"}
 
 	for k, v := range indexArr {
 		if len_m > v {