Merge branch 'develop' into production

conf/app.conf

@@ -11,16 +11,11 @@ showStealConfig = false
 
 [mysql]
 dbhost = 127.0.0.1
-dbport = 3306
+dbport = 3308
 dbuser = root
-dbpasswd = 123456
+dbpasswd = mysql_ZRB5Ak
 dbbase = kami
 
-[redis]
-host = 127.0.0.1
-port = 6379
-db = 10
-
 [gateway]
 host = http://kami_gateway:12309/
 

go.mod

@@ -20,6 +20,7 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/duke-git/lancet/v2 v2.3.4 // indirect
 	github.com/fatih/color v1.12.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect

go.sum

@@ -21,6 +21,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/duke-git/lancet/v2 v2.3.4 h1:8XGI7P9w+/GqmEBEXYaH/XuNiM0f4/90Ioti0IvYJls=
+github.com/duke-git/lancet/v2 v2.3.4/go.mod h1:zGa2R4xswg6EG9I6WnyubDbFO/+A/RROxIbXcwryTsc=
 github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=
 github.com/elazarl/go-bindata-assetfs v1.0.1/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/fatih/color v1.12.0 h1:mRhaKNwANqRgUBGKmnI5ZxEk7QXmjQeCcuYFMX2bfcc=

internal/models/order/order_profit_info.go

@@ -1,6 +1,7 @@
 package order
 
 import (
+	"github.com/duke-git/lancet/v2/slice"
 	"strings"
 	"time"
 )
@@ -57,10 +58,18 @@ func GetOrderProfitListByBankOrderIdList(bankOrderIdList []string) []OrderProfit
 	if len(bankOrderIdList) == 0 {
 		return orderProfitList
 	}
-	_, err := o.QueryTable(ORDER_PROFIT_INFO).Filter("bank_order_id__in", bankOrderIdList).All(&orderProfitList)
-	if err != nil {
-		logs.Error("GetOrderProfitByBankOrderId fail：", err)
-	}
+	bankOrderIdList = slice.Unique(bankOrderIdList)
+	//按照100个为一组分组
+	//bankOrderIdList2 := slice.Chunk(bankOrderIdList, 100)
+	slice.ForEachConcurrent(slice.Chunk(bankOrderIdList, 100), func(index int, item []string) {
+		tmpOrderProfitList := make([]OrderProfitInfo, 0)
+		_, err := o.QueryTable(ORDER_PROFIT_INFO).Filter("bank_order_id__in", item).All(&tmpOrderProfitList)
+		if err != nil {
+			logs.Error("GetOrderProfitByBankOrderId fail：", err)
+			return
+		}
+		orderProfitList = append(orderProfitList, tmpOrderProfitList...)
+	}, 10)
 	return orderProfitList
 }
 

internal/utils/redis/client.go

@@ -1,35 +1,33 @@
 package redis
 
 import (
-	"boss/internal/config"
-	"fmt"
 	"github.com/go-redis/redis/v7"
 	"time"
 )
 
 // New 创建redis客户端
-func New() *redis.Client {
-	if Client != nil {
-		return Client
-	}
-	redisCfg, err := config.GetRedisConfig()
-	if err != nil {
-
-	}
-
-	Client = redis.NewClient(&redis.Options{
-		Addr:     fmt.Sprintf("%s:%s", redisCfg.Host, redisCfg.Host), // redis地址
-		Password: redisCfg.Password,                                  // 密码
-		DB:       redisCfg.DB,                                        // 使用默认数据库
-	})
-	return Client
-}
+//func New() *redis.Client {
+//	if Client != nil {
+//		return Client
+//	}
+//	redisCfg, err := config.GetRedisConfig()
+//	if err != nil {
+//
+//	}
+//
+//	Client = redis.NewClient(&redis.Options{
+//		Addr:     fmt.Sprintf("%s:%s", redisCfg.Host, redisCfg.Host), // redis地址
+//		Password: redisCfg.Password,                                  // 密码
+//		DB:       redisCfg.DB,                                        // 使用默认数据库
+//	})
+//	return Client
+//}
 
 var Client *redis.Client
 
-func init() {
-	New()
-}
+//func init() {
+//	New()
+//}
 
 // Set 设置key-value
 func Set(key string, value interface{}, expiration time.Duration) *redis.StatusCmd {