20241113 修改 redis select 数据库从2 -> 12

cmd/task.go

@@ -58,7 +58,7 @@ func main() {
 		log.Fatal(err)
 	}
 	client = util.GetRedis()
-	client.Select(2)
+	client.Select(12)
 	for rows.Next() {
 		rows.Scan(&oid, &timeStr, &mId, &delaySec)
 		client.HSet(orderPayKey, oid, fmt.Sprintf("%s;%d;%d", timeStr, mId, delaySec))
@@ -68,7 +68,7 @@ func main() {
 		select {
 		case <-ticker.C:
 			client = util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msCmd := client.HGetAllMap(orderPayKey)
 			if err := msCmd.Err(); err != nil {
 				log.Panicln(err)

main.go

@@ -195,7 +195,7 @@ func wxPaycbHandler(w http.ResponseWriter, req *http.Request) {
 				}
 				//inform admin
 				client := util.GetRedis()
-				client.Select(2)
+				client.Select(12)
 				msg := map[string]interface{}{
 					"user":    "system",
 					"orderid": orderItem.Id,
@@ -274,9 +274,9 @@ func main() {
 	}
 	config.Reload(*configFile)
 
-	port:=":"+config.IniConf.Section("server").Key("Listen").String()
-	if port!=":"{
-		httpAddr=&port
+	port := ":" + config.IniConf.Section("server").Key("Listen").String()
+	if port != ":" {
+		httpAddr = &port
 	}
 	var logger log.Logger
 	{
@@ -340,7 +340,7 @@ func main() {
 
 	jdlSrv := &service.JDLService{}
 
-	svc:=loggingMiddleware{
+	svc := loggingMiddleware{
 		UserService:         userSvc,
 		AuthService:         authSvc,
 		SearchService:       searchSrv,

service/groupblood_service.go

@@ -21,7 +21,7 @@ type GroupBloodService struct {
 	*WeixinService
 }
 
-//获取用户集采信息
+// 获取用户集采信息
 func (srv *GroupBloodService) GetGroupBloodInfo(cid int) (interface{}, error) {
 	strSql := `select id, name, start_time,end_time from (
 		select jicai_id from t_jicai_detail where custom_id = ? ) t1 inner join t_jicai t2 on t1.jicai_id = t2.id where t2.start_time < ? and t2.end_time > ? limit 1`
@@ -141,7 +141,7 @@ func (srv *GroupBloodService) Enqueue(subjectId, cid int) (interface{}, error) {
 	tx.Commit()
 	go func() {
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		msg := map[string]interface{}{
 			"user":          "system",
 			"subjectId":     subjectId,
@@ -214,7 +214,7 @@ func (srv *GroupBloodService) Next(subjectId int, operType int) (interface{}, er
 	}
 	go func() {
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		msg := map[string]interface{}{
 			"user":      "system",
 			"subjectId": subjectId,

service/order_service.go

@@ -348,7 +348,7 @@ func (srv *OrderService) AddOrder(orderItem *entity.Order, city_id int, city str
 		}
 		if orderItem.IsNeedPay != "N" {
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			client.HSet("order_unpay", orderItem.Id, fmt.Sprintf("%s;%d", orderItem.CreatedAt, orderItem.MaterialId))
 		}
 		//update sale num of product
@@ -357,7 +357,7 @@ func (srv *OrderService) AddOrder(orderItem *entity.Order, city_id int, city str
 	go func() {
 		if util.SourceCheck(orderItem.Source) && orderItem.Source != "lianren" {
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msg := map[string]interface{}{
 				"user":    "system",
 				"orderid": orderItem.Id,
@@ -483,7 +483,7 @@ func (srv *OrderService) AddOrderInner(orderItem *entity.Order, city_id int, cit
 			fmt.Println(err)
 		}
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		client.HSet("order_unpay", orderItem.Id, fmt.Sprintf("%s;%d", orderItem.CreatedAt, orderItem.MaterialId))
 		//update sale num of product
 		db.Exec("update t_product set sale_num = sale_num + 1 where id in (" + util.IntJoin(productIds, ",") + ");")
@@ -731,8 +731,6 @@ func (srv *OrderService) AddOrderFCode(orderItem *entity.Order, city_id int, cit
 	return orderItem, nil
 }
 
-
-
 // 20240122 创建普通订单以后创建普通非支付订单可以调用次方法
 func AddOrderNormal(orderItem *entity.Order) (string, error) {
 	db := util.GetWriteSqlDB()
@@ -1070,7 +1068,7 @@ func (srv *OrderService) Pay(orderItem *entity.Order, extra map[string]string) (
 			srv.firstGiveTicket(orderDb.CustomMobile)
 			//inform admin
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msg := map[string]interface{}{
 				"user":    "system",
 				"orderid": orderItem.Id,
@@ -1110,7 +1108,7 @@ AFTERPAY:
 	go func() {
 		if util.SourceCheck(orderDb.Source) {
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msg := map[string]interface{}{
 				"user":    "system",
 				"orderid": orderDb.Id,
@@ -1124,11 +1122,10 @@ AFTERPAY:
 	return payResult, nil
 }
 
-
 // 从redis删除该订单未支付状态并发布消息通知订单状态变更
 func delUnpayFromRedis(orderId string) {
 	client := util.GetRedis()
-	client.Select(2)
+	client.Select(12)
 	client.HDel("order_unpay", orderId)
 }
 
@@ -1227,7 +1224,7 @@ func (srv *OrderService) wxPay(orderItem *entity.Order, extra map[string]string)
 	//小程序支付时保存prepare_id 到redis,用于后续支付成功发送模板消息
 	if extra["wx_type"] == "mp" {
 		rclient := util.GetRedis()
-		rclient.Select(2)
+		rclient.Select(12)
 		rclient.HSet("mp_prepare_id", orderItem.Id, rel.PrepayId)
 	}
 	resultItem["sign"] = wxJsSdk.ComputePaySignature(resultItem, config.IniConf.Section("weixin").Key("wx.apikey").Value())
@@ -1615,7 +1612,7 @@ func (srv *OrderService) WxPayCB(payResult map[string]string) {
 		JUMPSMS:
 			//inform admin
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msg := map[string]interface{}{
 				"user":    "system",
 				"orderid": orderItem[0].Id,
@@ -1743,7 +1740,7 @@ func (srv *OrderService) AliPayCB(payResult map[string]string) {
 			}
 			//inform admin
 			client := util.GetRedis()
-			client.Select(2)
+			client.Select(12)
 			msg := map[string]interface{}{
 				"user":    "system",
 				"orderid": orderItem[0].Id,
@@ -1847,7 +1844,7 @@ func (srv *OrderService) SendWxPaySuccessMsg(params map[string]string) (interfac
 	if params["wx_type"] == "mp" {
 
 		rclient := util.GetRedis()
-		rclient.Select(2)
+		rclient.Select(12)
 		strCmd := rclient.HGet("mp_prepare_id", nameList[0].OrderId)
 		if terr := strCmd.Err(); terr != nil {
 			log.Println(terr)
@@ -2220,7 +2217,7 @@ func (srv *OrderService) DelOrder(oid string) (bool, error) {
 func pushOrderStatus(orderId, source string, status int) {
 	if util.SourceCheck(source) {
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		msg := map[string]interface{}{
 			"user":    "system",
 			"orderid": orderId,
@@ -2619,7 +2616,7 @@ func UpdateOrderCase4(oitem *entity.Order) (bool, error) {
 	tx.Commit()
 	if util.SourceCheck(old.Source) {
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		msg := map[string]interface{}{
 			"user":    "system",
 			"orderid": old.Id,
@@ -2719,7 +2716,6 @@ func (srv *OrderService) GetOrderInfoByCode(code string) (interface{}, error) {
 	return srv.IOrder.GetByCode(code)
 }
 
-
 func (srv *OrderService) GetOrderInfoByNurse(orderId string, deliverUserId int) (interface{}, error) {
 	db := util.GetSqlDB()
 	var oid string
@@ -3070,8 +3066,6 @@ func lianRenPrice(list []*entity.ProductDB, shopId int) {
 	}
 }
 
-
-
 // 20230830 拆分历史表
 // 提取 addorder addorderFcode addorderFcodeYuanyi addGenorder 的库存检查
 func Stocklimit(mobile string, productIds []int, productQuantityMap map[int]int, isZFB bool) ([]*entity.ProductDB, error) {

service/user_service.go

@@ -356,7 +356,7 @@ func (userService *UserService) LoginCoupons(params map[string]string) (interfac
 			return
 		}
 		client := util.GetRedis()
-		client.Select(2)
+		client.Select(12)
 		client.HSet("coupons_unsend", mobile, time.Now().Format("2006-01-02 15:04:05"))
 	}()
 

service/weixin_service.go

@@ -288,7 +288,7 @@ func getWxRedis() *redis.Client {
 
 func getWxRedisValue(key string) (string, error) {
 	client := getWxRedis()
-	client.Select(2)
+	client.Select(12)
 	strCmd := client.Get(key)
 	if err := strCmd.Err(); err != nil {
 		return "", err
@@ -298,7 +298,7 @@ func getWxRedisValue(key string) (string, error) {
 
 func setWxRedisValue(key, val string, period int64) (bool, error) {
 	client := getWxRedis()
-	client.Select(2)
+	client.Select(12)
 	statusCmd := client.Set(key, val)
 	if err := statusCmd.Err(); err != nil {
 		return false, err

util/redis.go

@@ -40,7 +40,7 @@ func GetRedis() *redis.Client {
 
 func GetRedisValue(key string) (string, error) {
 	client := GetRedis()
-	client.Select(2)
+	client.Select(12)
 	strCmd := client.Get(key)
 	if err := strCmd.Err(); err != nil {
 		return "", err
@@ -50,7 +50,7 @@ func GetRedisValue(key string) (string, error) {
 
 func SetRedisValue(key, val string, period int64) (bool, error) {
 	client := GetRedis()
-	client.Select(2)
+	client.Select(12)
 	statusCmd := client.Set(key, val)
 	if err := statusCmd.Err(); err != nil {
 		return false, err