wip:数据库初始化

src/util/db.go → src/config/db.go

@@ -1,4 +1,4 @@
-package util
+package config
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
@@ -10,7 +10,6 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"log"
 	"os"
-	. "qmx_admin/src/config"
 	//clickhouseDriver "github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/otherPackage/mongo_util"

src/customerService/advancedProjectService.go

@@ -34,7 +34,7 @@ func GetTitleService(noticeAddress string) (string, string) {
 	if infoId == "" {
 		return "", ""
 	}
-	baseData := util.GlobalCommonDataDB.FindOne(util.BsaeInfo, map[string]interface{}{"infoId": infoId}, "title", "")
+	baseData := config.GlobalCommonDataDB.FindOne(util.BsaeInfo, map[string]interface{}{"infoId": infoId}, "title", "")
 	if baseData == nil {
 		return "", ""
 	}
@@ -42,12 +42,12 @@ func GetTitleService(noticeAddress string) (string, string) {
 }
 func ProjectSaveService(param *Project, userName, infoId, title string, userId int) (bool, error) {
 	//userId获取
-	userData := util.BaseDB.FindOne(util.BaseUser, map[string]interface{}{"phone": param.Phone}, "id", "")
+	userData := config.BaseDB.FindOne(util.BaseUser, map[string]interface{}{"phone": param.Phone}, "id", "")
 	if userData == nil {
 		return false, errors.New("该手机号用户不存在")
 	}
 	//信息保存
-	ok := util.BaseDB.Insert(util.LeadprojectPush, map[string]interface{}{
+	ok := config.BaseDB.Insert(util.LeadprojectPush, map[string]interface{}{
 		"info_id":       infoId,
 		"user_id":       (*userData)["id"],
 		"ispush":        param.IsSend,
@@ -112,9 +112,9 @@ func ProjectListService(param *ProjectListData, isAll bool, userName string) (*[
 		querys = append(querys, fmt.Sprintf("  and  a.lastvisit_time <='%s'", param.EntTime))
 	}
 	sql = fmt.Sprintf(sql, util.LeadprojectPush, util.BaseUser, phoneSql, util.BsaeInfo, titleSql, strings.Join(querys, "  "))
-	count := util.BaseDB.CountBySql("select  count(a.id) " + sql)
+	count := config.BaseDB.CountBySql("select  count(a.id) " + sql)
 	sql += fmt.Sprintf(" ORDER BY a.create_time desc limit  %d ,%d", param.Offset, param.PageSize)
-	list := util.BaseDB.SelectBySql(findSql + sql)
+	list := config.BaseDB.SelectBySql(findSql + sql)
 	if list != nil && len(*list) > 0 {
 		for i := 0; i < len(*list); i++ {
 			(*list)[i]["oldUrl"] = config.SysConfigs.JyWebDomain + "/article/content/" + encrypt.EncodeArticleId2ByCheck(common.InterfaceToStr((*list)[i]["info_id"])) + ".html"

src/customerService/advancedProjectsController.go

@@ -2,8 +2,8 @@ package customerService
 
 import (
 	"errors"
-	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/config"
+	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/util"
 )
 
@@ -67,7 +67,7 @@ func ProjectSave(context *admin.Context) (interface{}, error) {
 	}, err
 }
 
-//公告标题获取
+// 公告标题获取
 func GetTitle(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		NoticeAddress string `form:"noticeAddress"`
@@ -90,7 +90,7 @@ func GetTitle(context *admin.Context) (interface{}, error) {
 	}, err
 }
 
-//用户信息获取
+// 用户信息获取
 func GetUser(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Phone string `form:"phone"`
@@ -104,7 +104,7 @@ func GetUser(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("手机号必填")
 	}
 	//userId获取
-	userData := util.BaseDB.FindOne(util.BaseUser, map[string]interface{}{"phone": param.Phone}, "id", "")
+	userData := config.BaseDB.FindOne(util.BaseUser, map[string]interface{}{"phone": param.Phone}, "id", "")
 	if userData == nil {
 		return nil, errors.New("该手机号用户不存在")
 	} else {

src/customerService/customController.go

@@ -3,13 +3,12 @@ package customerService
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"errors"
+	"github.com/tealeg/xlsx"
 	"io/ioutil"
 	"log"
-	"qmx_admin/src/util"
-
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/system/utils"
-	"github.com/tealeg/xlsx"
 )
 
 type customMsg struct {
@@ -81,7 +80,7 @@ func SingleAdd(context *admin.Context) (interface{}, error) {
 	}
 	//判断是否是剑鱼用户
 	//userData := &map[string]interface{}{}
-	userData, ok := util.MQFW.FindById("user", param.UserId, `"s_phone":1,"s_m_phone":1`)
+	userData, ok := config.MQFW.FindById("user", param.UserId, `"s_phone":1,"s_m_phone":1`)
 	if userData != nil && len(*userData) > 0 && ok {
 		phone := ""
 		if common.ObjToString((*userData)["s_phone"]) != "" {

src/customerService/customService.go

@@ -50,8 +50,8 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 	// 更新消息
 	if param.Id != 0 {
 		msgLogId = strconv.Itoa(param.Id)
-		isOk := util.JysqlDB.ExecTx("更新消息出错", func(tx *sql.Tx) bool {
-			ok1 := util.JysqlDB.DeleteByTx(tx, "sendmsg_customer_info", map[string]interface{}{"msg_id": param.Id})
+		isOk := config.JysqlDB.ExecTx("更新消息出错", func(tx *sql.Tx) bool {
+			ok1 := config.JysqlDB.DeleteByTx(tx, "sendmsg_customer_info", map[string]interface{}{"msg_id": param.Id})
 			var args []interface{}
 			for _, val := range param.UserArr {
 				userIdArr = append(userIdArr, common.ObjToString(val["user_id"]))
@@ -62,8 +62,8 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				args = append(args, time.Now().Format(date.Date_Full_Layout))
 				args = append(args, param.Id)
 			}
-			count, _ := util.JysqlDB.InsertBatchByTx(tx, "sendmsg_customer_info", fields, args)
-			ok := util.JysqlDB.UpdateByTx(tx, "message_send_log", map[string]interface{}{"id": param.Id}, setData)
+			count, _ := config.JysqlDB.InsertBatchByTx(tx, "sendmsg_customer_info", fields, args)
+			ok := config.JysqlDB.UpdateByTx(tx, "message_send_log", map[string]interface{}{"id": param.Id}, setData)
 			return ok1 && ok && count > 0
 		})
 		if !isOk {
@@ -79,8 +79,8 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 		setData["send_userid"] = loginUserId
 		setData["send_name"] = loginUserName
 		setData["sign"] = 1
-		isOk := util.JysqlDB.ExecTx("更新消息出错", func(tx *sql.Tx) bool {
-			msgId = util.JysqlDB.Insert("message_send_log", setData)
+		isOk := config.JysqlDB.ExecTx("更新消息出错", func(tx *sql.Tx) bool {
+			msgId = config.JysqlDB.Insert("message_send_log", setData)
 			var args []interface{}
 			for _, val := range param.UserArr {
 				userIdArr = append(userIdArr, common.ObjToString(val["user_id"]))
@@ -91,7 +91,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				args = append(args, time.Now().Format(date.Date_Full_Layout))
 				args = append(args, msgId)
 			}
-			count, _ := util.JysqlDB.InsertBatch("sendmsg_customer_info", fields, args)
+			count, _ := config.JysqlDB.InsertBatch("sendmsg_customer_info", fields, args)
 			return msgId > -1 && count > 0
 		})
 		if !isOk {
@@ -144,7 +144,7 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			//查询mongo库用户信息
 			userData := &map[string]interface{}{}
 			ok := false
-			userData, ok = util.MQFW.FindById("user", userId, public.MsgUserInfoField)
+			userData, ok = config.MQFW.FindById("user", userId, public.MsgUserInfoField)
 			if userData == nil || len(*userData) == 0 || !ok {
 				continue
 			}
@@ -168,14 +168,14 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 		}
 		log.Println("发送完成，一共发送用户数量：", j)
 		//更新消息链接
-		util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgLogId}, map[string]interface{}{"link": param.Link})
+		config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgLogId}, map[string]interface{}{"link": param.Link})
 		return 1, nil
 	}
 	return 0, errors.New("发送消息出错")
 }
 
 func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone, adminPhone string, offSet, pageSize int) (count int64, data []map[string]interface{}) {
-	salesperson := util.CusTiDb.FindOne("jy_salesperson_info", map[string]interface{}{"phone": adminPhone}, "seatNumber", "")
+	salesperson := config.CusTiDb.FindOne("jy_salesperson_info", map[string]interface{}{"phone": adminPhone}, "seatNumber", "")
 	if salesperson != nil && len(*salesperson) > 0 {
 		code := common.ObjToString((*salesperson)["seatNumber"])
 		sqlStr := "SELECT company,id,phone,status999,lastUpdateTime FROM customer where owner in (" + code + ") "
@@ -202,15 +202,15 @@ func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone
 			sqlc += str
 		}
 		sqlStr += " order by lastUpdateTime desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
-		count = util.CusTiDb.CountBySql(sqlc)
+		count = config.CusTiDb.CountBySql(sqlc)
 		if count > 0 {
-			res := util.CusTiDb.SelectBySql(sqlStr)
+			res := config.CusTiDb.SelectBySql(sqlStr)
 			if res != nil && len(*res) > 0 {
 				for _, v := range *res {
 					userId := common.ObjToString(v["id"])
 					//获取用户注册手机号
 					if userId != "" {
-						userData, ok := util.MQFW.FindById("user", userId, `"s_phone":1,"s_m_phone":1`)
+						userData, ok := config.MQFW.FindById("user", userId, `"s_phone":1,"s_m_phone":1`)
 						if userData != nil && len(*userData) > 0 && ok {
 							if common.ObjToString((*userData)["s_phone"]) != "" {
 								v["registePhone"] = common.ObjToString((*userData)["s_phone"])
@@ -271,19 +271,19 @@ func SaveFile(rdata [][]interface{}, templatePath string, savePath string, saveN
 }
 
 func GetUserById(id string) (userData *map[string]interface{}, ok bool) {
-	userData, ok = util.MQFW.FindById("user", id, `phone,s_phone`)
+	userData, ok = config.MQFW.FindById("user", id, `phone,s_phone`)
 	return userData, ok
 }
 
 func FindUserInfo(msgId int, offSet, pageSize int) (*[]map[string]interface{}, int64) {
-	users := util.JysqlDB.SelectBySql("SELECT user_id AS userId,register_phone AS registePhone,call_center_company,call_center_phone,msg_id FROM sendmsg_customer_info WHERE msg_id = ?", msgId)
-	//users := util.JysqlDB.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "", "createtime desc", offSet, pageSize)
-	total := util.JysqlDB.Count("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId})
+	users := config.JysqlDB.SelectBySql("SELECT user_id AS userId,register_phone AS registePhone,call_center_company,call_center_phone,msg_id FROM sendmsg_customer_info WHERE msg_id = ?", msgId)
+	//users := config.JysqlDB.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "", "createtime desc", offSet, pageSize)
+	total := config.JysqlDB.Count("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId})
 	return users, total
 }
 
 func FindUserIds(msgId int) string {
-	users := util.JysqlDB.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "user_id", "createtime desc", -1, -1)
+	users := config.JysqlDB.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "user_id", "createtime desc", -1, -1)
 	userIds := ""
 	if users != nil && len(*users) > 0 {
 		for k, val := range *users {

src/customerService/dataExportLogService.go

@@ -12,7 +12,6 @@ import (
 	"net/http"
 	"net/url"
 	"qmx_admin/src/config"
-	"qmx_admin/src/util"
 	"strings"
 	"time"
 )
@@ -32,7 +31,7 @@ func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 
 // 查询商机管理企业账户余额
 func getCurrEntCount(entName, entPhone string) int {
-	current, ok := util.JyqyfwMgo.FindOne("user", map[string]interface{}{"phone": entPhone, "username": entName})
+	current, ok := config.JyqyfwMgo.FindOne("user", map[string]interface{}{"phone": entPhone, "username": entName})
 	if current == nil || !ok {
 		return 0
 	}
@@ -56,7 +55,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 	//entNameIdList := []interface{}{}
 	if userNameIn != "" {
 		// 模糊查询出用户列表
-		userTmpRs, ok := util.MQFW.Find("user", map[string]interface{}{"s_nickname": map[string]interface{}{
+		userTmpRs, ok := config.MQFW.Find("user", map[string]interface{}{"s_nickname": map[string]interface{}{
 			"$regex": userNameIn,
 		}}, `{"createtime":-1}`, nil, false, -1, -1)
 		if ok && userTmpRs != nil && len(*userTmpRs) > 0 {
@@ -79,7 +78,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 	if entNameIn != "" {
 		// 根据企业名称模糊查询出主账户id 列表
 		// 处理查询条件
-		masterTmpRs, ok := util.MQFW.Find("member", map[string]interface{}{"entname": map[string]interface{}{
+		masterTmpRs, ok := config.MQFW.Find("member", map[string]interface{}{"entname": map[string]interface{}{
 			"$regex": entNameIn,
 		}}, `{"createtime":-1}`, nil, false, -1, -1)
 
@@ -115,13 +114,13 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 		if phoneIn != "" || userNameIn != "" {
 			searchMgId := ""
 			if phoneIn != "" {
-				userRs, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": phoneIn})
+				userRs, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": phoneIn})
 				if ok && userRs != nil && len(*userRs) > 0 {
 					searchMgId = mongodb.BsonIdToSId((*userRs)["_id"])
 					nick2List = append(nick2List, "?")
 					nickIdList = append(nickIdList, searchMgId)
 				} else {
-					userRs, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phoneIn})
+					userRs, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phoneIn})
 					if oks && userRs != nil && len(*userRs) > 0 {
 						searchMgId = mongodb.BsonIdToSId((*userRs)["_id"])
 						nick2List = append(nick2List, "?")
@@ -246,7 +245,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 	b := fmt.Sprintf("SELECT * FROM (%s) AS alldata ORDER BY exportDate DESC  LIMIT ?,? ", searchSql)
 
 	//   返回totalCount
-	totalCount = util.JysqlDB.QueryCount(fmt.Sprintf("SELECT count(*) FROM (%s) AS alldata  ", searchSql), searchValueList...)
+	totalCount = config.JysqlDB.QueryCount(fmt.Sprintf("SELECT count(*) FROM (%s) AS alldata  ", searchSql), searchValueList...)
 
 	//  追加翻页参数
 	searchValueList = append(searchValueList, pageNum, pageSize)
@@ -267,7 +266,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 		"FROM  (%s) AS finalData", b)
 	//查询
 	// 补充字段  支付方式 处理单日限量包   用户微信昵称  单日限量包和数据流量包线上需要补充 用户手机号
-	resultList := util.JysqlDB.Query(c, searchValueList...)
+	resultList := config.JysqlDB.Query(c, searchValueList...)
 
 	if resultList == nil || len(*resultList) == 0 {
 		log.Println("未查询到结果")
@@ -280,11 +279,11 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 		//	商机管理的根据手机号查询mongo库   获取用户微信昵称  source  0商机管理的数据  1  datapack的数据
 		if row["source"] == "1" {
 
-			userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": row["phone"]})
+			userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": row["phone"]})
 			if ok && userData != nil && len(*userData) > 0 {
 				row["nickname"] = (*userData)["s_nickname"]
 			} else {
-				userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": row["phone"]})
+				userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": row["phone"]})
 				if oks && userDatas != nil && len(*userDatas) > 0 {
 					row["nickname"] = (*userDatas)["s_nickname"]
 				} else {
@@ -296,7 +295,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 			row["leftCount"] = leftCount
 		} else {
 			//	单日限量包和数据流量包线上的根据用户id查询mongo库  获取用户微信昵称和手机号
-			data, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(common.ObjToString(row["user_id"]))})
+			data, ok := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(common.ObjToString(row["user_id"]))})
 			if ok && data != nil && len(*data) > 0 {
 				row["nickname"] = (*data)["s_nickname"]
 				if common.ObjToString((*data)["s_phone"]) == "" {
@@ -318,7 +317,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 				row["leftCount"] = todayLimit - dayUse
 
 				//  补充公司名称  根据master_id 去member表里 mongo 查数据
-				companyRs, ok := util.MQFW.FindOne("member", map[string]interface{}{
+				companyRs, ok := config.MQFW.FindOne("member", map[string]interface{}{
 					"userid": row["master_id"],
 				})
 				if ok && companyRs != nil && len(*companyRs) > 0 {
@@ -367,7 +366,7 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 	return
 }
 func GetDailyNum(masterId string) (dailyNum int) {
-	serviceList := util.JysqlDB.Find(BigmemberUserPowerTable, map[string]interface{}{"s_userid": masterId, "i_status": 0}, "DISTINCT(s_serviceid),i_frequency", "", -1, -1)
+	serviceList := config.JysqlDB.Find(BigmemberUserPowerTable, map[string]interface{}{"s_userid": masterId, "i_status": 0}, "DISTINCT(s_serviceid),i_frequency", "", -1, -1)
 	if serviceList != nil && len(*serviceList) != 0 {
 		for _, item := range *serviceList {
 			serviceid := common.IntAll(item["s_serviceid"])
@@ -427,7 +426,7 @@ func CommonPost(path string, param url.Values) (map[string]interface{}, error) {
 func FindExportLog(id, source int) (result ExportLog, err error) {
 	//result := ExportLog{}
 	if source == 1 { //查询商机管理数据导出记录表
-		exportLog := util.JysqlDB.FindOne("entniche_export_log", map[string]interface{}{"id": id}, ``, "")
+		exportLog := config.JysqlDB.FindOne("entniche_export_log", map[string]interface{}{"id": id}, ``, "")
 		if exportLog != nil && len(*exportLog) > 0 {
 			//查询条件处理
 			str := common.ObjToString((*exportLog)["filter"])
@@ -439,7 +438,7 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 			filter := ""
 			if common.ObjToString(filterMap["FilterId"]) != "" {
 				//查询搜索条件
-				queryMap, ok := util.MQFW.FindById("export_search", common.ObjToString(filterMap["FilterId"]), nil)
+				queryMap, ok := config.MQFW.FindById("export_search", common.ObjToString(filterMap["FilterId"]), nil)
 				if queryMap == nil && !ok {
 					return result, errors.New("查询export_search出错")
 				}
@@ -465,12 +464,12 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 			//exportTime := common.ObjToString((*exportLog)["export_time"])
 			phone := common.ObjToString((*exportLog)["phone"])
 			//查询用户信息
-			userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
+			userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
 			if ok && userData != nil && len(*userData) > 0 {
 				(*exportLog)["userName"] = (*userData)["s_nickname"]
 				//(*exportLog)["email"] = (*userData)["s_email"]
 			} else {
-				userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
+				userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
 				if oks && userDatas != nil && len(*userDatas) > 0 {
 					(*exportLog)["userName"] = (*userDatas)["s_nickname"]
 					//(*exportLog)["email"] = (*userDatas)["s_email"]
@@ -478,10 +477,10 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 			}
 			//查询用户每日导出限额
 			todayLimit, exportNums := 0, 0
-			limitData := util.JysqlDB.FindOne("entniche_export_limit", map[string]interface{}{"user_id": userId}, ``, "")
+			limitData := config.JysqlDB.FindOne("entniche_export_limit", map[string]interface{}{"user_id": userId}, ``, "")
 			if limitData != nil && len(*limitData) > 0 {
 				//查询企业信息
-				entData := util.JysqlDB.FindOne("entniche_info", map[string]interface{}{"id": common.IntAll((*exportLog)["ent_id"])}, `name,phone`, "")
+				entData := config.JysqlDB.FindOne("entniche_info", map[string]interface{}{"id": common.IntAll((*exportLog)["ent_id"])}, `name,phone`, "")
 				if entData != nil && len(*entData) > 0 {
 					(*exportLog)["entName"] = (*entData)["name"]
 					entPhone := common.ObjToString((*entData)["phone"])
@@ -511,12 +510,12 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 		}
 	} else {
 		//查询流量包导出记录
-		packExportLog := util.JysqlDB.FindOne("datapacket_record", map[string]interface{}{"id": id}, ``, "")
+		packExportLog := config.JysqlDB.FindOne("datapacket_record", map[string]interface{}{"id": id}, ``, "")
 		if packExportLog != nil && len(*packExportLog) > 0 {
 			userId := common.ObjToString((*packExportLog)["useid"]) //user表数据id
 			queryId := common.ObjToString((*packExportLog)["query_id"])
 			//查询用户信息
-			userData, oks := util.MQFW.FindById("user", userId, nil)
+			userData, oks := config.MQFW.FindById("user", userId, nil)
 			if userData != nil && len(*userData) > 0 && oks {
 				(*packExportLog)["userName"] = (*userData)["s_nickname"]
 				if common.ObjToString((*userData)["s_phone"]) == "" {
@@ -526,7 +525,7 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 				}
 			}
 			//查询搜索条件
-			queryData, ok := util.MQFW.FindById("export_search", queryId, nil)
+			queryData, ok := config.MQFW.FindById("export_search", queryId, nil)
 			if queryData == nil && !ok {
 				return result, errors.New("查询export_search出错")
 			}
@@ -537,7 +536,7 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 				balance := 0
 				//todayExport := 0
 				//查询用户单日限量额度
-				data := util.JysqlDB.SelectBySql("SELECT s.s_count_month,u.i_frequency FROM bigmember_service_user u LEFT JOIN bigmember_service s ON u.s_serviceid = s.id WHERE u.s_userid = ? and (s.id = 17 or s.id = 18)", userId)
+				data := config.JysqlDB.SelectBySql("SELECT s.s_count_month,u.i_frequency FROM bigmember_service_user u LEFT JOIN bigmember_service s ON u.s_serviceid = s.id WHERE u.s_userid = ? and (s.id = 17 or s.id = 18)", userId)
 				if data != nil && len(*data) > 0 {
 					todayLimit = common.IntAll((*data)[0]["i_frequency"])
 					//计算今日已导出
@@ -549,7 +548,7 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 				balance = todayLimit - dayUse
 				//查询企业名称
 				companyName := ""
-				entInfo, ok := util.MQFW.FindOne("member", map[string]interface{}{"userid": userId})
+				entInfo, ok := config.MQFW.FindOne("member", map[string]interface{}{"userid": userId})
 				if entInfo != nil && len(*entInfo) > 0 && ok {
 					companyName = common.ObjToString((*entInfo)["entname"])
 				}

src/customerService/newsController.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"qmx_admin/src/config"
 	"qmx_admin/src/public"
-	"qmx_admin/src/util"
 	"strconv"
 	"strings"
 
@@ -134,7 +133,7 @@ func MessageSave(context *admin.Context) (interface{}, error) {
 
 // MessageShow 新用户消息回显
 func MessageShow(context *admin.Context) (interface{}, error) {
-	data := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"sign": 4}, "", "createtime desc")
+	data := config.JysqlDB.FindOne("message_send_log", map[string]interface{}{"sign": 4}, "", "createtime desc")
 	if data != nil && len(*data) > 0 {
 		(*data)["userGroupName"] = (*data)["send_usergroup_name"]
 		(*data)["msgType"] = (*data)["msg_type"]
@@ -199,7 +198,7 @@ func SendMessageApi(context *admin.Context) (interface{}, error) {
 }
 
 func GetMsgType(context *admin.Context) (interface{}, error) {
-	types := util.MsgTidb.SelectBySql("SELECT msg_type,msg_name AS name,group_id FROM `message_class` WHERE background_send = 1 ")
+	types := config.MsgTidb.SelectBySql("SELECT msg_type,msg_name AS name,group_id FROM `message_class` WHERE background_send = 1 ")
 	if types != nil && len(*types) > 0 {
 		tp := []map[string]interface{}{}
 		for _, v := range *types {

src/customerService/newsService.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 	"strconv"
 	"strings"
 )
@@ -35,7 +35,7 @@ type CustomerId struct {
 
 // MsgDelete 删除消息
 func MsgDelete(id string) (int, error) {
-	ok := util.JysqlDB.UpdateOrDeleteBySql("UPDATE message_send_log SET isdel = -1 WHERE id = ?", id)
+	ok := config.JysqlDB.UpdateOrDeleteBySql("UPDATE message_send_log SET isdel = -1 WHERE id = ?", id)
 	if ok < 0 {
 		return 0, errors.New("修改isDel删除状态出错")
 	}
@@ -44,7 +44,7 @@ func MsgDelete(id string) (int, error) {
 
 // MsgDetail 消息详情
 func MsgDetail(id int) (*map[string]interface{}, error) {
-	info := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": id}, "", "")
+	info := config.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": id}, "", "")
 	if info != nil && len(*info) > 0 {
 		link := common.ObjToString((*info)["link"])
 		arr := strings.Split(link, ",")
@@ -131,8 +131,8 @@ func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName s
 	}
 	sql += page
 	//sql += " ORDER BY id DESC"
-	data := util.JysqlDB.SelectBySql(sql)
-	count := util.JysqlDB.CountBySql(sqlc)
+	data := config.JysqlDB.SelectBySql(sql)
+	count := config.JysqlDB.CountBySql(sqlc)
 	return data, int(count)
 
 }
@@ -140,7 +140,7 @@ func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName s
 // GetGroupData 获取分组下的用户
 func GetGroupData() ([]map[string]string, error) {
 	groups := []map[string]string{}
-	data := util.ConvertlabDB.SelectBySql("select groupid as id,groupname as name from `groups`")
+	data := config.ConvertlabDB.SelectBySql("select groupid as id,groupname as name from `groups`")
 	if data != nil && len(*data) > 0 {
 		for _, v := range *data {
 			log.Println(v)

src/customerService/sendMsgService.go

@@ -47,7 +47,7 @@ func SendMsg(param *public.Message, sendStatus int, loginUserName string, loginU
 	// 更新消息 新用户注册消息不能更新
 	if param.Id != 0 && param.Sign != 4 {
 		msgId = int64(param.Id)
-		ok := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": param.Id}, saveData)
+		ok := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": param.Id}, saveData)
 		if !ok {
 			return 0, errors.New("UPDATE message_send_log出错")
 		}
@@ -59,7 +59,7 @@ func SendMsg(param *public.Message, sendStatus int, loginUserName string, loginU
 		//保存发送的消息
 		saveData["createtime"] = time.Now().Format(date.Date_Full_Layout)
 		saveData["send_name"] = loginUserName
-		msgId = util.JysqlDB.Insert("message_send_log", saveData)
+		msgId = config.JysqlDB.Insert("message_send_log", saveData)
 		//立即发送 新用户发送消息走nsq通知  直接返回
 		if param.Sign == 4 {
 			return 1, nil
@@ -123,7 +123,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 		}
 		content = equityRs[0]
 	}
-	msgId := util.JysqlDB.Insert("message_send_log", map[string]interface{}{
+	msgId := config.JysqlDB.Insert("message_send_log", map[string]interface{}{
 		"send_usergroup_id":   "",
 		"send_usergroup_name": "",
 		"msg_type":            param.MsgType,
@@ -186,7 +186,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 			//查询mongo库用户信息
 			userData := &map[string]interface{}{}
 			ok := false
-			userData, ok = util.MQFW.FindById("user", userId, public.MsgUserInfoField)
+			userData, ok = config.MQFW.FindById("user", userId, public.MsgUserInfoField)
 			if userData == nil || len(*userData) == 0 || !ok {
 				continue
 			}
@@ -221,7 +221,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 			positionIds = ""
 			currentIndex = 0
 		}
-		ok := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"link": param.Link})
+		ok := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"link": param.Link})
 		if ok {
 			return 1, nil
 		}
@@ -260,11 +260,11 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 		} else {
 			sqlStr = " WHERE b.userid != ''"
 		}
-		count := util.ConvertlabDB.CountBySql(fmt.Sprintf("SELECT count(DISTINCT(b.userid)) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", param.UserGroupId, sqlStr))
+		count := config.ConvertlabDB.CountBySql(fmt.Sprintf("SELECT count(DISTINCT(b.userid)) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", param.UserGroupId, sqlStr))
 		log.Println("分组发送消息，查询用户总量为：", count)
 		if count > 0 {
 			sql := fmt.Sprintf("SELECT DISTINCT ( b.userid ) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", param.UserGroupId, sqlStr)
-			users := util.ConvertlabDB.SelectBySql(sql)
+			users := config.ConvertlabDB.SelectBySql(sql)
 			if users != nil && len(*users) > 0 {
 				for _, v := range *users {
 					j++
@@ -279,7 +279,7 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 						projectIdMap.Store(userId, true)
 					}
 					//查询mongo库用户信息
-					userData, ok := util.MQFW.FindById("user", userId, public.MsgUserInfoField)
+					userData, ok := config.MQFW.FindById("user", userId, public.MsgUserInfoField)
 					if userData == nil || len(*userData) == 0 || !ok {
 						continue
 					}
@@ -315,7 +315,7 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 	}
 	//实时发送，消息发送完毕，发送记录发送状态更新为 4 发送完成
 	if param.SendMode == 2 {
-		ok := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": param.Link})
+		ok := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": param.Link})
 		if !ok {
 			log.Println("消息发送完毕，更新发送记录出错，消息发送记录为：", msgLogId)
 		}

src/doc/public/init.go

@@ -6,7 +6,6 @@ import (
 	"github.com/zeromicro/go-zero/core/discov"
 	"github.com/zeromicro/go-zero/zrpc"
 	"qmx_admin/src/config"
-	"qmx_admin/src/util"
 )
 
 type screenInfo struct {
@@ -24,7 +23,7 @@ var (
 )
 
 func init() {
-	docClassData := util.BaseDB.SelectBySql(`SELECT name,code  FROM doc_class WHERE level = 1 AND state = 0;`)
+	docClassData := config.BaseDB.SelectBySql(`SELECT name,code  FROM jydocs.doc_class WHERE level = 1 AND state = 0;`)
 	if docClassData != nil && len(*docClassData) > 0 {
 		for _, dv := range *docClassData {
 			name := common.InterfaceToStr(dv["name"])

src/doc/public/recDoc.go

@@ -2,7 +2,7 @@ package public
 
 import (
 	"fmt"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 )
 
 // GetRecDoc 获取文库推荐列表
@@ -17,7 +17,7 @@ func GetRecDoc(regionState int, docClassCode string) (recList []map[string]inter
 		values = append(values, docClassCode)
 	}
 	query = fmt.Sprintf(qBase, and)
-	rs := util.BaseDB.SelectBySql(query, values...)
+	rs := config.BaseDB.SelectBySql(query, values...)
 	if rs != nil || len(*rs) == 0 {
 		return []map[string]interface{}{}
 	}

src/export_log/exportLog.go

@@ -54,6 +54,6 @@ func (a *Action) Query() {
 		sql += " and TIMESTAMP(export_time)<?"
 		val = append(val, startTimeStr)
 	}
-	data := util.JysqlDB.SelectBySql(sql, val...)
+	data := config.JysqlDB.SelectBySql(sql, val...)
 	a.ServeJson(Result{Data: data})
 }

src/jylog/2024_07_16_19_36_34.log

@@ -1,11 +0,0 @@
-2024/07/16 19:36:34 自动回款匹配。。。开始
-2024/07/16 19:36:34 query:  select * from transaction where ISRELATION = 0
-2024/07/16 19:36:34 定时任务开始。。。。
-2024/07/16 19:36:34 select order_code,pay_money,company_name,commission,procedures_money,filter from dataexport_order where return_status=? and audit_status=? [0 3]
-2024/07/16 19:36:35 此 3204029126219662848 订单核销创建过
-2024/07/16 19:36:35 自动回款匹配。。。结束
-2024/07/16 19:36:35 3
-2024/07/16 19:39:00 自动回款匹配。。。开始
-2024/07/16 19:39:00 query:  select * from transaction where ISRELATION = 0
-2024/07/16 19:39:00 select order_code,pay_money,company_name,commission,procedures_money,filter from dataexport_order where audit_status=? and return_status=? [3 0]
-2024/07/16 19:39:01 自动回款匹配。。。结束

src/jylog/2024_07_17_18_08_17.log

@@ -1,12 +0,0 @@
-2024/07/17 18:08:17 Error 1146 (42S02): Table 'base_service.doc_class' doesn't exist
-2024/07/17 18:08:22 rpc dial: etcd://192.168.3.206:2379/jydocs.stdlib.rpc, error: failed to exit idle mode: context deadline exceeded, make sure rpc service "jydocs.stdlib.rpc" is already started
-
-goroutine 1 [running, locked to thread]:
-runtime/debug.Stack()
-	D:/Executable Program/go1.20.4/src/runtime/debug/stack.go:24 +0x65
-github.com/zeromicro/go-zero/core/logx.Must({0x32113e0?, 0xc0006989b0?})
-	D:/Executable Program/go1.18.1/bin/pkg/mod/github.com/zeromicro/go-zero@v1.6.4/core/logx/logs.go:224 +0x57
-github.com/zeromicro/go-zero/zrpc.MustNewClient({{{0xc000096a40, 0x1, 0x4}, {0xc00004d470, 0x11}, 0x0, {0x0, 0x0}, {0x0, 0x0}, ...}, ...}, ...)
-	D:/Executable Program/go1.18.1/bin/pkg/mod/github.com/zeromicro/go-zero@v1.6.4/zrpc/client.go:45 +0x73
-qmx_admin/src/doc/public.init.1()
-	F:/project/qmx_admin/src/doc/public/stdDocRpc.go:17 +0xdf

src/leads/leadscontroller.go

@@ -5,11 +5,11 @@ import (
 	"app.yhyue.com/moapp/jybase/date"
 	"errors"
 	"fmt"
-	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"github.com/tealeg/xlsx"
 	"io/ioutil"
 	"log"
 	"qmx_admin/src/config"
+	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/util"
 	"strings"
 	"time"
@@ -25,9 +25,9 @@ func init() {
 	// 后边再改 先放init
 	LeadsSrv = NewSaleLeadsSrv(
 		Conn{
-			BaseDb:  util.BaseDB,
-			AdminDb: util.AdminDB,
-		}, Tables{TableTableJyLeadsRecord: util.TableJyLeadsRecord, TableJyLeads: util.TableJyLeads, TableAdminUser: util.TableAdminUser}, SaveField, config.SysConfigs.Domain)
+			BaseDb:  config.BaseDB,
+			AdminDb: config.AdminDB,
+		}, Tables{TableTableJyLeadsRecord: config.TableJyLeadsRecord, TableJyLeads: config.TableJyLeads, TableAdminUser: config.TableAdminUser}, SaveField, config.SysConfigs.Domain)
 }
 
 // Upload 上传销售线索

src/main.go

@@ -57,7 +57,7 @@ func main() {
 			//formParam:=map[string]interface{}{}
 			formParam, _ := json.Marshal(request.Form)
 			//param, _ := json.Marshal(context.HttpRequest.URL.Query())
-			util.AdminDB.Insert("admin_log", map[string]interface{}{
+			config.AdminDB.Insert("admin_log", map[string]interface{}{
 				"name":       context.User.Username,
 				"ip":         context.User.LastLoginIp,
 				"param":      string(formParam),

src/operateAnalysis/industrySolutionsController.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 	"time"
 
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
@@ -126,8 +126,8 @@ func PartnerRecruit(context *admin.Context) (interface{}, error) {
 			"$in": []string{"partner_recruit_page", "channelPartner"},
 		}
 	}
-	list, ok := util.MQFW.Find("saleLeads", query, `{"createtime":-1}`, `{"phone":1,"name":1,"company":1,"createtime":1,"source":1}`, false, param.Page.Offset, param.Page.PageSize)
-	count := util.MQFW.Count("saleLeads", query)
+	list, ok := config.MQFW.Find("saleLeads", query, `{"createtime":-1}`, `{"phone":1,"name":1,"company":1,"createtime":1,"source":1}`, false, param.Page.Offset, param.Page.PageSize)
+	count := config.MQFW.Count("saleLeads", query)
 	if !ok {
 		return nil, errors.New("查询MongoDB出错")
 	}
@@ -174,7 +174,7 @@ func PartnerRecruitExport(context *admin.Context) (interface{}, error) {
 			"$in": []string{"partner_recruit_page", "channelPartner"},
 		}
 	}
-	list, ok := util.MQFW.Find("saleLeads", query, `{"createtime":-1}`, `{"phone":1,"name":1,"company":1,"createtime":1,"source":1}`, false, -1, -1)
+	list, ok := config.MQFW.Find("saleLeads", query, `{"createtime":-1}`, `{"phone":1,"name":1,"company":1,"createtime":1,"source":1}`, false, -1, -1)
 	if !ok {
 		return nil, errors.New("查询MongoDB出错")
 	}

src/operateAnalysis/industrySolutionsService.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	. "qmx_admin/src/config"
 	"qmx_admin/src/order"
-	"qmx_admin/src/util"
 	"time"
 
 	"github.com/tealeg/xlsx"
@@ -41,8 +40,8 @@ func GetIndustrySolutionList(request ListRequest) (int, *[]map[string]interface{
 		}
 		query["createtime"] = tmp
 	}
-	totalCount := util.MQFW.Count(SolutionTABLE, query)
-	rs, ok := util.MQFW.Find(SolutionTABLE, query, `{"createtime":-1}`, nil, false, request.Offset, request.PageSize)
+	totalCount := MQFW.Count(SolutionTABLE, query)
+	rs, ok := MQFW.Find(SolutionTABLE, query, `{"createtime":-1}`, nil, false, request.Offset, request.PageSize)
 	if !ok {
 		log.Println("行业解决方案查询失败", query)
 		return totalCount, rs, errors.New("行业解决方案查询失败")

src/order/contentConfig.go

@@ -4,7 +4,7 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/redis"
 	"errors"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 	"strconv"
 	"strings"
 
@@ -25,7 +25,7 @@ func UpdateContentConfig(context *admin.Context) (interface{}, error) {
 	}
 	//
 	biddingtype := map[string]string{}
-	datas := util.JysqlDB.Find("biddingtype", map[string]interface{}{}, "", "", -1, -1)
+	datas := config.JysqlDB.Find("biddingtype", map[string]interface{}{}, "", "", -1, -1)
 	if datas != nil && *datas != nil && len(*datas) > 0 {
 		for _, v := range *datas {
 			biddingtype[common.ObjToString(v["toptype"])] = strconv.Itoa(common.IntAll(v["id"]))
@@ -47,12 +47,12 @@ func UpdateContentConfig(context *admin.Context) (interface{}, error) {
 	}
 	isOk := true
 	if param.ConfigId == 0 {
-		sqlid := util.JysqlDB.Insert("drainage_content_config", data)
+		sqlid := config.JysqlDB.Insert("drainage_content_config", data)
 		if sqlid < 0 {
 			isOk = false
 		}
 	} else {
-		ok := util.JysqlDB.Update("drainage_content_config", map[string]interface{}{"id": param.ConfigId}, data)
+		ok := config.JysqlDB.Update("drainage_content_config", map[string]interface{}{"id": param.ConfigId}, data)
 		if !ok {
 			isOk = false
 		}
@@ -72,7 +72,7 @@ func DelContentConfig(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	ok := util.JysqlDB.Delete("drainage_content_config", map[string]interface{}{"id": param.ConfigId})
+	ok := config.JysqlDB.Delete("drainage_content_config", map[string]interface{}{"id": param.ConfigId})
 	if ok {
 		return nil, nil
 	} else {
@@ -82,14 +82,14 @@ func DelContentConfig(context *admin.Context) (interface{}, error) {
 
 func ContentConfigList(*admin.Context) (interface{}, error) {
 	count, res, biddingtype, serviceArr := int64(0), []map[string]interface{}{}, []string{}, []map[string]interface{}{}
-	count = util.JysqlDB.Count("drainage_content_config", map[string]interface{}{})
+	count = config.JysqlDB.Count("drainage_content_config", map[string]interface{}{})
 	if count > 0 {
-		data := util.JysqlDB.Find("drainage_content_config", map[string]interface{}{}, "", "", -1, -1)
+		data := config.JysqlDB.Find("drainage_content_config", map[string]interface{}{}, "", "", -1, -1)
 		if data != nil && *data != nil && len(*data) > 0 {
 			res = *data
 		}
 	}
-	data := util.JysqlDB.Find("biddingtype", map[string]interface{}{}, "", "", -1, -1)
+	data := config.JysqlDB.Find("biddingtype", map[string]interface{}{}, "", "", -1, -1)
 	biddingMap := map[string]string{}
 	if data != nil && *data != nil && len(*data) > 0 {
 		for _, v := range *data {
@@ -97,7 +97,7 @@ func ContentConfigList(*admin.Context) (interface{}, error) {
 			biddingMap[strconv.Itoa(common.IntAll(v["id"]))] = common.ObjToString(v["toptype"])
 		}
 	}
-	datas := util.JysqlDB.Find("bigmember_service", map[string]interface{}{"i_isserver": 1}, "s_name,id", "", -1, -1)
+	datas := config.JysqlDB.Find("bigmember_service", map[string]interface{}{"i_isserver": 1}, "s_name,id", "", -1, -1)
 	if datas != nil && *datas != nil && len(*datas) > 0 {
 		for _, v := range *datas {
 			serviceMap := map[string]interface{}{

src/order/getContractPdf.go

@@ -14,6 +14,7 @@ import (
 	"math/rand"
 	"os/exec"
 	"path/filepath"
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/otherPackage/lukasjarosch/go-docx"
 	"qmx_admin/src/util"
@@ -58,7 +59,7 @@ func GetContractPdf(context *admin.Context) (interface{}, error) {
 		if param.OrderCode == "" {
 			return nil, fmt.Errorf("订单号异常")
 		}
-		res := util.JysqlDB.SelectBySql(`SELECT a.filter,a.audit_status,a.product_type,a.vip_type,a.salesperson,a.buy_subject,a.buy_count,a.signing_subject,b.contract_status,b.seal_type,b.partyA_type,b.partyA_name,b.partyA_person,b.partyA_tel,b.partyA_address,b.partyB_person,b.remark,b.contract_money FROM dataexport_order a INNER JOIN contract b  ON a.order_code=b.order_code WHERE a.order_code=? `, param.OrderCode)
+		res := config.JysqlDB.SelectBySql(`SELECT a.filter,a.audit_status,a.product_type,a.vip_type,a.salesperson,a.buy_subject,a.buy_count,a.signing_subject,b.contract_status,b.seal_type,b.partyA_type,b.partyA_name,b.partyA_person,b.partyA_tel,b.partyA_address,b.partyB_person,b.remark,b.contract_money FROM dataexport_order a INNER JOIN contract b  ON a.order_code=b.order_code WHERE a.order_code=? `, param.OrderCode)
 		if res == nil || len(*res) == 0 {
 			return nil, fmt.Errorf("未找到订单数据")
 		}
@@ -214,7 +215,7 @@ func GetContractPdf(context *admin.Context) (interface{}, error) {
 
 	filePath, getFilePathErr := func() (string, error) {
 		md5Str := contractDetail.GetMd5()
-		res := util.JysqlDB.FindOne("contract_pdf", map[string]interface{}{
+		res := config.JysqlDB.FindOne("contract_pdf", map[string]interface{}{
 			"order_code": param.OrderCode,
 			"md5":        md5Str,
 		}, "file_path", "id desc")
@@ -229,8 +230,8 @@ func GetContractPdf(context *admin.Context) (interface{}, error) {
 			}
 			// 获取访问路径
 			pdfFilePath := util.GetRequestPath(strings.Replace(docxAbsolutePath, ".docx", ".pdf", 1))
-			doSql := util.JysqlDB.ExecTx("更新订单审核状态及增加审批轨迹", func(tx *sql.Tx) bool {
-				if util.JysqlDB.InsertByTx(tx, "contract_pdf", map[string]interface{}{
+			doSql := config.JysqlDB.ExecTx("更新订单审核状态及增加审批轨迹", func(tx *sql.Tx) bool {
+				if config.JysqlDB.InsertByTx(tx, "contract_pdf", map[string]interface{}{
 					"order_code":    param.OrderCode,
 					"code":          contractDetail.GetContractNoStr(now),
 					"md5":           md5Str,
@@ -240,7 +241,7 @@ func GetContractPdf(context *admin.Context) (interface{}, error) {
 				}) <= 0 {
 					return false
 				}
-				if !util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
+				if !config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
 					"order_code": param.OrderCode,
 				}, map[string]interface{}{
 					"contract_code": contractDetail.GetContractNoStr(now),

src/order/helpUserOrderController.go

@@ -31,9 +31,9 @@ func LogicalDelOrder(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	ok := util.JysqlDB.Update(DataExportOrder, map[string]interface{}{"id": param.Id}, map[string]interface{}{"del_status": 1, "del_time": date.NowFormat(date.Date_Full_Layout)})
+	ok := config.JysqlDB.Update(DataExportOrder, map[string]interface{}{"id": param.Id}, map[string]interface{}{"del_status": 1, "del_time": date.NowFormat(date.Date_Full_Layout)})
 	if ok {
-		orderData := util.JysqlDB.FindOne(DataExportOrder, map[string]interface{}{"id": param.Id}, "", "")
+		orderData := config.JysqlDB.FindOne(DataExportOrder, map[string]interface{}{"id": param.Id}, "", "")
 		if orderData != nil && len(*orderData) > 0 {
 			userId := common.ObjToString((*orderData)["user_id"])
 			disRelationId := common.ObjToString((*orderData)["d_relation_id"])
@@ -71,11 +71,11 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 	)
 	if len(param.UserId) == 11 {
 		// //根据手机号查询用户
-		// userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		// userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 		// if userData != nil && len(*userData) > 0 && ok {
 		// 	userId = mongodb.BsonIdToSId((*userData)["_id"])
 		// } else {
-		// 	userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+		// 	userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 		// 	if userData != nil && len(*userData) > 0 && userId == "" {
 		// 		userId = mongodb.BsonIdToSId((*userData)["_id"])
 		// 	} else {
@@ -94,7 +94,7 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 			},
 			"s_regsource": "qmx_admin",
 		}
-		_id := util.MQFW.Save("user", data)
+		_id := config.MQFW.Save("user", data)
 		//mysql表同步插入用户信息
 		if _id != "" {
 			userId = _id
@@ -105,7 +105,7 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 			}
 			if !strings.HasPrefix(param.UserId, "9") {
 				ck := &http.Cookie{}
-				usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formData, ck)
+				usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formData, ck)
 				users.SaveUserLog(_id, param.UserId)
 			}
 		}
@@ -139,7 +139,7 @@ func CopyLink(context *admin.Context) (interface{}, error) {
 	}
 	var link string
 	//查询订单信息
-	order := util.JysqlDB.FindOne(DataExportOrder, map[string]interface{}{"id": param.Id}, "user_id,salesperson,salesperson_id,order_code,product_type,filter", "")
+	order := config.JysqlDB.FindOne(DataExportOrder, map[string]interface{}{"id": param.Id}, "user_id,salesperson,salesperson_id,order_code,product_type,filter", "")
 	if order != nil && len(*order) > 0 {
 		filterMap := map[string]interface{}{}
 		if err := json.Unmarshal([]byte(((*order)["filter"]).(string)), &filterMap); err == nil {

src/order/invoiceController.go

@@ -7,14 +7,13 @@ import (
 	"app.yhyue.com/moapp/jybase/mail"
 	"errors"
 	"fmt"
-	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"github.com/tealeg/xlsx"
 	"io/ioutil"
 	"log"
 	"os"
 	"qmx_admin/src/config"
+	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 
-	"qmx_admin/src/util"
 	"strconv"
 	"strings"
 	"time"
@@ -223,7 +222,7 @@ func CreateQRCode(context *admin.Context) (interface{}, error) {
 		orderCodeArr = append(orderCodeArr, k)
 	}
 	querySQL := fmt.Sprintf("select  order_code ,invoice_variety  from   invoice  where   order_code  in  (%s) and   invoice_status=0", fmt.Sprintf("\"%s\"", strings.Join(orderCodeArr, "\",\"")))
-	invoiceArr := util.JysqlDB.SelectBySql(querySQL)
+	invoiceArr := config.JysqlDB.SelectBySql(querySQL)
 	if len(*invoiceArr) > 0 {
 		return map[string]interface{}{}, errors.New("该订单存在\"已申请\"的开票信息")
 	}
@@ -253,7 +252,7 @@ func InvoiceQuery(context *admin.Context) (interface{}, error) {
 	}
 	//根据订单编号查询订单信息
 	querySQL := fmt.Sprintf("select  order_code ,invoice_variety  from   invoice  where   order_code  in  (%s) and   invoice_status=0", fmt.Sprintf("\"%s\"", strings.Join(orderCodeArr, "\",\"")))
-	invoiceArr := util.JysqlDB.SelectBySql(querySQL)
+	invoiceArr := config.JysqlDB.SelectBySql(querySQL)
 	invoiceVariety := ""
 	if len(*invoiceArr) != len(orderCodeArr) {
 		return map[string]interface{}{}, errors.New("订单编号有误")
@@ -305,7 +304,7 @@ func SavaInvoice(context *admin.Context) (interface{}, error) {
 			"invoice_status": 0,
 			"order_code":     orderrr[0],
 		}
-		orderData = util.JysqlDB.FindOne("invoice", query, "", "")
+		orderData = config.JysqlDB.FindOne("invoice", query, "", "")
 	}
 	for _, v := range orderrr {
 		query := map[string]interface{}{
@@ -321,7 +320,7 @@ func SavaInvoice(context *admin.Context) (interface{}, error) {
 		if param.LogisticsCode != "" {
 			update["logistics_code"] = param.LogisticsCode
 		}
-		util.JysqlDB.Update("invoice", query, update)
+		config.JysqlDB.Update("invoice", query, update)
 		//订单信息保存
 		updateData := map[string]interface{}{}
 		if orderData != nil && len(*orderData) > 0 && common.IntAll((*orderData)["source"]) == 0 { // 线上开票不校验是否全额开票
@@ -331,7 +330,7 @@ func SavaInvoice(context *admin.Context) (interface{}, error) {
 		} else {
 			updateData["applybill_status"] = 3
 		}
-		util.JysqlDB.Update("dataexport_order", map[string]interface{}{
+		config.JysqlDB.Update("dataexport_order", map[string]interface{}{
 			"order_code": v,
 		}, updateData)
 		//用户发送邮件
@@ -360,7 +359,7 @@ func OrderInfo(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("参数异常")
 	}
 	//订单信息查询
-	orderData := util.JysqlDB.SelectBySql("select  pay_money,applybill_status,signing_subject from  dataexport_order  where  order_code =?", param.OrderCode)
+	orderData := config.JysqlDB.SelectBySql("select  pay_money,applybill_status,signing_subject from  dataexport_order  where  order_code =?", param.OrderCode)
 	if len(*orderData) == 0 || orderData == nil {
 		return nil, errors.New("订单编号不存在")
 	}
@@ -371,7 +370,7 @@ func OrderInfo(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("该订单签约主体是拓普，请联系财务线下开票")
 	}
 	//发票信息查询
-	invoiceData := util.JysqlDB.SelectBySql("select invoice_status,sum(invoice_order_money) as  money,min(source) as source  from  invoice where  order_code=?  and  (invoice_status>=0 or invoice_status = -1) GROUP BY  invoice_status", param.OrderCode)
+	invoiceData := config.JysqlDB.SelectBySql("select invoice_status,sum(invoice_order_money) as  money,min(source) as source  from  invoice where  order_code=?  and  (invoice_status>=0 or invoice_status = -1) GROUP BY  invoice_status", param.OrderCode)
 	if len(*orderData) == 0 || orderData == nil {
 		//从来没有开过票
 		return map[string]interface{}{
@@ -410,13 +409,13 @@ func OrderInfo(context *admin.Context) (interface{}, error) {
 
 // 判断是全额还是部分回款
 func InvoiceStatusHandle(orderCode string) bool {
-	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{
+	orderData := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{
 		"order_code": orderCode,
 	}, "pay_money", "")
 	if orderData == nil {
 		return false
 	}
-	invoiceData := util.JysqlDB.SelectBySql("select sum(invoice_order_money) as  money  from  invoice where  order_code=?  and  invoice_status>=0  ", orderCode)
+	invoiceData := config.JysqlDB.SelectBySql("select sum(invoice_order_money) as  money  from  invoice where  order_code=?  and  invoice_status>=0  ", orderCode)
 	if invoiceData == nil || len(*invoiceData) == 0 {
 		return false
 	}

src/order/invoiceService.go

@@ -10,7 +10,6 @@ import (
 	"math"
 	"math/big"
 	"qmx_admin/src/config"
-	"qmx_admin/src/util"
 	"strings"
 )
 
@@ -21,7 +20,7 @@ var InvoiceServiceObj InvoiceService
 
 // IsOrderCodeExist 获取订单号是否存在
 func (*InvoiceService) IsOrderCodeExist(orderCode string) bool {
-	count := util.JysqlDB.CountBySql(fmt.Sprintf("select count(id) from %v where order_code=?", DataExportOrder), orderCode)
+	count := config.JysqlDB.CountBySql(fmt.Sprintf("select count(id) from %v where order_code=?", DataExportOrder), orderCode)
 	if count > 0 {
 		return true
 	} else {
@@ -31,7 +30,7 @@ func (*InvoiceService) IsOrderCodeExist(orderCode string) bool {
 
 // GetUserId 获取用户id从订单中
 func (*InvoiceService) GetUserId(orderCode string) (userId string) {
-	rs := util.JysqlDB.SelectBySql(fmt.Sprintf("select user_id from %v where order_code=?", DataExportOrder), orderCode)
+	rs := config.JysqlDB.SelectBySql(fmt.Sprintf("select user_id from %v where order_code=?", DataExportOrder), orderCode)
 	if rs != nil && len(*rs) > 0 {
 		userId = common.ObjToString((*rs)[0]["userId"])
 	}
@@ -40,14 +39,14 @@ func (*InvoiceService) GetUserId(orderCode string) (userId string) {
 
 // SaveInvoice 保存发票并且更新订单状态
 func (*InvoiceService) SaveInvoice(fieldName []string, valueList []interface{}, orderCode []string, n int) bool {
-	return util.JysqlDB.ExecTx("保存发票并更新订单状态", func(tx *sql.Tx) bool {
-		count, _ := util.JysqlDB.InsertBatchByTx(tx, Invoice, fieldName, valueList)
+	return config.JysqlDB.ExecTx("保存发票并更新订单状态", func(tx *sql.Tx) bool {
+		count, _ := config.JysqlDB.InsertBatchByTx(tx, Invoice, fieldName, valueList)
 		if int(count) < n {
 			log.Println("保存发票失败", count)
 			return false
 		}
 		updateSql := fmt.Sprintf("update %v set applybill_status=2 where order_code in ('%v')", DataExportOrder, strings.Join(orderCode, "','"))
-		updateCount := util.JysqlDB.UpdateOrDeleteBySqlByTx(tx, updateSql)
+		updateCount := config.JysqlDB.UpdateOrDeleteBySqlByTx(tx, updateSql)
 		if updateCount < 0 {
 			return false
 		}
@@ -78,7 +77,7 @@ type InvoiceListReq struct {
 func getInvoiceList(req InvoiceListReq) (map[string]interface{}, error) {
 	var startTime = config.SysConfigs.InvoiceStartTime //
 	countQuery := "select count(*) from jianyu.invoice where invoice_status=0 AND create_time > ?"
-	count := util.JysqlDB.CountBySql(countQuery, startTime)
+	count := config.JysqlDB.CountBySql(countQuery, startTime)
 	if count == 0 {
 		return map[string]interface{}{
 			"total": 0,
@@ -86,7 +85,7 @@ func getInvoiceList(req InvoiceListReq) (map[string]interface{}, error) {
 		}, nil
 	}
 	query := "select * from jianyu.invoice where invoice_status=0 AND create_time > ?  order by create_time desc limit ?,? "
-	rs := util.JysqlDB.SelectBySql(query, startTime, req.Offset, req.PageSize)
+	rs := config.JysqlDB.SelectBySql(query, startTime, req.Offset, req.PageSize)
 	if rs != nil && len(*rs) > 0 {
 		exist := map[string]int{}
 		data := []map[string]interface{}{}
@@ -125,7 +124,7 @@ func getInvoiceList(req InvoiceListReq) (map[string]interface{}, error) {
 
 func GetOrderInvoiceList(orderCode, companyName string) []map[string]interface{} {
 	//2020-4-22电子发票：付文彩
-	data := util.JysqlDB.Find("invoice", map[string]interface{}{"order_code": orderCode}, "", "create_time desc", 0, 0)
+	data := config.JysqlDB.Find("invoice", map[string]interface{}{"order_code": orderCode}, "", "create_time desc", 0, 0)
 	if *data != nil && len(*data) != 0 {
 		invoiceList := []map[string]interface{}{}
 		for _, invoiceData := range *data {

src/order/optimizeOrder.go

@@ -7,7 +7,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 	"strings"
 	"time"
 
@@ -31,7 +31,7 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
+	orderData := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
 	if orderData == nil {
 		return nil, errors.New("未找到订单")
 	}
@@ -69,12 +69,12 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 			//insertData["payMoney"] = param.PayMoney
 			insertData["payMoney"] = param.PayMoney - common.IntAll((*orderData)["pay_money"])
 			//filterMap["bigPayMoney"] = param.PayMoney
-			util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
+			config.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
 		} else {
 			filterMap["payMoneyUpdate"] = param.PayMoney
 			updateData["pay_money"] = param.PayMoney
 			insertData["payMoney"] = param.PayMoney - common.IntAll((*orderData)["pay_money"])
-			util.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
+			config.JysqlDB.Update("contract", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"contract_money": param.PayMoney})
 		}
 		//}
 
@@ -98,8 +98,8 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		}
 		filterByte, _ := json.Marshal(filterMap)
 		updateData["filter"] = string(filterByte)
-		returnData := util.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, param.OrderCode)
-		refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, param.OrderCode)
+		returnData := config.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, param.OrderCode)
+		refundData := config.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, param.OrderCode)
 		return_money := common.IntAll((*returnData)[0]["return_money"])
 		refund_money := common.IntAll((*refundData)[0]["refund_money"])
 		if param.PayMoney-param.Commission-param.ProceduresMoney <= return_money-refund_money {
@@ -155,8 +155,8 @@ func AddUpdateRecord(context *admin.Context) (interface{}, error) {
 		}
 
 	}
-	util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateData)
-	util.JysqlDB.Insert("moneyCorrection", insertData)
+	config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateData)
+	config.JysqlDB.Insert("moneyCorrection", insertData)
 	return map[string]interface{}{"status": 1}, nil
 }
 
@@ -169,7 +169,7 @@ func FindUserAccount(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	// var userData, ok, userId = &map[string]interface{}{}, false, ""
-	userData, ok := util.MQFW.Find("user", map[string]interface{}{
+	userData, ok := config.MQFW.Find("user", map[string]interface{}{
 		"i_appid": 2,
 		"$or": []map[string]interface{}{
 			{"s_phone": param.Phone},
@@ -213,7 +213,7 @@ func HelpVipInfo(context *admin.Context) (interface{}, error) {
 			"$gt": time.Now().Unix(),
 		},
 	}
-	count1 := util.MQFW.Count("user", query)
+	count1 := config.MQFW.Count("user", query)
 	if count1 > 0 {
 		willEffect = true
 	}
@@ -228,7 +228,7 @@ func HelpVipInfo(context *admin.Context) (interface{}, error) {
 	}
 	//判断用户购买过超级订阅并且在有效期内   i_vip_status 开启状态：0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期
 	userInfo := map[string]interface{}{}
-	userData, ok := util.MQFW.FindOneByField("user", map[string]interface{}{regType: param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
+	userData, ok := config.MQFW.FindOneByField("user", map[string]interface{}{regType: param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 	if ok && userData != nil && len(*userData) > 0 {
 		userInfo = *userData
 	} else {
@@ -241,7 +241,7 @@ func HelpVipInfo(context *admin.Context) (interface{}, error) {
 	if userInfo != nil && len(userInfo) > 0 {
 		userId := mongodb.BsonIdToSId(userInfo["_id"])
 		//查询订单信息获取客户名称
-		orderInfo := util.JysqlDB.SelectBySql("SELECT c.customer_name,d.company_name FROM dataexport_order d LEFT JOIN contract c ON c.order_code = d.order_code WHERE product_type = 'VIP订阅' and user_id = ? ORDER BY d.id DESC", userId)
+		orderInfo := config.JysqlDB.SelectBySql("SELECT c.customer_name,d.company_name FROM dataexport_order d LEFT JOIN contract c ON c.order_code = d.order_code WHERE product_type = 'VIP订阅' and user_id = ? ORDER BY d.id DESC", userId)
 		if len(*orderInfo) == 0 {
 			return nil, errors.New("查询订单表没有查到订单信息")
 		}

src/order/orderSeal.go

@@ -3,8 +3,8 @@ package order
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"errors"
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
-	"qmx_admin/src/util"
 	"time"
 )
 
@@ -23,7 +23,7 @@ func OperateOrderSeal(context *admin.Context) (interface{}, error) {
 	}
 	switch param.RegType {
 	case "post": //增加记录`
-		_d := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "audit_status,order_status", "")
+		_d := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "audit_status,order_status", "")
 		if _d == nil || len(*_d) == 0 {
 			return nil, errors.New("订单获取失败")
 		}
@@ -32,7 +32,7 @@ func OperateOrderSeal(context *admin.Context) (interface{}, error) {
 		if order_status == -1 || order_status == -2 || audit_status != 3 {
 			return nil, errors.New("订单状态异常")
 		}
-		util.JysqlDB.Insert("order_seal", map[string]interface{}{
+		config.JysqlDB.Insert("order_seal", map[string]interface{}{
 			"order_code":   param.OrderCode,
 			"stamp_time":   param.StampTime,
 			"create_time":  time.Now().Format("2006-01-02 15:04:05"),
@@ -41,7 +41,7 @@ func OperateOrderSeal(context *admin.Context) (interface{}, error) {
 			"status":       0,
 		})
 	case "delete": //删除记录
-		util.JysqlDB.Update("order_seal", map[string]interface{}{
+		config.JysqlDB.Update("order_seal", map[string]interface{}{
 			"id": param.Id,
 		}, map[string]interface{}{
 			"status": -1,

src/order/orderSellingPrice.go

@@ -10,7 +10,6 @@ import (
 	"log"
 	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
-	"qmx_admin/src/util"
 	"strings"
 	"time"
 )
@@ -127,14 +126,14 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 			if param.Level == 5 || param.CreateType == 2 {
 				//查询所选服务的价格
 				if config.BigServiceMap == nil && len(config.BigServiceMap) == 0 {
-					util.GetService()
+					config.GetService()
 				}
 				idArr := map[int]bool{}
 				if param.CreateType == 2 { //补充服务
 					//价格计算需要去掉之前购买服务
-					userServer := util.JysqlDB.Find("bigmember_service_user", map[string]interface{}{"s_userid": userId, "i_status": 0}, "s_serviceid,s_smainid", "", -1, -1)
+					userServer := config.JysqlDB.Find("bigmember_service_user", map[string]interface{}{"s_userid": userId, "i_status": 0}, "s_serviceid,s_smainid", "", -1, -1)
 					if userServer != nil && len(*userServer) > 0 {
-						var isHUa = util.JysqlDB.CountBySql(`SELECT count(1) as count FROM bigmember_service_user WHERE s_userid = ? and i_status =0 and (s_serviceid=4 or s_serviceid =19)`, userId) > 0
+						var isHUa = config.JysqlDB.CountBySql(`SELECT count(1) as count FROM bigmember_service_user WHERE s_userid = ? and i_status =0 and (s_serviceid=4 or s_serviceid =19)`, userId) > 0
 						for _, v := range *userServer {
 							if isHUa && v["s_serviceid"] == 26 {
 								continue
@@ -171,7 +170,7 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 				}
 			} else {
 				if config.BigMemberCombo == nil && len(config.BigMemberCombo) == 0 {
-					util.GetBigCombo()
+					config.GetBigCombo()
 				}
 				//会员套餐年价格
 				primaryAccountPrice = config.BigMemberCombo[param.ComboId]
@@ -210,7 +209,7 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 				}
 				//补充服务价格
 				if config.BigServiceMap == nil && len(config.BigServiceMap) == 0 {
-					util.GetService()
+					config.GetService()
 				}
 				for _, v := range strings.Split(sid, ",") {
 					supplyService := config.BigServiceMap[common.IntAll(v)]
@@ -230,7 +229,7 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 			if param.BuySubject == "1" {
 				subAccountPrice = common.IntAll(subAccount["i_personal_price"])
 			} else {
-				res := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter", "")
+				res := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter", "")
 				if res == nil {
 					return nil, errors.New("未查询到订单")
 				}
@@ -261,7 +260,7 @@ func orderPriceCount(context *admin.Context) (interface{}, error) {
 
 func GetEntBigMemberMonthCount(orderCode string) (monthCount int) {
 	var endTime time.Time
-	res := util.JysqlDB.SelectBySql("SELECT c.end_time FROM dataexport_order a LEFT JOIN entniche_order b on a.id = b.order_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.order_code = ?", orderCode)
+	res := config.JysqlDB.SelectBySql("SELECT c.end_time FROM dataexport_order a LEFT JOIN entniche_order b on a.id = b.order_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.order_code = ?", orderCode)
 	if res != nil && len(*res) > 0 {
 		endTime, _ = time.Parse(date.Date_Full_Layout, common.ObjToString((*res)[0]["end_time"]))
 	}
@@ -271,9 +270,9 @@ func GetEntBigMemberMonthCount(orderCode string) (monthCount int) {
 
 func GetUserBigTime(phone string, isVip bool) (monthCount int, userId string) {
 	//查询用户大会员权益剩余服务周期
-	userData, ok := util.MQFW.FindOneByField("user", map[string]interface{}{"s_phone": phone}, `"_id":1,"i_member_starttime":1,"i_member_endtime":1,"l_vip_starttime":1,"l_vip_endtime":1`)
+	userData, ok := config.MQFW.FindOneByField("user", map[string]interface{}{"s_phone": phone}, `"_id":1,"i_member_starttime":1,"i_member_endtime":1,"l_vip_starttime":1,"l_vip_endtime":1`)
 	if userData == nil || len(*userData) == 0 || !ok {
-		userData, ok = util.MQFW.FindOneByField("user", map[string]interface{}{"s_m_phone": phone}, `"_id":1,"i_member_starttime":1,"i_member_endtime":1,"l_vip_starttime":1,"l_vip_endtime":1`)
+		userData, ok = config.MQFW.FindOneByField("user", map[string]interface{}{"s_m_phone": phone}, `"_id":1,"i_member_starttime":1,"i_member_endtime":1,"l_vip_starttime":1,"l_vip_endtime":1`)
 		if userData == nil || len(*userData) == 0 || !ok {
 			return monthCount, ""
 		}

src/order/orderService.go

@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"qmx_admin/src/config"
 	"qmx_admin/src/util"
 	"strings"
 	"time"
@@ -33,7 +34,7 @@ func ExistProcessOrder(phone string, productType string, orderCode string) bool
 		condition += fmt.Sprintf(" and order_code!='%s'", orderCode)
 	}
 	q := "select count(id) from dataexport_order where user_phone=? and audit_status!=3 and " + condition
-	rs := util.JysqlDB.CountBySql(q, phone)
+	rs := config.JysqlDB.CountBySql(q, phone)
 	return rs > 0
 }
 
@@ -47,7 +48,7 @@ func ExistNotStartOrder(phone string, productType string, orderCode string) bool
 
 	}
 	q := "select count(id) from dataexport_order where user_phone=? and order_code!='?' " + condition + " and vip_starttime> '?' and order_status not in (-2,-3,-4)"
-	rs := util.JysqlDB.CountBySql(q, phone, orderCode, date.NowFormat(date.Date_Full_Layout))
+	rs := config.JysqlDB.CountBySql(q, phone, orderCode, date.NowFormat(date.Date_Full_Layout))
 	return rs > 0
 
 }
@@ -55,15 +56,15 @@ func ExistNotStartOrder(phone string, productType string, orderCode string) bool
 // UpdateAudit 更新订单审核状态及增加审批轨迹
 func UpdateAudit(orderCode string, auditStatus int, data map[string]interface{}) bool {
 
-	return util.JysqlDB.ExecTx("更新订单审核状态及增加审批轨迹", func(tx *sql.Tx) bool {
-		ok1 := util.JysqlDB.UpdateByTx(tx, util.TableDataExportOrder, map[string]interface{}{"order_code": orderCode}, map[string]interface{}{
+	return config.JysqlDB.ExecTx("更新订单审核状态及增加审批轨迹", func(tx *sql.Tx) bool {
+		ok1 := config.JysqlDB.UpdateByTx(tx, util.TableDataExportOrder, map[string]interface{}{"order_code": orderCode}, map[string]interface{}{
 			"audit_status": auditStatus,
 		})
 		if !ok1 {
 			log.Println("更新订单审核状态失败")
 			return false
 		}
-		ok2 := util.JysqlDB.InsertByTx(tx, util.TableAuditRecords, data)
+		ok2 := config.JysqlDB.InsertByTx(tx, util.TableAuditRecords, data)
 		if ok2 < 1 {
 			log.Println("插入订单审核轨迹失败")
 			return false
@@ -74,7 +75,7 @@ func UpdateAudit(orderCode string, auditStatus int, data map[string]interface{})
 
 // GetOrderByCode 根据订单号获取订单信息
 func GetOrderByCode(code string) *map[string]interface{} {
-	return util.JysqlDB.FindOne(util.TableDataExportOrder, map[string]interface{}{"order_code": code}, "", "")
+	return config.JysqlDB.FindOne(util.TableDataExportOrder, map[string]interface{}{"order_code": code}, "", "")
 }
 
 // 我的更新超级订阅订单
@@ -147,9 +148,9 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 	userData := &map[string]interface{}{}
 	ok := false
 	if param.UserId == "" {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 	} else {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 	}
 	userId := ""
 	var vst, vet string
@@ -177,9 +178,9 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 		userDatas := &map[string]interface{}{}
 		oks := false
 		if param.UserId == "" {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 		} else {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		}
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			userId = mongodb.BsonIdToSId((*userDatas)["_id"])
@@ -202,7 +203,7 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 			}
 		}
 	}
-	return util.JysqlDB.ExecTx("修改订单信息和合同信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("修改订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(vms)
 		if param.Badge != "" {
 			param.ContractMoney = 0
@@ -277,10 +278,10 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 		if param.ContractTime == "" {
 			delete(contractData, "contract_time")
 		}
-		ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
+		ok1 := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
 			"order_code": code,
 		}, insertData)
-		ok2 := util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
+		ok2 := config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
 			"order_code": code,
 		}, contractData)
 		return ok1 && ok2
@@ -289,7 +290,7 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 
 // InsertAudit 存入一条审核记录
 func InsertAudit(data map[string]interface{}) bool {
-	return util.JysqlDB.Insert(util.TableAuditRecords, data) > 0
+	return config.JysqlDB.Insert(util.TableAuditRecords, data) > 0
 }
 
 // AuditRecordsList  获取订单的审核轨迹
@@ -298,7 +299,7 @@ func AuditRecordsList(orderCode string, start, pageSize int) *[]map[string]inter
 		"order_code": orderCode,
 		"audit_type": util.AuditCreate,
 	}
-	return util.JysqlDB.Find(util.TableAuditRecords, query, "", "create_time desc ", start, pageSize)
+	return config.JysqlDB.Find(util.TableAuditRecords, query, "", "create_time desc ", start, pageSize)
 }
 
 // MyUpdateOrder 只更新订单信息
@@ -319,7 +320,7 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 		//补充服务记录新增服务
 		var oldServiceArr []map[string]interface{}
 		sqls := "select a.s_serviceid,b.s_name from bigmember_service_user a LEFT JOIN bigmember_service b on a.s_serviceid = b.id where  a.s_userid = ? and a.i_status = 0"
-		serverUser := util.JysqlDB.SelectBySql(sqls, userId)
+		serverUser := config.JysqlDB.SelectBySql(sqls, userId)
 		if serverUser != nil && len(*serverUser) > 0 {
 			oldServiceArr = *serverUser
 		}
@@ -404,7 +405,7 @@ func MyUpdateOrder(oldFilter string, subStatus, dateType int, now, startdate, en
 				contractMap["partyB_person"] = param.Contract_userB_contacts_name
 				contractMap["remark"] = param.Contract_remark
 			}
-			util.JysqlDB.Update("contract", map[string]interface{}{
+			config.JysqlDB.Update("contract", map[string]interface{}{
 				"order_code": param.OrderCode,
 			}, contractMap)
 		}

src/order/otherOrderController.go

@@ -18,8 +18,8 @@ import (
 	"strings"
 	"time"
 
-	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"go.mongodb.org/mongo-driver/bson"
+	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 )
 
 /*20210517 订单补录需求增加
@@ -307,7 +307,7 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 	code := param.OrderCode
 	//订单信息获取
 	res := map[string]interface{}{}
-	data := util.JysqlDB.SelectBySql("SELECT d.* FROM `dataexport_order` d WHERE d.order_code = ?", param.OrderCode)
+	data := config.JysqlDB.SelectBySql("SELECT d.* FROM `dataexport_order` d WHERE d.order_code = ?", param.OrderCode)
 	if data != nil && len(*data) > 0 {
 		res = (*data)[0]
 	} else {
@@ -325,12 +325,12 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 	//判断手机号是否修改
 	userId, vipStatus := "", 0
 	if res["user_phone"] != param.Phone {
-		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 		if ok && userData != nil && len(*userData) > 0 {
 			userId = mongodb.BsonIdToSId((*userData)["_id"])
 			vipStatus = common.IntAll((*userData)["i_vip_status"])
 		} else {
-			userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 			if oks && userDatas != nil && len(*userDatas) > 0 {
 				userId = mongodb.BsonIdToSId((*userDatas)["_id"])
 				vipStatus = common.IntAll((*userDatas)["i_vip_status"])
@@ -351,7 +351,7 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 				},
 				"s_regsource": "qmx_admin",
 			}
-			_id := util.MQFW.Save("user", data)
+			_id := config.MQFW.Save("user", data)
 			if _id != "" {
 				userId = _id
 				formdata := map[string]interface{}{
@@ -361,7 +361,7 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 				}
 				if !strings.HasPrefix(param.Phone, "9") {
 					ck := &http.Cookie{}
-					usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
+					usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
 					users.SaveUserLog(_id, param.Phone)
 				}
 			}
@@ -381,11 +381,11 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 				"i_vip_expire_tip":     0,                 //消息提示初始化
 				"o_vipjy.a_buyerclass": []interface{}{},   //设置行业
 			}
-			util.MQFW.UpdateById("user", common.ObjToString(res["user_id"]), bson.M{
+			config.MQFW.UpdateById("user", common.ObjToString(res["user_id"]), bson.M{
 				"$set": set,
 			})
 		}
-		util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": common.ObjToString(param.OrderCode)}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
+		config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": common.ObjToString(param.OrderCode)}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
 	}
 	//若业绩时间改变，时分秒改为当前时分秒
 	if param.SaleTime != common.ObjToString(res["sale_time"]) {
@@ -508,12 +508,12 @@ func MyUpdateOtherOrder(context *admin.Context) (interface{}, error) {
 	//判断手机号是否修改
 	userId, vipStatus := "", 0
 	if res["user_phone"] != param.Phone {
-		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 		if ok && userData != nil && len(*userData) > 0 {
 			userId = mongodb.BsonIdToSId((*userData)["_id"])
 			vipStatus = common.IntAll((*userData)["i_vip_status"])
 		} else {
-			userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 			if oks && userDatas != nil && len(*userDatas) > 0 {
 				userId = mongodb.BsonIdToSId((*userDatas)["_id"])
 				vipStatus = common.IntAll((*userDatas)["i_vip_status"])
@@ -539,11 +539,11 @@ func MyUpdateOtherOrder(context *admin.Context) (interface{}, error) {
 				"i_vip_expire_tip":     0,                 //消息提示初始化
 				"o_vipjy.a_buyerclass": []interface{}{},   //设置行业
 			}
-			util.MQFW.UpdateById("user", common.ObjToString(res["user_id"]), bson.M{
+			config.MQFW.UpdateById("user", common.ObjToString(res["user_id"]), bson.M{
 				"$set": set,
 			})
 		}
-		util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": common.ObjToString(param.OrderCode)}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
+		config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": common.ObjToString(param.OrderCode)}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
 	}
 
 	//处理订单状态
@@ -631,7 +631,7 @@ func UpdateOrder(context *admin.Context) (interface{}, error) {
 		"last_update_person":   param.CreatePerson,
 		"last_update_time":     date.NowFormat(date.Date_Full_Layout),
 	}
-	ok_1 := util.JysqlDB.Update("dataexport_order", map[string]interface{}{
+	ok_1 := config.JysqlDB.Update("dataexport_order", map[string]interface{}{
 		"order_code": param.OrderCode,
 	}, insertData)
 	if ok_1 {
@@ -665,7 +665,7 @@ func EditReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 	//if param.ReturnVoucherUrl == "" {
 	//	return nil, errors.New("缺少回款凭证")
 	//}
-	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"id": param.Id}, "", "")
+	orderData := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"id": param.Id}, "", "")
 	if orderData == nil || len(*orderData) == 0 {
 		return nil, errors.New("未找到该订单")
 	}
@@ -695,13 +695,13 @@ func EditBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 		//cbs回款
 		price := 0
 		//查询回款流水记录
-		transactionData := util.CbsDB.FindOne("transaction", map[string]interface{}{"id": param.TransactionId}, "return_id,BNKNAM,BNKFLW,id,ACTNBR,TRSBAL,BNKTIM,OTHNAM,NUSAGE", "")
+		transactionData := config.CbsDB.FindOne("transaction", map[string]interface{}{"id": param.TransactionId}, "return_id,BNKNAM,BNKFLW,id,ACTNBR,TRSBAL,BNKTIM,OTHNAM,NUSAGE", "")
 		if transactionData == nil || len(*transactionData) == 0 || common.ObjToString((*transactionData)["return_id"]) != "" {
 			return nil, errors.New("未找到该流水")
 		}
 		//查询订单金额
 		for _, value := range param.OrderArr {
-			orderData := util.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
+			orderData := config.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
 			if orderData == nil {
 				continue
 			}
@@ -732,7 +732,7 @@ func EditBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 		//手动录入回款
 		//查询订单金额
 		for _, value := range param.OrderArr {
-			orderData := util.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
+			orderData := config.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
 			if orderData == nil {
 				continue
 			}
@@ -772,42 +772,42 @@ func DeleteBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("缺少回款记录标识")
 	}
 	//先查看该回款是否存在
-	returnData := util.JysqlDB.SelectBySql("select * from  return_money_record where  id =" + common.ObjToString(param.Id) + " and  state=1")
+	returnData := config.JysqlDB.SelectBySql("select * from  return_money_record where  id =" + common.ObjToString(param.Id) + " and  state=1")
 	if returnData == nil || len(*returnData) == 0 {
 		return nil, errors.New("查不到该条回款记录信息")
 	}
-	status := util.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
+	status := config.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
 		//判断是cbs还是手动录入hffv
 		if common.Int64All((*returnData)[0]["flow_type"]) == 0 {
 			//cbs数据需要特殊处理
-			cbsData := util.CbsDB.SelectBySql("select * from `transaction`  where  FIND_IN_SET(" + common.ObjToString(param.Id) + ",return_id)")
+			cbsData := config.CbsDB.SelectBySql("select * from `transaction`  where  FIND_IN_SET(" + common.ObjToString(param.Id) + ",return_id)")
 			if cbsData != nil && len(*cbsData) > 0 {
 				//修改回款流水记录
 				updateTransactionData := map[string]interface{}{
 					"return_id":  "",
 					"ISRELATION": 0,
 				}
-				ok_1 := util.CbsDB.Update("transaction", map[string]interface{}{"id": (*cbsData)[0]["id"]}, updateTransactionData)
+				ok_1 := config.CbsDB.Update("transaction", map[string]interface{}{"id": (*cbsData)[0]["id"]}, updateTransactionData)
 				if !ok_1 {
 					return false
 				}
 			}
 			returnListData := &[]map[string]interface{}{}
 			if common.ObjToString((*returnData)[0]["bank_flow"]) != "" {
-				returnListData = util.JysqlDB.SelectBySql("select * from  return_money_record where  bank_flow ='" + common.ObjToString((*returnData)[0]["bank_flow"]) + "' and  state=1")
+				returnListData = config.JysqlDB.SelectBySql("select * from  return_money_record where  bank_flow ='" + common.ObjToString((*returnData)[0]["bank_flow"]) + "' and  state=1")
 			} else {
 				returnListData = returnData
 			}
 			for _, value := range *returnListData {
 				//查看该订单是否还存在别的回款信息
-				returnData = util.JysqlDB.SelectBySql("select * from  return_money_record where  order_code ='" + common.ObjToString(value["order_code"]) + "' and  state=1")
+				returnData = config.JysqlDB.SelectBySql("select * from  return_money_record where  order_code ='" + common.ObjToString(value["order_code"]) + "' and  state=1")
 				if returnData == nil || len(*returnData) == 0 {
 					return false
 				}
 				updateData := map[string]interface{}{
 					"state": 0,
 				}
-				recordOk := util.JysqlDB.UpdateByTx(tx, "return_money_record", map[string]interface{}{"id": value["id"]}, updateData)
+				recordOk := config.JysqlDB.UpdateByTx(tx, "return_money_record", map[string]interface{}{"id": value["id"]}, updateData)
 				if !recordOk {
 					return false
 				}
@@ -819,7 +819,7 @@ func DeleteBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 					//回款改为未回款
 					orderData["return_status"] = 0
 				}
-				orderOk := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": value["order_code"]}, orderData)
+				orderOk := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": value["order_code"]}, orderData)
 				if !orderOk {
 					return false
 				}
@@ -829,21 +829,21 @@ func DeleteBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 			//手动录入处理简单,也会存在多个订单
 			if common.Int64All((*returnData)[0]["return_type"]) == 3 {
 				//回款方式，3-对公转账 通过银行流水号查找相同的
-				returnListData = util.JysqlDB.SelectBySql("select * from  return_money_record where  bank_flow ='" + common.ObjToString((*returnData)[0]["bank_flow"]) + "' and  state=1 and return_type=3")
+				returnListData = config.JysqlDB.SelectBySql("select * from  return_money_record where  bank_flow ='" + common.ObjToString((*returnData)[0]["bank_flow"]) + "' and  state=1 and return_type=3")
 			} else {
 				//回款方式，通过支付单号查找相同的
-				returnListData = util.JysqlDB.SelectBySql("select * from  return_money_record where  return_code ='" + common.ObjToString((*returnData)[0]["return_code"]) + "' and  state=1 and  return_type!=3")
+				returnListData = config.JysqlDB.SelectBySql("select * from  return_money_record where  return_code ='" + common.ObjToString((*returnData)[0]["return_code"]) + "' and  state=1 and  return_type!=3")
 			}
 			for _, value := range *returnListData {
 				//查看该订单是否还存在别的回款信息
-				returnData = util.JysqlDB.SelectBySql("select * from  return_money_record where  order_code ='" + common.ObjToString(value["order_code"]) + "' and  state=1")
+				returnData = config.JysqlDB.SelectBySql("select * from  return_money_record where  order_code ='" + common.ObjToString(value["order_code"]) + "' and  state=1")
 				if returnData == nil || len(*returnData) == 0 {
 					return false
 				}
 				updateData := map[string]interface{}{
 					"state": 0,
 				}
-				recordOk := util.JysqlDB.UpdateByTx(tx, "return_money_record", map[string]interface{}{"id": value["id"]}, updateData)
+				recordOk := config.JysqlDB.UpdateByTx(tx, "return_money_record", map[string]interface{}{"id": value["id"]}, updateData)
 				if !recordOk {
 					return false
 				}
@@ -855,7 +855,7 @@ func DeleteBatchReturnMoneyInfo(context *admin.Context) (interface{}, error) {
 					//回款改为未回款
 					orderData["return_status"] = 0
 				}
-				orderOk := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": value["order_code"]}, orderData)
+				orderOk := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": value["order_code"]}, orderData)
 				if !orderOk {
 					return false
 				}
@@ -885,8 +885,8 @@ func CollectionFlow(context *admin.Context) (interface{}, error) {
 	if param.CorporateName == "" {
 		return map[string]interface{}{"status": status, "list": []map[string]interface{}{}, "total": 0}, nil
 	}
-	transactionList := util.CbsDB.SelectBySql("select NUSAGE,BNKNAM,BNKFLW,id,TRSBAL,BNKTIM,OTHNAM from  transaction where   OTHNAM=? and   ISRELATION =0  order by BNKTIM desc limit ? , ? ", param.CorporateName, param.Offset, param.PageSize)
-	count := util.CbsDB.CountBySql("select count(id) from  transaction where   OTHNAM=? and   ISRELATION =0  ", param.CorporateName)
+	transactionList := config.CbsDB.SelectBySql("select NUSAGE,BNKNAM,BNKFLW,id,TRSBAL,BNKTIM,OTHNAM from  transaction where   OTHNAM=? and   ISRELATION =0  order by BNKTIM desc limit ? , ? ", param.CorporateName, param.Offset, param.PageSize)
+	count := config.CbsDB.CountBySql("select count(id) from  transaction where   OTHNAM=? and   ISRELATION =0  ", param.CorporateName)
 
 	return map[string]interface{}{"status": status, "list": transactionList, "total": count}, nil
 }
@@ -905,7 +905,7 @@ func SurplusPrice(context *admin.Context) (interface{}, error) {
 	}
 	price := int(0)
 	for key, value := range param.OrderArr {
-		orderData := util.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
+		orderData := config.JysqlDB.SelectBySql("select  (IFNULL( a.pay_money, 0 )-IFNULL(a.commission,0)-IFNULL(a.procedures_money,0))-(select  IFNULL(sum(b.return_money),0) from  return_money_record  b where b.order_code=a.order_code and  b.state=1) + (select  IFNULL(sum(c.refund_money),0) from refund_record c where c.order_code=a.order_code) as outstandingPayment, a.*  from  dataexport_order a where  a.id=?", value["orderId"])
 		if orderData == nil {
 			continue
 		}
@@ -930,8 +930,8 @@ func UploadContractFile(context *admin.Context) (interface{}, error) {
 	if param.ContractFileUrl == "" {
 		return nil, errors.New("缺少合同文件")
 	}
-	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
-	contractData := util.JysqlDB.FindOne("contract", map[string]interface{}{"id": param.Id}, "", "")
+	orderData := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
+	contractData := config.JysqlDB.FindOne("contract", map[string]interface{}{"id": param.Id}, "", "")
 	var status bool
 	if contractData == nil || len(*contractData) == 0 {
 		if orderData == nil || len(*orderData) == 0 {
@@ -962,18 +962,18 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	orderData := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter,is_backstage_order,sale_time", "")
+	orderData := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter,is_backstage_order,sale_time", "")
 	if param.Phone == "" && param.Salesperson == "" && param.StartTime == 0 && param.SaleTime == "" {
 		return nil, errors.New("输入内容不能为空")
 	}
 	if param.Phone != "" {
-		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 		userId, memberStatus := "", 0
 		if ok && userData != nil && len(*userData) > 0 {
 			userId = mongodb.BsonIdToSId((*userData)["_id"])
 			memberStatus = common.IntAll((*userData)["i_member_status"])
 		} else {
-			userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 			if oks && userDatas != nil && len(*userDatas) > 0 {
 				userId = mongodb.BsonIdToSId((*userDatas)["_id"])
 				memberStatus = common.IntAll((*userDatas)["i_member_status"])
@@ -983,7 +983,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 			return nil, errors.New("此手机号已有大会员权限，无法修改！")
 		}
 		if userId == "" {
-			datas, oks := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+			datas, oks := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 			memberState, bigStart, bigEnd, paySub, freeSub := 0, int64(0), int64(0), 0, 0
 			if oks && datas != nil && len(*datas) > 0 {
 				memberState = common.IntAll((*datas)["i_member_status"])
@@ -1014,7 +1014,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 				"i_pay_sub_num":      paySub + freeSub,
 				//"i_free_sub_num":     0,
 			}
-			_id := util.MQFW.Save("user", data)
+			_id := config.MQFW.Save("user", data)
 			if _id != "" {
 				userId = _id
 				formdata := map[string]interface{}{
@@ -1024,12 +1024,12 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 				}
 				if !strings.HasPrefix(param.Phone, "9") {
 					ck := &http.Cookie{}
-					usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
+					usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
 					users.SaveUserLog(_id, param.Phone)
 				}
 			}
 		} else {
-			datas, oks := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+			datas, oks := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 			memberState, bigStart, bigEnd, paySub, freeSub := 0, int64(0), int64(0), 0, 0
 			if oks && datas != nil && len(*datas) > 0 {
 				memberState = common.IntAll((*datas)["i_member_status"])
@@ -1054,23 +1054,23 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 			set := map[string]interface{}{
 				"$set": sets,
 			}
-			util.MQFW.UpdateById("user", userId, set)
+			config.MQFW.UpdateById("user", userId, set)
 		}
-		subData, okss := util.MQFW.Find("user", map[string]interface{}{"s_member_mainid": param.UserId}, nil, nil, false, -1, -1)
+		subData, okss := config.MQFW.Find("user", map[string]interface{}{"s_member_mainid": param.UserId}, nil, nil, false, -1, -1)
 		if okss && subData != nil && len(*subData) > 0 {
 			for _, v := range *subData {
-				util.MQFW.UpdateById("user", mongodb.BsonIdToSId(v["_id"]), map[string]interface{}{"$set": map[string]interface{}{"s_member_mainid": userId}})
+				config.MQFW.UpdateById("user", mongodb.BsonIdToSId(v["_id"]), map[string]interface{}{"$set": map[string]interface{}{"s_member_mainid": userId}})
 			}
 		}
-		oks := util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
-		oks = util.JysqlDB.Update("dataexport_order", map[string]interface{}{"user_phone": param.UserPhone}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
+		oks := config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
+		oks = config.JysqlDB.Update("dataexport_order", map[string]interface{}{"user_phone": param.UserPhone}, map[string]interface{}{"user_phone": param.Phone, "user_id": userId})
 		if oks {
-			okss := util.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{"s_userid": userId})
+			okss := config.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{"s_userid": userId})
 			if okss {
 				log.Println("用户服务表修改用户id成功", param.UserId, userId)
 				if strings.HasPrefix(param.UserPhone, "9") {
-					util.MQFW.Del("user", map[string]interface{}{"s_phone": param.UserPhone})
-					util.JysqlDB.Delete("user", map[string]interface{}{"user_id": param.UserId})
+					config.MQFW.Del("user", map[string]interface{}{"s_phone": param.UserPhone})
+					config.JysqlDB.Delete("user", map[string]interface{}{"user_id": param.UserId})
 				}
 			} else {
 				log.Println("用户服务表修改用户id失败", param.UserId, userId)
@@ -1082,7 +1082,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 		return map[string]interface{}{"status": ok}, nil
 	}
 	if param.Salesperson != "" {
-		ok := util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"salesperson": param.Salesperson})
+		ok := config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"salesperson": param.Salesperson})
 		return map[string]interface{}{"status": ok}, nil
 	}
 	if param.StartTime != 0 {
@@ -1098,7 +1098,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 			},
 		}
 		_, max := GetDayMinMax(time.Now())
-		datas, oks := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		datas, oks := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		memberState, buyStart := 0, int64(0)
 		if oks && datas != nil && len(*datas) > 0 {
 			memberState = common.IntAll((*datas)["i_member_status"])
@@ -1118,30 +1118,30 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 					"i_member_status":    common.If(memberState > 0, memberState, -memberState),
 				},
 			}
-			util.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{
+			config.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{
 				"l_starttime": date.FormatDate(&startdate, date.Date_Full_Layout),
 				"l_endtime":   date.FormatDate(&enddate, date.Date_Full_Layout),
 				"i_status":    0,
 			})
 		} else {
-			util.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{
+			config.JysqlDB.Update("bigmember_service_user", map[string]interface{}{"s_userid": param.UserId}, map[string]interface{}{
 				"l_starttime": date.FormatDate(&startdate, date.Date_Full_Layout),
 				"l_endtime":   date.FormatDate(&enddate, date.Date_Full_Layout),
 			})
 		}
-		util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{
+		config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{
 			"vip_starttime": date.FormatDate(&startdate, date.Date_Full_Layout),
 			"vip_endtime":   date.FormatDate(&enddate, date.Date_Full_Layout),
 			"filter":        string(filter_map),
 		})
 		// 同步修改子账号的有效时间  查询条件为大会员订单的创建时间同一天的和手机号。
 		//1.   计算出当天的时间范围
-		orderData2 := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter,create_time,user_phone", "")
+		orderData2 := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "filter,create_time,user_phone", "")
 		today, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString((*orderData2)["create_time"]), time.Local)
 		updateSubPhone := (*orderData2)["user_phone"]
 		createMin, createMax := GetDayMinMax(today)
 		//2. 根据查询条件查询出需要更新订单
-		subDataList := util.JysqlDB.SelectBySql("select * from dataexport_order where user_phone=? and create_time>=? and create_time<=?", updateSubPhone, date.FormatDateByInt64(&createMin, date.Date_Full_Layout), date.FormatDateByInt64(&createMax, date.Date_Full_Layout))
+		subDataList := config.JysqlDB.SelectBySql("select * from dataexport_order where user_phone=? and create_time>=? and create_time<=?", updateSubPhone, date.FormatDateByInt64(&createMin, date.Date_Full_Layout), date.FormatDateByInt64(&createMax, date.Date_Full_Layout))
 		if subDataList != nil && len(*subDataList) > 0 {
 			//3. 执行更新操作
 			for _, subData := range *subDataList {
@@ -1151,7 +1151,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 				(*filterMapSub)["effective_date"] = enddate.Format("2006/01/02")
 				filter_map_sub, _ := json.Marshal(filterMapSub)
 				// 执行更新
-				util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": (subData)["order_code"]}, map[string]interface{}{
+				config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": (subData)["order_code"]}, map[string]interface{}{
 					"filter": string(filter_map_sub),
 				})
 			}
@@ -1159,7 +1159,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 			log.Println("未找到与之关联的订单", param.OrderCode, param.UserPhone, date.FormatDateByInt64(&createMin, date.Date_Full_Layout), date.FormatDateByInt64(&createMax, date.Date_Short_Layout))
 
 		}
-		util.MQFW.UpdateById("user", param.UserId, set)
+		config.MQFW.UpdateById("user", param.UserId, set)
 		ClearBigVipUserPower(param.UserId)
 	}
 
@@ -1177,7 +1177,7 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 				}
 			}
 		}
-		ok := util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"sale_time": param.SaleTime})
+		ok := config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, map[string]interface{}{"sale_time": param.SaleTime})
 		return map[string]interface{}{"status": ok}, nil
 	}
 	return map[string]interface{}{"status": true}, nil
@@ -1206,7 +1206,7 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 		if param.OrderCode != "" {
 			sqlStr += fmt.Sprintf(" AND order_code != '%s'", param.OrderCode)
 		}
-		count := util.JysqlDB.CountBySql(sqlStr)
+		count := config.JysqlDB.CountBySql(sqlStr)
 		if count > 0 {
 			return map[string]interface{}{
 				"willEffect": true,
@@ -1223,7 +1223,7 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 			"$gt": time.Now().Unix(),
 		},
 	}
-	count1 := util.MQFW.Count("user", query)
+	count1 := config.MQFW.Count("user", query)
 	if count1 > 0 {
 		willEffect = true
 	} else {
@@ -1233,7 +1233,7 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 				"$gt": time.Now().Unix(),
 			},
 		}
-		count2 := util.MQFW.Count("user", query2)
+		count2 := config.MQFW.Count("user", query2)
 		if count2 > 0 {
 			willEffect = true
 		}
@@ -1255,11 +1255,11 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 	}
 	//判断用户购买过超级订阅并且在有效期内   i_vip_status 开启状态：0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期
 	userInfo := map[string]interface{}{}
-	userData, ok := util.MQFW.FindOneByField("user", map[string]interface{}{"s_phone": param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
+	userData, ok := config.MQFW.FindOneByField("user", map[string]interface{}{"s_phone": param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 	if ok && userData != nil && len(*userData) > 0 {
 		userInfo = *userData
 	} else {
-		userDatas, oks := util.MQFW.FindOneByField("user", map[string]interface{}{"s_m_phone": param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
+		userDatas, oks := config.MQFW.FindOneByField("user", map[string]interface{}{"s_m_phone": param.Phone, "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			userInfo = *userDatas
 		} else {
@@ -1274,7 +1274,7 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 		userId := mongodb.BsonIdToSId(userInfo["_id"])
 
 		//查询订单信息获取客户名称
-		orderInfo := util.JysqlDB.SelectBySql("SELECT c.customer_name,d.company_name FROM dataexport_order d LEFT JOIN contract c ON c.order_code = d.order_code WHERE product_type = 'VIP订阅' and user_id = ? ORDER BY d.id DESC", userId)
+		orderInfo := config.JysqlDB.SelectBySql("SELECT c.customer_name,d.company_name FROM dataexport_order d LEFT JOIN contract c ON c.order_code = d.order_code WHERE product_type = 'VIP订阅' and user_id = ? ORDER BY d.id DESC", userId)
 		if len(*orderInfo) == 0 && param.BuySubject != "2" {
 			return nil, errors.New("查询订单表没有查到订单信息")
 		}
@@ -1349,7 +1349,7 @@ func CreateVipOrder(context *admin.Context) (interface{}, error) {
 
 	param.ContractMoney = renew_price
 	//查找之前是否开通超级订阅
-	userInfo, oks := util.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1,"s_m_phone":1,"s_phone":1}`)
+	userInfo, oks := config.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1,"s_m_phone":1,"s_phone":1}`)
 	if oks && userInfo != nil && len(*userInfo) > 0 {
 		if (*userInfo)["s_phone"] == nil {
 			param.Phone = fmt.Sprint((*userInfo)["s_m_phone"])
@@ -1363,7 +1363,7 @@ func CreateVipOrder(context *admin.Context) (interface{}, error) {
 				"$gt": time.Now().Unix(),
 			},
 		}
-		count1 := util.MQFW.Count("user", query)
+		count1 := config.MQFW.Count("user", query)
 		if count1 > 0 {
 			//有即将生效的
 			//查询到截止时间
@@ -1405,7 +1405,7 @@ func CreateVipOrder(context *admin.Context) (interface{}, error) {
 		}
 		//查询是有是超级订阅的数据
 		//判断用户购买过超级订阅并且在有效期内   i_vip_status 开启状态：0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期
-		userDatas, oks := util.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId), "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
+		userDatas, oks := config.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId), "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			//正在生效的
 			if fmt.Sprint((*userInfo)["i_vip_status"]) == "2" {

src/order/otherOrderService.go

@@ -62,7 +62,7 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 	if param.ProductType == "广告" {
 		filter_map["adSource"] = AdSourceMap[param.AdSource]
 	} else if param.ProductType == "数据流量包" {
-		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		if ok && userData != nil && len(*userData) > 0 {
 			if (*userData)["s_m_openid"] != nil {
 				s_m_openid = fmt.Sprint((*userData)["s_m_openid"])
@@ -105,7 +105,7 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 		filter_map["source"] = ""
 		filter_map["canInvoice"] = false
 	}
-	return util.JysqlDB.ExecTx("创建其他订单生成订单信息和合同信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("创建其他订单生成订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(filter_map)
 		insertData := map[string]interface{}{
 			"user_phone":           param.Phone,
@@ -220,12 +220,12 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 				delete(insertData, "return_status")
 			}
 		}
-		ok_1 := util.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
+		ok_1 := config.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
 		//资源中台
 		var ok_2 int64
 		ok_3 := true
 		if param.ProductType != "数据流量包" {
-			ok_2 = util.JysqlDB.InsertByTx(tx, "contract", contractData)
+			ok_2 = config.JysqlDB.InsertByTx(tx, "contract", contractData)
 		} else {
 			//待转化为时间戳的字符串 注意 这里的小时和分钟还要秒必须写 因为是跟着模板走的 修改模板的话也可以不写
 			//转化为时间戳 类型是int64
@@ -270,7 +270,7 @@ func createEntnicheOrder(param *CreateOtherOrderParams, code string) bool {
 		"paybackExpectDate": param.PaybackExpectDate,
 		"paybackOpenServer": param.PaybackOpenServer,
 	}
-	return util.JysqlDB.ExecTx("创建商机管理生成订单信息和合同信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("创建商机管理生成订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(filterMap)
 		var insertData = map[string]interface{}{
 			"user_phone":         param.Phone,
@@ -355,9 +355,9 @@ func createEntnicheOrder(param *CreateOtherOrderParams, code string) bool {
 		}
 		insertData["buyCount"] = param.BuyCount
 
-		//ok_1 := util.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
+		//ok_1 := config.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
 		ok1 := util.JyOrder("/CreateOrder", insertData)
-		ok2 := util.JysqlDB.InsertByTx(tx, "contract", contractData)
+		ok2 := config.JysqlDB.InsertByTx(tx, "contract", contractData)
 		return ok1 != -1 && ok2 != -1
 	})
 
@@ -387,7 +387,7 @@ func updateOtherOrder(oldFilter string, param *CreateOtherOrderParams, code stri
 	if param.ProductType == "广告" {
 		filterMap["adSource"] = AdSourceMap[param.AdSource]
 	} else if param.ProductType == "数据流量包" {
-		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		if ok && userData != nil && len(*userData) > 0 {
 			if (*userData)["s_m_openid"] != nil {
 				sMOpenid = fmt.Sprint((*userData)["s_m_openid"])
@@ -426,7 +426,7 @@ func updateOtherOrder(oldFilter string, param *CreateOtherOrderParams, code stri
 	if strings.Contains(oldFilter, "人工审核") {
 		filterMap["audit_type"] = "人工审核"
 	}
-	return util.JysqlDB.ExecTx("修改订单信息和创建合同信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("修改订单信息和创建合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(filterMap)
 		insertData := map[string]interface{}{
 			"order_code":         param.OrderCode,
@@ -529,7 +529,7 @@ func updateOtherOrder(oldFilter string, param *CreateOtherOrderParams, code stri
 		ok_2 := false
 		//ok_3 := true
 		if param.ProductType != "数据流量包" {
-			ok_2 = util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
+			ok_2 = config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
 				"order_code": code,
 			}, contractData)
 		} else {
@@ -581,7 +581,7 @@ func updateEntnicheOrder(oldFilter string, param *CreateOtherOrderParams, code s
 	if strings.Contains(oldFilter, "人工审核") {
 		filter_map["audit_type"] = "人工审核"
 	}
-	return util.JysqlDB.ExecTx("创建商机管理生成订单信息和合同信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("创建商机管理生成订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(filter_map)
 		insertData := map[string]interface{}{
 			"user_phone":         param.Phone,
@@ -660,7 +660,7 @@ func updateEntnicheOrder(oldFilter string, param *CreateOtherOrderParams, code s
 		insertData["buyCount"] = param.BuyCount
 
 		ok_1 := util.JyOrder("/UpdateOrder", insertData)
-		ok_2 := util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
+		ok_2 := config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
 			"order_code": code,
 		}, contractData)
 		return ok_1 != -1 && ok_2
@@ -758,9 +758,9 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 	userData := &map[string]interface{}{}
 	ok := false
 	if param.UserId == "" {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 	} else {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 	}
 	userId := ""
 	var vet string
@@ -787,9 +787,9 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 		userDatas := &map[string]interface{}{}
 		oks := false
 		if param.UserId == "" {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 		} else {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		}
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			userId = mongodb.BsonIdToSId((*userDatas)["_id"])
@@ -826,7 +826,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 					},
 					"s_regsource": "qmx_admin",
 				}
-				_id := util.MQFW.Save("user", data)
+				_id := config.MQFW.Save("user", data)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -836,7 +836,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
 						ck := &http.Cookie{}
-						usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
+						usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
 						users.SaveUserLog(_id, param.Phone)
 					}
 				}
@@ -869,7 +869,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			return false, "自动创建企业信息失败"
 		}
 	}
-	b := util.JysqlDB.ExecTx("创建超级订阅生成订单信息和合同信息", func(tx *sql.Tx) bool {
+	b := config.JysqlDB.ExecTx("创建超级订阅生成订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(vms)
 		if param.Badge != "" {
 			param.ContractMoney = 0
@@ -979,8 +979,8 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			insertData["buy_subject"] = 1
 		}
 		insertData["buy_count"] = param.BuyCount
-		ok1 := util.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
-		ok2 := util.JysqlDB.InsertByTx(tx, "contract", contractData)
+		ok1 := config.JysqlDB.InsertByTx(tx, "dataexport_order", insertData)
+		ok2 := config.JysqlDB.InsertByTx(tx, "contract", contractData)
 		return ok1 != 0 && ok2 != -1
 	})
 	if b {
@@ -997,7 +997,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			if strings.Contains(param.VipStartTime, "2099") {
 				ss = 4070880000
 			}
-			_d := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": code}, "id,ent_id", "")
+			_d := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": code}, "id,ent_id", "")
 			if _d != nil && len(*_d) > 0 {
 				entService, userCount = EntServiceOpen(common.IntAll((*_d)["ent_id"]), param.Phone, param.ProductType, ss)
 				orderId := common.IntAll((*_d)["id"])
@@ -1060,7 +1060,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 				"i_vip_expire_tip": 0,
 				"i_vip_status":     2,
 			}
-			if !util.MQFW.UpdateById("user", userId,
+			if !config.MQFW.UpdateById("user", userId,
 				bson.M{"$set": set}) {
 				log.Printf("%s更新结束%d日期出错\n", userId, endTime.Unix())
 				return false, ""
@@ -1068,7 +1068,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			return true, date.FormatDate(&endTime, date.Date_Full_Layout)
 		} else { //2  升级
 			//失效未执行续费
-			if !util.MQFW.Update("vip_upgrade",
+			if !config.MQFW.Update("vip_upgrade",
 				&map[string]interface{}{"s_userid": userId, "i_isvalid": 0},
 				&map[string]interface{}{
 					"$set": map[string]interface{}{
@@ -1091,7 +1091,7 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			}
 			isOk := true
 			if param.BuySubject != "2" {
-				isOk = util.MQFW.UpdateById("user", userId, map[string]interface{}{
+				isOk = config.MQFW.UpdateById("user", userId, map[string]interface{}{
 					"$set": updata,
 				})
 			}
@@ -1193,9 +1193,9 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 	userData := &map[string]interface{}{}
 	ok := false
 	if param.UserId == "" {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 	} else {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 	}
 	if ok && userData != nil && len(*userData) > 0 {
 		userId = mongodb.BsonIdToSId((*userData)["_id"])
@@ -1221,9 +1221,9 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 		userDatas := &map[string]interface{}{}
 		oks := false
 		if param.UserId == "" {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 		} else {
-			userDatas, oks = util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
+			userDatas, oks = config.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
 		}
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			userId = mongodb.BsonIdToSId((*userDatas)["_id"])
@@ -1269,7 +1269,7 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 	if strings.Contains(oldFilter, "人工审核") {
 		vms.AuditType = "人工审核"
 	}
-	b := util.JysqlDB.ExecTx("修改订单信息和合同信息", func(tx *sql.Tx) bool {
+	b := config.JysqlDB.ExecTx("修改订单信息和合同信息", func(tx *sql.Tx) bool {
 		filter, _ := json.Marshal(vms)
 		if param.Badge != "" {
 			param.ContractMoney = 0
@@ -1371,10 +1371,10 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 			contractData["partyB_person"] = param.Contract_userB_contacts_name
 			contractData["remark"] = param.Contract_remark
 		}
-		ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
+		ok1 := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
 			"order_code": code,
 		}, insertData)
-		ok2 := util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
+		ok2 := config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{
 			"order_code": code,
 		}, contractData)
 		return ok1 && ok2
@@ -1391,7 +1391,7 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 			if strings.Contains(param.StartTime, "2099") {
 				ss = 4070880000
 			}
-			_d := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": code}, "id,ent_id", "")
+			_d := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": code}, "id,ent_id", "")
 			if _d != nil && len(*_d) > 0 {
 				entService, userCount = EntServiceOpen(common.IntAll((*_d)["ent_id"]), param.Phone, param.ProductType, ss)
 				orderId := common.IntAll((*_d)["id"])
@@ -1425,7 +1425,7 @@ func updateVipOrder(oldFilter string, param *CreateOtherOrderParams, code string
 					"o_vipjy.a_buyerclass": []interface{}{},   //设置行业
 				}
 				if param.BuySubject == "1" {
-					util.MQFW.UpdateById("user", userId, bson.M{
+					config.MQFW.UpdateById("user", userId, bson.M{
 						"$set": set,
 					})
 					ClearBigVipUserPower(userId)
@@ -1487,14 +1487,14 @@ func ClearBigVipUserPower(userId string) {
 	if mongodb.IsObjectIdHex(userId) {
 		user_id := userId
 		//大会员主账号清理
-		userDatas, ok := util.MQFW.Find("user", map[string]interface{}{"s_member_mainid": user_id, "i_member_sub_status": 1}, nil, nil, false, -1, -1)
+		userDatas, ok := config.MQFW.Find("user", map[string]interface{}{"s_member_mainid": user_id, "i_member_sub_status": 1}, nil, nil, false, -1, -1)
 		if ok && userDatas != nil && len(*userDatas) > 0 {
 			for _, v := range *userDatas {
 				user_id := m.BsonIdToSId(v["_id"])
-				userData, ok := util.MQFW.FindById("user", user_id, `"base_user_id":1`)
+				userData, ok := config.MQFW.FindById("user", user_id, `"base_user_id":1`)
 				if userData != nil && len(*userData) > 0 && ok {
 					baseUserId := common.Int64All((*userData)["base_user_id"])
-					positionData := util.BaseDB.FindOne(util.BasePosition, map[string]interface{}{
+					positionData := config.BaseDB.FindOne(util.BasePosition, map[string]interface{}{
 						"type":    0,
 						"ent_id":  0,
 						"user_id": baseUserId,
@@ -1508,10 +1508,10 @@ func ClearBigVipUserPower(userId string) {
 			}
 		}
 		//通过mongo查找职位标识
-		userData, ok := util.MQFW.FindById("user", userId, `"base_user_id":1`)
+		userData, ok := config.MQFW.FindById("user", userId, `"base_user_id":1`)
 		if userData != nil && len(*userData) > 0 && ok {
 			baseUserId := common.Int64All((*userData)["base_user_id"])
-			positionData := util.BaseDB.FindOne(util.BasePosition, map[string]interface{}{
+			positionData := config.BaseDB.FindOne(util.BasePosition, map[string]interface{}{
 				"type":    0,
 				"ent_id":  0,
 				"user_id": baseUserId,
@@ -1546,7 +1546,7 @@ func ClearBigVipUserPower(userId string) {
 
 // 开始使用超级订阅
 func StartSubVip(set map[string]interface{}, userId string) bool {
-	isOk := util.MQFW.UpdateById("user", userId, bson.M{
+	isOk := config.MQFW.UpdateById("user", userId, bson.M{
 		"$set": set,
 	})
 	go func() {
@@ -1566,13 +1566,13 @@ func MergeKws(userId string) {
 	if userId == "" { //11-11 取消此操作
 		return
 	}
-	data, ok := util.MQFW.FindById("user", userId, `{"o_jy":1,"o_vipjy":1}`)
+	data, ok := config.MQFW.FindById("user", userId, `{"o_jy":1,"o_vipjy":1}`)
 	var o_vipjy map[string]interface{}
 	if ok && data != nil && len(*data) > 0 {
 		o_vipjy, _ = (*data)["o_vipjy"].(map[string]interface{})
 		a_items, _ := o_vipjy["a_items"].([]interface{})
 		if a_items == nil { //首次
-			util.MQFW.UpdateById("user", userId, bson.M{
+			config.MQFW.UpdateById("user", userId, bson.M{
 				"$set": bson.M{"o_vipjy.i_matchway": 1, "o_vipjy.i_ratemode": 1, "o_vipjy.i_wxpush": 1, "o_vipjy.i_apppush": 1, "o_vipjy.i_projectmatch": 0, "o_vipjy.a_infotype": []string{}, "o_vipjy.a_items": []string{}, "o_vipjy.l_modifydate": time.Now().Unix()},
 			})
 		}
@@ -1581,7 +1581,7 @@ func MergeKws(userId string) {
 
 // 编辑回款信息
 func UpdateReturnInfo(param *UpdateReturnParams, orderData map[string]interface{}) bool {
-	returninvoceRes := util.JysqlDB.SelectBySql("SELECT DISTINCT return_invoice_status from return_money_record  where order_code=? and  state=1", param.OrderCode)
+	returninvoceRes := config.JysqlDB.SelectBySql("SELECT DISTINCT return_invoice_status from return_money_record  where order_code=? and  state=1", param.OrderCode)
 	//// 当回款交易详情中的发票状态全部为“未申请发票”或暂无回款交易详情信息时，此处默认显示“未申请”
 	////当回款交易详情中的发票状态有“已申请发票”时，此处显示“已申请”
 	////当回款交易详情中的发票状态为“已开具发票”和其他状态时，此处显示“部分开票”
@@ -1620,7 +1620,7 @@ func UpdateReturnInfo(param *UpdateReturnParams, orderData map[string]interface{
 	if yikaijuFlag == true && (yishenqFlag == true || weishenqFlag == true) {
 		invoiceStatus = 3
 	}
-	return util.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
 		insertData := map[string]interface{}{
 			"order_code":            param.OrderCode,
 			"return_time":           param.ReturnTime,
@@ -1647,8 +1647,8 @@ func UpdateReturnInfo(param *UpdateReturnParams, orderData map[string]interface{
 			"filter":           string(filter_map),
 			"pay_time":         date.NowFormat(date.Date_Full_Layout),
 		}
-		ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": param.Id}, updateData)
-		ok2 := util.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
+		ok1 := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": param.Id}, updateData)
+		ok2 := config.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
 		return ok1 && ok2 != -1
 	})
 
@@ -1656,7 +1656,7 @@ func UpdateReturnInfo(param *UpdateReturnParams, orderData map[string]interface{
 
 // 编辑回款信息
 func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map[string]map[string]interface{}, operatePerson string, param *Return) bool {
-	return util.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
 		return_id := ""
 		money := int(math.Floor(float64(float32(common.Float64All((*transactionData)["TRSBAL"]))*100 + 0.5))) //流水
 		for key, value := range orderArr {
@@ -1686,8 +1686,8 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 				"filter":   string(filter_map),
 				"pay_time": (*transactionData)["BNKTIM"],
 			}
-			returnData := util.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, key)
-			refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, key)
+			returnData := config.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, key)
+			refundData := config.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, key)
 			return_moneys := common.IntAll((*returnData)[0]["return_money"])
 			refund_money := common.IntAll((*refundData)[0]["refund_money"])
 			if return_money+return_moneys == refund_money {
@@ -1703,13 +1703,13 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 			if common.IntAll(value["order_status"]) == 0 {
 				updateData["order_status"] = 1
 			}
-			contract := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])}, "", "")
-			count := util.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])})
+			contract := config.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])}, "", "")
+			count := config.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])})
 			if count < 1 && contract != nil && common.IntAll((*contract)["contract_archive_status"]) != 1 {
 				updateData["sale_time"] = (*transactionData)["BNKTIM"]
 			}
-			ok_1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
-			ok_2 := util.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
+			ok_1 := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
+			ok_2 := config.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
 			if ok_1 && ok_2 != -1 {
 				paybackOpenServer := false
 				if v, ok := ((*filterMap)["paybackOpenServer"]).(bool); ok {
@@ -1733,7 +1733,7 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 			"return_id":  return_id[:len(return_id)-1],
 			"ISRELATION": 1,
 		}
-		ok1 := util.CbsDB.Update("transaction", map[string]interface{}{"id": (*transactionData)["id"]}, updateTransactionData)
+		ok1 := config.CbsDB.Update("transaction", map[string]interface{}{"id": (*transactionData)["id"]}, updateTransactionData)
 		return ok1
 	})
 
@@ -1741,7 +1741,7 @@ func UpdateBatchReturnInfo(transactionData *map[string]interface{}, orderArr map
 
 // 手动录入编辑回款信息
 func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, operatePerson string, param *Return) bool {
-	return util.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
+	return config.JysqlDB.ExecTx("编辑回款信息", func(tx *sql.Tx) bool {
 		return_id := ""
 		for key, value := range orderArr {
 			returnMoney := common.IntAll(value["realPrice"])
@@ -1770,8 +1770,8 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 				"filter":   string(filter_map),
 				"pay_time": param.BNKTIM,
 			}
-			returnData := util.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, key)
-			refundData := util.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, key)
+			returnData := config.JysqlDB.SelectBySql(`select IFNULL(sum(return_money),0) as return_money from return_money_record where order_code=? and state=1`, key)
+			refundData := config.JysqlDB.SelectBySql(`select IFNULL(sum(refund_money),0) as refund_money from refund_record where order_code=?`, key)
 			return_moneys := common.IntAll((*returnData)[0]["return_money"])
 			refund_money := common.IntAll((*refundData)[0]["refund_money"])
 			if returnMoney+return_moneys == refund_money {
@@ -1787,13 +1787,13 @@ func ManualUpdateBatchReturnInfo(orderArr map[string]map[string]interface{}, ope
 			if common.IntAll(value["order_status"]) == 0 {
 				updateData["order_status"] = 1
 			}
-			contract := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])}, "", "")
-			count := util.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])})
+			contract := config.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])}, "", "")
+			count := config.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": common.ObjToString(value["order_code"])})
 			if count < 1 && contract != nil && common.IntAll((*contract)["contract_archive_status"]) != 1 {
 				updateData["sale_time"] = param.BNKTIM
 			}
-			ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
-			ok2 := util.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
+			ok1 := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": value["id"]}, updateData)
+			ok2 := config.JysqlDB.InsertByTx(tx, "return_money_record", insertData)
 			if ok1 && ok2 != -1 {
 				paybackOpenServer := false
 				if v, ok := ((*filterMap)["paybackOpenServer"]).(bool); ok {
@@ -1824,9 +1824,9 @@ func UpdateContractFile(id int, contractFileUrl string, orderData *map[string]in
 	updateData := map[string]interface{}{
 		"contract_file_url": contractFileUrl,
 	}
-	return util.JysqlDB.ExecTx("上传合同", func(tx *sql.Tx) bool {
-		ok_1 := util.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{"id": id}, updateData)
-		status := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": (*orderData)["id"]}, map[string]interface{}{
+	return config.JysqlDB.ExecTx("上传合同", func(tx *sql.Tx) bool {
+		ok_1 := config.JysqlDB.UpdateByTx(tx, "contract", map[string]interface{}{"id": id}, updateData)
+		status := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": (*orderData)["id"]}, map[string]interface{}{
 			"filter": string(filter_map),
 		})
 		return ok_1 && status
@@ -1842,9 +1842,9 @@ func insertContractFile(orderCode string, contractFileUrl string, contractMoney
 	filterMap := common.ObjToMap((*orderData)["filter"])
 	(*filterMap)["contractStatus"] = 1
 	filter_map, _ := json.Marshal(filterMap)
-	return util.JysqlDB.ExecTx("新增合同记录", func(tx *sql.Tx) bool {
-		ok_1 := util.JysqlDB.InsertByTx(tx, "contract", updateData)
-		status := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": (*orderData)["id"]}, map[string]interface{}{
+	return config.JysqlDB.ExecTx("新增合同记录", func(tx *sql.Tx) bool {
+		ok_1 := config.JysqlDB.InsertByTx(tx, "contract", updateData)
+		status := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"id": (*orderData)["id"]}, map[string]interface{}{
 			"filter": string(filter_map),
 		})
 		return ok_1 > 0 && status
@@ -1874,14 +1874,14 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 		(*res)["data_spec"] = "自定义字段包"
 	}
 	// 回款信息
-	returnInfo := util.JysqlDB.SelectBySql("SELECT COUNT(*)  count,SUM(return_money) money from return_money_record  WHERE order_code=? and  state=1", (*res)["order_code"])
+	returnInfo := config.JysqlDB.SelectBySql("SELECT COUNT(*)  count,SUM(return_money) money from return_money_record  WHERE order_code=? and  state=1", (*res)["order_code"])
 	// 回款交易详情列表
-	returnRes := util.JysqlDB.Find("return_money_record", map[string]interface{}{"order_code": (*res)["order_code"], "state": 1}, "", "", 0, 0)
+	returnRes := config.JysqlDB.Find("return_money_record", map[string]interface{}{"order_code": (*res)["order_code"], "state": 1}, "", "", 0, 0)
 
 	applybill_status := common.IntAll((*res)["applybill_status"])
 
 	// 发票信息
-	//returninvoceRes := util.JysqlDB.SelectBySql("SELECT DISTINCT return_invoice_status from return_money_record WHERE order_code=? ", (*res)["order_code"])
+	//returninvoceRes := config.JysqlDB.SelectBySql("SELECT DISTINCT return_invoice_status from return_money_record WHERE order_code=? ", (*res)["order_code"])
 	(*res)["invoice"] = []map[string]interface{}{}
 	if applybill_status == 1 || applybill_status == 2 || applybill_status == 3 {
 		invoiceList := GetOrderInvoiceList(common.ObjToString((*res)["order_code"]), common.ObjToString((*res)["company_name"]))
@@ -1930,7 +1930,7 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 // 创建课程订单
 func createCourseOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 	//订单创建
-	data, _ := util.MQFW.FindById("jy_course", param.CourseId, false)
+	data, _ := config.MQFW.FindById("jy_course", param.CourseId, false)
 	price := common.IntAll((*data)["i_price"])
 	//生成订单号
 	detail := map[string]interface{}{
@@ -1986,15 +1986,15 @@ func createCourseOrder(param *CreateOtherOrderParams, code string) (bool, string
 	if param.Pay_time != "" {
 		insertData["pay_time"] = param.Pay_time
 	}
-	ok_1 := util.JysqlDB.Insert("dataexport_order", insertData)
+	ok_1 := config.JysqlDB.Insert("dataexport_order", insertData)
 	return ok_1 > 0, ""
 }
 func GetNameList(name string) (rs *[]map[string]interface{}) {
 	if name != "" {
-		rs = util.AdminDB.SelectBySql(fmt.Sprintf("select id,username from admin_user where status =1 and username like '%%%v%%'", name))
+		rs = config.AdminDB.SelectBySql(fmt.Sprintf("select id,username from admin_user where status =1 and username like '%%%v%%'", name))
 
 	} else {
-		rs = util.AdminDB.SelectBySql("select id,username from admin_user where status =1")
+		rs = config.AdminDB.SelectBySql("select id,username from admin_user where status =1")
 
 	}
 
@@ -2007,7 +2007,7 @@ func UpdateRule(entId int, update map[string]interface{}, phone string) bool {
 	ok := false
 	if entId > 0 && phone != "" {
 		//查找之前数据是否存在
-		userData := util.JysqlDB.FindOne("entniche_user", map[string]interface{}{
+		userData := config.JysqlDB.FindOne("entniche_user", map[string]interface{}{
 			"ent_id": entId,
 			"phone":  phone,
 		}, `id`, "")
@@ -2053,7 +2053,7 @@ func UpdateRule(entId int, update map[string]interface{}, phone string) bool {
 		}
 		ok1, ok2 := false, false
 		//查看之前是否有数据
-		data, ok := util.MQFW.Find("entniche_rule", map[string]interface{}{
+		data, ok := config.MQFW.Find("entniche_rule", map[string]interface{}{
 			"i_entid":  entId,
 			"i_userid": (*userData)["id"],
 			"i_type":   tp,
@@ -2062,7 +2062,7 @@ func UpdateRule(entId int, update map[string]interface{}, phone string) bool {
 			up3 := map[string]interface{}{
 				"$set": map[string]interface{}{"o_entniche.i_matchway": 1, "o_entniche.i_ratemode": 1, "o_entniche.i_wxpush": 1, "o_entniche.i_apppush": 1, "o_entniche.i_projectmatch": 0, "o_entniche.a_infotype": []string{}, "o_entniche.a_items": []string{}, "o_entniche.l_modifydate": time.Now().Unix()},
 			}
-			util.MQFW.Update("entniche_rule", map[string]interface{}{
+			config.MQFW.Update("entniche_rule", map[string]interface{}{
 				"i_entid":  entId,
 				"i_userid": (*userData)["id"],
 				"i_type":   tp,
@@ -2070,7 +2070,7 @@ func UpdateRule(entId int, update map[string]interface{}, phone string) bool {
 		}
 
 		if len(up2) > 0 {
-			ok2 = util.MQFW.Update("entniche_rule", map[string]interface{}{
+			ok2 = config.MQFW.Update("entniche_rule", map[string]interface{}{
 				"i_entid":  entId,
 				"i_userid": (*userData)["id"],
 				"i_type":   tp,
@@ -2085,10 +2085,10 @@ func UpdateRule(entId int, update map[string]interface{}, phone string) bool {
 				"i_entid":  entId,
 				"i_userid": (*userData)["id"],
 			}
-			if util.MQFW.Count("ent_user", query) > 0 {
+			if config.MQFW.Count("ent_user", query) > 0 {
 				return true
 			}
-			ok1 = util.MQFW.Update("ent_user", map[string]interface{}{
+			ok1 = config.MQFW.Update("ent_user", map[string]interface{}{
 				"i_entid":  entId,
 				"i_userid": (*userData)["id"],
 			}, up1, true, false)

src/order/serviceOpen.go

@@ -9,10 +9,10 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"go.mongodb.org/mongo-driver/bson"
 	"log"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
+	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"regexp"
 	"strconv"
 	"strings"
@@ -31,7 +31,7 @@ func ServiceOpen(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	//查询订单
-	order := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
+	order := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
 	if order == nil {
 		return nil, errors.New("为查询到订单信息")
 	}
@@ -71,8 +71,8 @@ func ServiceOpen(context *admin.Context) (interface{}, error) {
 			}
 		} else if productType == "大会员" {
 			if strings.HasPrefix(common.ObjToString((*order)["user_phone"]), "9") {
-				util.MQFW.Del("user", map[string]interface{}{"s_phone": common.ObjToString((*order)["user_phone"])})
-				util.JysqlDB.Delete("user", map[string]interface{}{"user_id": common.ObjToString((*order)["user_id"])})
+				config.MQFW.Del("user", map[string]interface{}{"s_phone": common.ObjToString((*order)["user_phone"])})
+				config.JysqlDB.Delete("user", map[string]interface{}{"user_id": common.ObjToString((*order)["user_id"])})
 			} else if common.IntAll((*order)["buy_subject"]) == 1 {
 				sets := map[string]interface{}{
 					"i_member_status":    -common.IntAll(filterMap["level"]),
@@ -89,13 +89,13 @@ func ServiceOpen(context *admin.Context) (interface{}, error) {
 					},
 				}
 				sql_ := "update bigmember_service_user set i_status = -1 where  s_userid = ?"
-				util.JysqlDB.UpdateOrDeleteBySql(sql_, (*order)["user_id"])
+				config.JysqlDB.UpdateOrDeleteBySql(sql_, (*order)["user_id"])
 				ClearBigVipUserPower(common.ObjToString((*order)["user_id"]))
 			}
 		}
 		updateMap["user_id"] = userId
 		updateMap["user_phone"] = param.Phone
-		util.MQFW.UpdateById("user", common.ObjToString((*order)["user_id"]), bson.M{
+		config.MQFW.UpdateById("user", common.ObjToString((*order)["user_id"]), bson.M{
 			"$set": set,
 		})
 	} else {
@@ -189,7 +189,7 @@ func ServiceOpen(context *admin.Context) (interface{}, error) {
 				if common.IntAll(filterMap["comboId"]) == 5 {
 					sName = ComboCustom
 				} else {
-					combo := util.JysqlDB.FindOne("bigmember_combo", map[string]interface{}{"id": common.IntAll(filterMap["comboId"])}, "", "")
+					combo := config.JysqlDB.FindOne("bigmember_combo", map[string]interface{}{"id": common.IntAll(filterMap["comboId"])}, "", "")
 					if combo != nil && len(*combo) > 0 {
 						sName = common.ObjToString((*combo)["s_name"])
 					}
@@ -226,7 +226,7 @@ func ServiceOpen(context *admin.Context) (interface{}, error) {
 		}
 	}
 	//更新订单
-	if !util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateMap) {
+	if !config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, updateMap) {
 		return nil, errors.New("权益已开通，更新订单出错")
 	}
 	PayUserIdentitySwitchRedis(mgoUserId, redisData)
@@ -268,7 +268,7 @@ func VipServiceOpen(userId, phone string, filterMap map[string]interface{}, vipS
 		"o_vipjy.a_buyerclass": []interface{}{},                                            //设置行业
 	}
 	if buySubject == 1 {
-		util.MQFW.UpdateById("user", userId, bson.M{
+		config.MQFW.UpdateById("user", userId, bson.M{
 			"$set": set,
 		})
 		ClearBigVipUserPower(userId)
@@ -281,12 +281,12 @@ func VipServiceOpen(userId, phone string, filterMap map[string]interface{}, vipS
 }
 
 func FindUserDataByPhone(phone string) (userId string, userData map[string]interface{}) {
-	userInfo, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
+	userInfo, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
 	if ok && userInfo != nil && len(*userInfo) > 0 {
 		userId = mongodb.BsonIdToSId((*userInfo)["_id"])
 		userData = *userInfo
 	} else {
-		userInfo, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
+		userInfo, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
 		if ok && userInfo != nil && len(*userInfo) > 0 {
 			userId = mongodb.BsonIdToSId((*userInfo)["_id"])
 			userData = *userInfo
@@ -330,7 +330,7 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 		set["$unset"] = unset
 	}
 	if buySubject != 2 {
-		ok = util.MQFW.UpdateById("user", userId, set)
+		ok = config.MQFW.UpdateById("user", userId, set)
 	} else {
 		ok = UpdateRule(entId, set, phone)
 	}
@@ -340,10 +340,10 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 	serverMap := GetServerPid()
 	if buyCount-1 > 0 { //子账号开通权益
 		sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-		serverData := util.JysqlDB.SelectBySql(sqls, 2, userId)
+		serverData := config.JysqlDB.SelectBySql(sqls, 2, userId)
 		if serverData != nil && len(*serverData) > 0 {
 			s := "update bigmember_service_user set l_updatetime = ?,l_starttime = ?,l_endtime = ? where s_serviceid = ? and s_userid = ?"
-			status1 := util.JysqlDB.UpdateOrDeleteBySql(s, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startDate, date.Date_Full_Layout), date.FormatDate(&endDate, date.Date_Full_Layout), 2, userId)
+			status1 := config.JysqlDB.UpdateOrDeleteBySql(s, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startDate, date.Date_Full_Layout), date.FormatDate(&endDate, date.Date_Full_Layout), 2, userId)
 			if status1 < 0 {
 				return errors.New("新建服务-更新服务表出错")
 			}
@@ -358,7 +358,7 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 				"l_createtime": date.NowFormat(date.Date_Full_Layout),
 				"l_updatetime": date.NowFormat(date.Date_Full_Layout),
 			}
-			order_id := util.JysqlDB.Insert("bigmember_service_user", insert)
+			order_id := config.JysqlDB.Insert("bigmember_service_user", insert)
 			if order_id > 0 {
 				log.Println("用户服务表插入成功", userId)
 			}
@@ -370,7 +370,7 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 		if serverMap[serverId] != 0 {
 			serverId = serverMap[serverId]
 		}
-		serverData := util.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
+		serverData := config.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
 		frequency := 0
 		if serverData != nil && len(*serverData) > 0 {
 			if serverId == 11 || serverId == 15 {
@@ -388,11 +388,11 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 			}
 		}
 		sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-		serverDatas := util.JysqlDB.SelectBySql(sqls, serverId, userId)
+		serverDatas := config.JysqlDB.SelectBySql(sqls, serverId, userId)
 		if serverDatas != nil && len(*serverDatas) > 0 {
 			//i_status := common.If(dateType == 1, 0, 1)
 			sql2 := "update bigmember_service_user set l_updatetime = ?,l_starttime = ?,l_endtime = ?,i_status = ? where s_serviceid = ? and s_userid = ?"
-			status1 := util.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startDate, date.Date_Full_Layout), date.FormatDate(&endDate, date.Date_Full_Layout), fmt.Sprint(i_status), serverId, userId)
+			status1 := config.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startDate, date.Date_Full_Layout), date.FormatDate(&endDate, date.Date_Full_Layout), fmt.Sprint(i_status), serverId, userId)
 			if status1 < 0 {
 				return errors.New("新建服务-更新服务表出错")
 			}
@@ -408,7 +408,7 @@ func NewBigOpenService(filterMap map[string]interface{}, userId, phone string, s
 				"l_createtime": date.NowFormat(date.Date_Full_Layout),
 				"l_updatetime": date.NowFormat(date.Date_Full_Layout),
 			}
-			order_id := util.JysqlDB.Insert("bigmember_service_user", insert)
+			order_id := config.JysqlDB.Insert("bigmember_service_user", insert)
 			if order_id <= 0 {
 				return errors.New("用户服务表插入失败")
 			}
@@ -440,14 +440,14 @@ func GetStartAndEndTime(startTime string, cycleCount, cycleUnit int) (vipStartTi
 }
 
 func GetReturnTimeAndCheckTime(orderCode string) (newReturnMoneyTime, checkPassTime time.Time, err error) {
-	returnMoneyRecord := util.JysqlDB.FindOne("return_money_record", map[string]interface{}{"order_code": orderCode}, `"return_time"`, "return_time DESC")
+	returnMoneyRecord := config.JysqlDB.FindOne("return_money_record", map[string]interface{}{"order_code": orderCode}, `"return_time"`, "return_time DESC")
 	if returnMoneyRecord != nil && len(*returnMoneyRecord) > 0 {
 		newReturnMoneyTime, _ = time.ParseInLocation(date.Date_Full_Layout, common.ObjToString((*returnMoneyRecord)["return_time"]), time.Local)
 	} else {
 		return time.Time{}, time.Time{}, errors.New("查询回款记录表没有数据")
 	}
 	//查询审核通过时间
-	checkInfo := util.JysqlDB.FindOne("audit_records", map[string]interface{}{"order_code": orderCode, "audit_status": 3}, "", "")
+	checkInfo := config.JysqlDB.FindOne("audit_records", map[string]interface{}{"order_code": orderCode, "audit_status": 3}, "", "")
 	if checkInfo != nil && len(*checkInfo) > 0 {
 		checkPassTime, _ = time.ParseInLocation(date.Date_Full_Layout, common.ObjToString((*checkInfo)["create_time"]), time.Local)
 	} else {
@@ -539,7 +539,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 				}
 				_, newEndTime = GetStartAndEndTime(newStartTime.Format(date.Date_Short_Layout), common.IntAll(filterMap["cyclecount"]), common.IntAll(filterMap["cycleunit"]))
 				set["l_vip_endtime"] = newEndTime.Unix()
-				if !util.MQFW.UpdateById("user", userId,
+				if !config.MQFW.UpdateById("user", userId,
 					bson.M{"$set": set}) {
 					return errors.New(fmt.Sprintf("%s更新结束%d日期出错", userId, vipEndTime.Unix()))
 				}
@@ -551,7 +551,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 				if vipStatus != 2 {
 					return errors.New("服务已到期，权益开通失败")
 				}
-				if !util.MQFW.Update("vip_upgrade",
+				if !config.MQFW.Update("vip_upgrade",
 					&map[string]interface{}{"s_userid": userId, "i_isvalid": 0},
 					&map[string]interface{}{
 						"$set": map[string]interface{}{
@@ -571,7 +571,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 				if filterMap["industry"] != nil {
 					updata["o_vipjy.a_buyerclass"] = filterMap["industry"] //设置行业
 				}
-				if !util.MQFW.UpdateById("user", userId, map[string]interface{}{
+				if !config.MQFW.UpdateById("user", userId, map[string]interface{}{
 					"$set": updata,
 				}) {
 					return errors.New(fmt.Sprintf("%s更新用户出错 %+v", userId, updata))
@@ -616,7 +616,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 				if common.IntAll(filterMap["comboId"]) == 5 {
 					sName = ComboCustom
 				} else {
-					combo := util.JysqlDB.FindOne("bigmember_combo", map[string]interface{}{"id": common.IntAll(filterMap["comboId"])}, "", "")
+					combo := config.JysqlDB.FindOne("bigmember_combo", map[string]interface{}{"id": common.IntAll(filterMap["comboId"])}, "", "")
 					if combo != nil && len(*combo) > 0 {
 						sName = common.ObjToString((*combo)["s_name"])
 					}
@@ -698,7 +698,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 		areaCount := common.IntAll(filterMap["areaCount"])
 		buyCount := 0
 		if common.IntAll(orderInfo["buy_subject"]) == 2 {
-			res := util.JysqlDB.SelectBySql("SELECT c.end_time,c.start_time,c.province_count FROM dataexport_order a LEFT JOIN entniche_order b on a.id = b.order_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.order_code = ?", common.ObjToString(filterMap["contactOrderCode"]))
+			res := config.JysqlDB.SelectBySql("SELECT c.end_time,c.start_time,c.province_count FROM dataexport_order a LEFT JOIN entniche_order b on a.id = b.order_id LEFT JOIN entniche_wait_empower c ON b.wait_empower_id = c.id WHERE a.order_code = ?", common.ObjToString(filterMap["contactOrderCode"]))
 			if res != nil && len(*res) > 0 {
 				bs, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString((*res)[0]["start_time"]), time.Local)
 				be, _ := time.ParseInLocation(date.Date_Full_Layout, common.ObjToString((*res)[0]["end_time"]), time.Local)
@@ -758,7 +758,7 @@ func OpenUserService(tx *sql.Tx, orderCode string, orderInfo map[string]interfac
 	//updateOrder["filter"] = string(filter)
 
 	//更新订单
-	if !util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": orderCode}, updateOrder) {
+	if !config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": orderCode}, updateOrder) {
 		return errors.New("更新订单出错")
 	}
 

src/order/smallShopTask.go

@@ -13,7 +13,6 @@ import (
 	"net/http"
 	"qmx_admin/src/config"
 	"qmx_admin/src/users"
-	"qmx_admin/src/util"
 	"regexp"
 	"strings"
 	"time"
@@ -128,7 +127,7 @@ func OrderHandle() {
 	//获取最后一次拉数据时间 ，如果没有，以当天时间凌晨0点为准
 	//start_update_time := "2022-09-21 10:22:44"
 	start_update_time := ""
-	data := util.JysqlDB.SelectBySql("select  update_time from  wxxd_order  ORDER BY update_time  desc LIMIT 1")
+	data := config.JysqlDB.SelectBySql("select  update_time from  wxxd_order  ORDER BY update_time  desc LIMIT 1")
 	if len((*data)) > 0 {
 		start_update_time = common.ObjToString((*data)[0]["update_time"])
 	} else {
@@ -161,7 +160,7 @@ func OrderHandle() {
 	if res.Total_num > 0 {
 		for _, value := range res.Orders {
 			//先判断订单是否创建过
-			data := util.JysqlDB.CountBySql("select  count(id) from  wxxd_order   where   order_id=?", value.Order_id)
+			data := config.JysqlDB.CountBySql("select  count(id) from  wxxd_order   where   order_id=?", value.Order_id)
 			if data > 0 {
 				log.Println("此", value.Order_id, "订单核销创建过")
 				continue
@@ -193,11 +192,11 @@ func OrderHandle() {
 			//先判断账户是否存在
 			userId := ""
 			if strings.Index(value.Order_detail.Product_infos[0].Title, "超级订阅") != 0 {
-				userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
+				userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": param.Phone})
 				if ok && userData != nil && len(*userData) > 0 {
 					userId = mongodb.BsonIdToSId((*userData)["_id"])
 				} else {
-					userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
+					userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": param.Phone})
 					if ok && userData != nil && len(*userData) > 0 {
 						userId = mongodb.BsonIdToSId((*userData)["_id"])
 					} else {
@@ -215,7 +214,7 @@ func OrderHandle() {
 							},
 							"s_regsource": "qmx_admin",
 						}
-						_id := util.MQFW.Save("user", data)
+						_id := config.MQFW.Save("user", data)
 						if _id != "" {
 							userId = _id
 							formdata := map[string]interface{}{
@@ -225,7 +224,7 @@ func OrderHandle() {
 							}
 							if !strings.HasPrefix(param.Phone, "9") {
 								ck := &http.Cookie{}
-								usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
+								usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
 								users.SaveUserLog(_id, param.Phone)
 							}
 						}
@@ -265,7 +264,7 @@ func OrderHandle() {
 				//线上课程
 				//根据线上课程名称查找Id
 				param.UserId = userId
-				data, _ := util.MQFW.FindOne("jy_course", map[string]interface{}{"s_name": value.Order_detail.Product_infos[0].Sku_attrs[0].Attr_value})
+				data, _ := config.MQFW.FindOne("jy_course", map[string]interface{}{"s_name": value.Order_detail.Product_infos[0].Sku_attrs[0].Attr_value})
 				param.CourseId = mongodb.BsonIdToSId((*data)["_id"])
 				orderStatus, _ = createCourseOrder(param, code)
 			} else if strings.Index(value.Order_detail.Product_infos[0].Title, "数据流量包") >= 0 {
@@ -330,7 +329,7 @@ func OrderHandle() {
 					"user_id":        "",
 					"pay_channel":    1,
 				}
-				util.JysqlDB.Insert("weixin_pay", payInsertData)
+				config.JysqlDB.Insert("weixin_pay", payInsertData)
 				//成功的话插入一条记录
 				insertData := map[string]interface{}{
 					"order_id":    value.Order_id,
@@ -339,7 +338,7 @@ func OrderHandle() {
 					"update_time": value.Update_time,
 					"order_code":  code,
 				}
-				util.JysqlDB.Insert("wxxd_order", insertData)
+				config.JysqlDB.Insert("wxxd_order", insertData)
 				saveData := map[string]interface{}{
 					"operator":      "-",
 					"create_time":   date.NowFormat(date.Date_Full_Layout),
@@ -359,19 +358,19 @@ func vipInfo(phone string) (string, int) {
 	//查找之前是否开通超级订阅
 	vipStartTime := time.Now().Format(date.Date_Short_Layout)
 	vipType := 0
-	userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
+	userData, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
 	userId := ""
 	if ok && userData != nil && len(*userData) > 0 {
 		userId = mongodb.BsonIdToSId((*userData)["_id"])
 	} else {
-		userData, ok = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
+		userData, ok = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
 		if ok && userData != nil && len(*userData) > 0 {
 			userId = mongodb.BsonIdToSId((*userData)["_id"])
 		} else {
 			return vipStartTime, vipType
 		}
 	}
-	userInfo, oks := util.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(userId)}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1,"s_m_phone":1,"s_phone":1}`)
+	userInfo, oks := config.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(userId)}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1,"s_m_phone":1,"s_phone":1}`)
 	if oks && userInfo != nil && len(*userInfo) > 0 {
 		//先判断用户是否有即将生效的超级订阅订单
 		query := map[string]interface{}{
@@ -380,7 +379,7 @@ func vipInfo(phone string) (string, int) {
 				"$gt": time.Now().Unix(),
 			},
 		}
-		count1 := util.MQFW.Count("user", query)
+		count1 := config.MQFW.Count("user", query)
 		if count1 > 0 {
 			t := common.Int64All((*userInfo)["l_vip_endtime"])
 			_t := time.Unix(t, 0)
@@ -389,7 +388,7 @@ func vipInfo(phone string) (string, int) {
 		}
 		//查询是有是超级订阅的数据
 		//判断用户购买过超级订阅并且在有效期内   i_vip_status 开启状态：0-暂不使用vip订阅 1-试用 2-正式 -1-试用到期 -2-正式到期
-		userDatas, oks := util.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(userId), "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
+		userDatas, oks := config.MQFW.FindOneByField("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(userId), "i_vip_status": 2}, `{"_id":1,"i_vip_expire_tip":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"o_vipjy":1}`)
 		if oks && userDatas != nil && len(*userDatas) > 0 {
 			//正在生效的
 			if fmt.Sprint((*userInfo)["i_vip_status"]) == "2" {

src/order/suppleSalePerson.go

@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"qmx_admin/src/util"
+	"qmx_admin/src/config"
 	"regexp"
 	"strconv"
 	"strings"
@@ -34,7 +34,7 @@ func SalePersonList(context *admin.Context) (interface{}, error) {
 	}
 
 	str := ""
-	if util.AdminDB.Count("request_auth", map[string]interface{}{"user_id": context.User.Id, "request_call": context.Request.Call}) > 0 {
+	if config.AdminDB.Count("request_auth", map[string]interface{}{"user_id": context.User.Id, "request_call": context.Request.Call}) > 0 {
 		if param.SalePerson != "" {
 			str += " sale_person like '%" + param.SalePerson + "%' and"
 		}
@@ -68,11 +68,11 @@ func SalePersonList(context *admin.Context) (interface{}, error) {
 		sqlF += " order by create_time ASC limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
 	}
 
-	count := util.JysqlDB.CountBySql(sqlC)
-	res := util.JysqlDB.SelectBySql(sqlF)
+	count := config.JysqlDB.CountBySql(sqlC)
+	res := config.JysqlDB.SelectBySql(sqlF)
 	if res != nil && len(*res) > 0 {
 		data := map[string]interface{}{}
-		resDict := util.JysqlDB.Find("dict_item", map[string]interface{}{"state": 1}, "item_code,item_name,parent_code,parent_name", "", -1, 1)
+		resDict := config.JysqlDB.Find("dict_item", map[string]interface{}{"state": 1}, "item_code,item_name,parent_code,parent_name", "", -1, 1)
 		if resDict != nil && len(*resDict) > 0 {
 			for _, val := range *resDict {
 				itemCode := common.ObjToString(val["item_code"])
@@ -88,7 +88,7 @@ func SalePersonList(context *admin.Context) (interface{}, error) {
 				}
 				saleCode := common.ObjToString(val["saleDep"])
 				if saleCode != "" {
-					saleCodeD := util.JysqlDB.FindOne("dict_dep", map[string]interface{}{"code": saleCode}, "", "")
+					saleCodeD := config.JysqlDB.FindOne("dict_dep", map[string]interface{}{"code": saleCode}, "", "")
 					if saleCodeD != nil && len(*saleCodeD) > 0 {
 						showField := common.ObjToString((*saleCodeD)["showField"])
 						saleDepShow := common.ObjToString((*saleCodeD)["show"])
@@ -126,7 +126,7 @@ func SalePersonAdd(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	//根据订单编号
-	order := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode, "is_backstage_order": 0}, "order_code,salesperson_id,salesperson,create_time", "")
+	order := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode, "is_backstage_order": 0}, "order_code,salesperson_id,salesperson,create_time", "")
 	if order == nil {
 		return nil, errors.New("订单编号不存在")
 	}
@@ -139,7 +139,7 @@ func SalePersonAdd(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("已超过订单创建时间7天")
 	}
 	//判断是否有待审核的销售补录信息
-	count := util.JysqlDB.Count("supplement_sale_person", map[string]interface{}{"order_code": param.OrderCode})
+	count := config.JysqlDB.Count("supplement_sale_person", map[string]interface{}{"order_code": param.OrderCode})
 	if count > 0 {
 		return nil, errors.New("存在待审核数据")
 	}
@@ -155,8 +155,8 @@ func SalePersonAdd(context *admin.Context) (interface{}, error) {
 		"salesperson_id":       param.SalesPersonId,
 		"saleDep":              param.SaleDep,
 	}
-	ok := util.JysqlDB.ExecTx("新增补录信息", func(tx *sql.Tx) bool {
-		in1 := util.JysqlDB.Insert("supplement_sale_person", in)
+	ok := config.JysqlDB.ExecTx("新增补录信息", func(tx *sql.Tx) bool {
+		in1 := config.JysqlDB.Insert("supplement_sale_person", in)
 		//插入审核记录表
 		insertData := map[string]interface{}{
 			"operator":      context.User.Username,
@@ -166,7 +166,7 @@ func SalePersonAdd(context *admin.Context) (interface{}, error) {
 			"order_code":    param.OrderCode,
 			"audit_type":    1,
 		}
-		in2 := util.JysqlDB.InsertByTx(tx, "audit_records", insertData)
+		in2 := config.JysqlDB.InsertByTx(tx, "audit_records", insertData)
 		return in1 > 0 && in2 > 0
 	})
 
@@ -195,7 +195,7 @@ func SalePersonEdit(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	//先查询补录信息状态
-	data := util.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "state,order_code", "")
+	data := config.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "state,order_code", "")
 	var state, newState int
 	if data != nil && len(*data) > 0 {
 		state = common.IntAll((*data)["state"])
@@ -217,8 +217,8 @@ func SalePersonEdit(context *admin.Context) (interface{}, error) {
 		"salesperson_id":       param.SalesPersonId,
 		"saleDep":              param.SaleDep,
 	}
-	ok := util.JysqlDB.ExecTx("编辑补录信息", func(tx *sql.Tx) bool {
-		up := util.JysqlDB.UpdateByTx(tx, "supplement_sale_person", map[string]interface{}{"id": param.Id}, up)
+	ok := config.JysqlDB.ExecTx("编辑补录信息", func(tx *sql.Tx) bool {
+		up := config.JysqlDB.UpdateByTx(tx, "supplement_sale_person", map[string]interface{}{"id": param.Id}, up)
 		//插入审核记录表
 		insertData := map[string]interface{}{
 			"operator":      context.User.Username,
@@ -228,7 +228,7 @@ func SalePersonEdit(context *admin.Context) (interface{}, error) {
 			"order_code":    param.OrderCode,
 			"audit_type":    1,
 		}
-		in := util.JysqlDB.InsertByTx(tx, "audit_records", insertData)
+		in := config.JysqlDB.InsertByTx(tx, "audit_records", insertData)
 		return up && in > 0
 	})
 	if ok {
@@ -248,19 +248,19 @@ func SalePersonDetail(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	data := util.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "", "")
+	data := config.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "", "")
 	if data != nil && len(*data) > 0 {
 		orderCode := common.ObjToString((*data)["order_code"])
 		saleCode := common.ObjToString((*data)["saleDep"])
 		if saleCode != "" {
-			saleCodeD := util.JysqlDB.FindOne("dict_dep", map[string]interface{}{"code": saleCode}, "", "")
+			saleCodeD := config.JysqlDB.FindOne("dict_dep", map[string]interface{}{"code": saleCode}, "", "")
 			if saleCodeD != nil && len(*saleCodeD) > 0 {
 				saleDepShow := common.ObjToString((*saleCodeD)["show"])
 				(*data)["saleDepShow"] = saleDepShow
 			}
 		}
 		dataDict := map[string]interface{}{}
-		resDict := util.JysqlDB.Find("dict_item", map[string]interface{}{"state": 1}, "item_code,item_name,parent_code,parent_name", "", -1, 1)
+		resDict := config.JysqlDB.Find("dict_item", map[string]interface{}{"state": 1}, "item_code,item_name,parent_code,parent_name", "", -1, 1)
 		if resDict != nil && len(*resDict) > 0 {
 			for _, val := range *resDict {
 				itemCode := common.ObjToString(val["item_code"])
@@ -275,7 +275,7 @@ func SalePersonDetail(context *admin.Context) (interface{}, error) {
 			}
 		}
 		//查询审核轨迹
-		auditRecord := util.JysqlDB.Find("audit_records", map[string]interface{}{"order_code": orderCode, "audit_type": 1}, "", "create_time desc", -1, -1)
+		auditRecord := config.JysqlDB.Find("audit_records", map[string]interface{}{"order_code": orderCode, "audit_type": 1}, "", "create_time desc", -1, -1)
 		(*data)["auditRecord"] = auditRecord
 		return data, nil
 	}
@@ -295,7 +295,7 @@ func SuppleInfoExamine(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	//审核前状态
-	data := util.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "", "")
+	data := config.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "", "")
 	if data != nil && len(*data) > 0 {
 		oldState := common.IntAll((*data)["state"])
 		newState := 1
@@ -315,9 +315,9 @@ func SuppleInfoExamine(context *admin.Context) (interface{}, error) {
 				operatorType = 3
 			}
 		}
-		ok := util.JysqlDB.ExecTx("审核补录销售信息", func(tx *sql.Tx) bool {
+		ok := config.JysqlDB.ExecTx("审核补录销售信息", func(tx *sql.Tx) bool {
 			//更新补录信息
-			up := util.JysqlDB.UpdateByTx(tx, "supplement_sale_person", map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": newState})
+			up := config.JysqlDB.UpdateByTx(tx, "supplement_sale_person", map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": newState})
 			//插入审核记录表
 			insertData := map[string]interface{}{
 				"operator":      context.User.Username,
@@ -328,7 +328,7 @@ func SuppleInfoExamine(context *admin.Context) (interface{}, error) {
 				"order_code":    param.OrderCode,
 				"audit_type":    1,
 			}
-			in := util.JysqlDB.InsertByTx(tx, "audit_records", insertData)
+			in := config.JysqlDB.InsertByTx(tx, "audit_records", insertData)
 			ok := true
 			if newState == 3 { //二审通过更新订单表
 				now := time.Now()
@@ -343,7 +343,7 @@ func SuppleInfoExamine(context *admin.Context) (interface{}, error) {
 					"sale_time":            saleTime.Format(date.Date_Full_Layout),
 					"saleDep":              (*data)["saleDep"],
 				}
-				ok = util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, upData)
+				ok = config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, upData)
 			}
 			return up && in > 0 && ok
 		})
@@ -366,7 +366,7 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	//查询订单
-	order := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
+	order := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, "", "")
 	if order != nil && len(*order) == 0 {
 		return nil, errors.New("没有查询到订单信息")
 	}
@@ -403,16 +403,16 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 		userData *map[string]interface{}
 		ok1      bool
 	)
-	userData, ok1 = util.MQFW.FindOne("user", map[string]interface{}{"s_phone": (*order)["user_phone"]})
+	userData, ok1 = config.MQFW.FindOne("user", map[string]interface{}{"s_phone": (*order)["user_phone"]})
 	if ok1 && userData != nil && len(*userData) > 0 {
 		userId = mongodb.BsonIdToSId((*userData)["_id"])
 	} else {
-		userData, ok1 = util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": (*order)["user_phone"]})
+		userData, ok1 = config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": (*order)["user_phone"]})
 		if ok1 && userData != nil && len(*userData) > 0 {
 			userId = mongodb.BsonIdToSId((*userData)["_id"])
 		}
 	}
-	ok := util.JysqlDB.ExecTx("审核订单", func(tx *sql.Tx) bool {
+	ok := config.JysqlDB.ExecTx("审核订单", func(tx *sql.Tx) bool {
 		upData := map[string]interface{}{
 			"audit_status": newState,
 		}
@@ -424,7 +424,7 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 			}
 			upData["sale_time"] = saleTime.Format(date.Date_Full_Layout)
 			//“协议归档状态”如若为“已归档”，则“订单状态”更新为“已完成”，如若为“未归档”，则订单状态仍为“未完成”
-			contractData := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": param.OrderCode}, "contract_archive_status", "")
+			contractData := config.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": param.OrderCode}, "contract_archive_status", "")
 			if contractData != nil && len(*contractData) > 0 {
 				if common.IntAll((*contractData)["contract_archive_status"]) == 1 {
 					upData["order_status"] = 1
@@ -463,7 +463,7 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 			upData["filter"] = string(filterByte)
 		}
 		//更新订单
-		up := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, upData)
+		up := config.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{"order_code": param.OrderCode}, upData)
 		//插入审核记录表
 		insertData := map[string]interface{}{
 			"operator":      context.User.Username,
@@ -474,7 +474,7 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 			"order_code":    param.OrderCode,
 			"audit_type":    2,
 		}
-		in := util.JysqlDB.InsertByTx(tx, "audit_records", insertData)
+		in := config.JysqlDB.InsertByTx(tx, "audit_records", insertData)
 		return up && in > 0
 	})
 	if !ok {
@@ -499,7 +499,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 		if serverMap[serverId] != 0 {
 			serverId = serverMap[serverId]
 		}
-		serverData := util.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
+		serverData := config.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
 		frequency := 0
 		if serverData != nil && len(*serverData) > 0 {
 			if serverId == 11 || serverId == 15 {
@@ -518,7 +518,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 		}
 
 		sql2 := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-		serverDatas := util.JysqlDB.SelectBySql(sql2, serverId, userId)
+		serverDatas := config.JysqlDB.SelectBySql(sql2, serverId, userId)
 
 		if serverDatas != nil && len(*serverDatas) > 0 {
 			iStatus := common.If(true, 0, 1)
@@ -528,7 +528,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 			} else {
 				sql2 = "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?,l_starttime = ?,l_endtime = ?,i_status = ? where s_serviceid = ? and s_userid = ?"
 			}
-			status1 := util.JysqlDB.UpdateOrDeleteBySql(sql2, fmt.Sprint(frequency), date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startTime, date.Date_Full_Layout), date.FormatDate(&endTime, date.Date_Full_Layout), fmt.Sprint(iStatus), serverId, userId)
+			status1 := config.JysqlDB.UpdateOrDeleteBySql(sql2, fmt.Sprint(frequency), date.NowFormat(date.Date_Full_Layout), date.FormatDate(&startTime, date.Date_Full_Layout), date.FormatDate(&endTime, date.Date_Full_Layout), fmt.Sprint(iStatus), serverId, userId)
 			if status1 < 0 {
 				return false, errors.New("新建服务-更新服务表出错")
 			}
@@ -544,7 +544,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				"l_createtime": date.NowFormat(date.Date_Full_Layout),
 				"l_updatetime": date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_service_user", insert)
+			orderId := config.JysqlDB.Insert("bigmember_service_user", insert)
 			if orderId > 0 {
 				log.Println("用户服务表插入成功", userId)
 			} else {
@@ -563,7 +563,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 		set := map[string]interface{}{
 			"$set": sets,
 		}
-		ok := util.MQFW.UpdateById("user", userId, set)
+		ok := config.MQFW.UpdateById("user", userId, set)
 		if !ok {
 			log.Println("大会员子账号创建订单user表大会员状态更新失败")
 			return false, errors.New("大会员子账号创建订单user表大会员状态更新失败")
@@ -579,7 +579,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				"l_createtime": date.NowFormat(date.Date_Full_Layout),
 				"l_updatetime": date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_service_user", insert)
+			orderId := config.JysqlDB.Insert("bigmember_service_user", insert)
 			if orderId > 0 {
 				log.Println("插入用户服务表成功", userId)
 			} else {
@@ -592,7 +592,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 	for _, v := range serverArr {
 		if common.IntAll(v["id"]) == 16 {
 			sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-			serverData := util.JysqlDB.SelectBySql(sqls, 12, userId)
+			serverData := config.JysqlDB.SelectBySql(sqls, 12, userId)
 			updateCountBefore := common.IntAll((*serverData)[0]["i_frequency"])
 			updateCountAfter := updateCountBefore + common.IntAll(v["count"])
 			serverId := 12
@@ -605,7 +605,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				"i_updatecount_after":  updateCountAfter,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_recharge", insert)
+			orderId := config.JysqlDB.Insert("bigmember_recharge", insert)
 			if orderId > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -614,7 +614,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 			}
 
 			sqls1 := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-			serverData1 := util.JysqlDB.SelectBySql(sqls1, 13, userId)
+			serverData1 := config.JysqlDB.SelectBySql(sqls1, 13, userId)
 			updateCountBefore1 := common.IntAll((*serverData1)[0]["i_frequency"])
 			updatecountAfter1 := updateCountBefore1 + common.IntAll(v["count"])
 			serverId1 := 13
@@ -627,7 +627,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				"i_updatecount_after":  updatecountAfter1,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId1 := util.JysqlDB.Insert("bigmember_recharge", insert1)
+			orderId1 := config.JysqlDB.Insert("bigmember_recharge", insert1)
 			if orderId1 > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -635,9 +635,9 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				return false, errors.New("插入充值表失败")
 			}
 			sql3 := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ? where s_serviceid = ? and s_userid = ?"
-			status1 := util.JysqlDB.UpdateOrDeleteBySql(sql3, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 12, userId)
+			status1 := config.JysqlDB.UpdateOrDeleteBySql(sql3, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 12, userId)
 			sql3 = "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ? where s_serviceid = ? and s_userid = ?"
-			status2 := util.JysqlDB.UpdateOrDeleteBySql(sql3, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 13, userId)
+			status2 := config.JysqlDB.UpdateOrDeleteBySql(sql3, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 13, userId)
 			if status1 == -1 {
 				return false, errors.New("服务表更新失败")
 			}
@@ -652,11 +652,11 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 		if serverMap[common.IntAll(v["id"])] != 0 {
 			serverIdTmp = serverMap[common.IntAll(v["id"])]
 		}
-		status := util.JysqlDB.UpdateOrDeleteBySql(sqlUp2, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), fmt.Sprint(serverIdTmp), userId)
+		status := config.JysqlDB.UpdateOrDeleteBySql(sqlUp2, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), fmt.Sprint(serverIdTmp), userId)
 		if status != -1 {
 			log.Println("更新补充包数量成功", v, userId)
 			sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ? and  i_status != -1"
-			serverData := util.JysqlDB.SelectBySql(sqls, serverIdTmp, userId)
+			serverData := config.JysqlDB.SelectBySql(sqls, serverIdTmp, userId)
 			updateCountBefore := common.IntAll((*serverData)[0]["i_frequency"])
 			updateCountAfter := updateCountBefore + common.IntAll(v["count"])
 			serverId := common.IntAll(serverIdTmp)
@@ -669,7 +669,7 @@ func BigMemberSupple(startTime, endTime time.Time, userId string, filterMap map[
 				"i_updatecount_after":  updateCountAfter,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_recharge", insert)
+			orderId := config.JysqlDB.Insert("bigmember_recharge", insert)
 			if orderId > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -701,7 +701,7 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			"i_member_status":    -bigMemberStatus,
 		}
 		/*//更新订单信息
-		ok := util.JysqlDB.Update(DataExportOrder, map[string]interface{}{"order_code": orderCode}, map[string]interface{}{"vip_starttime": startTime.Format(date.Date_Full_Layout), "vip_endtime": endTime.Format(date.Date_Full_Layout)})
+		ok := config.JysqlDB.Update(DataExportOrder, map[string]interface{}{"order_code": orderCode}, map[string]interface{}{"vip_starttime": startTime.Format(date.Date_Full_Layout), "vip_endtime": endTime.Format(date.Date_Full_Layout)})
 		if !ok {
 			return false, errors.New("更新订单信息出错")
 		}*/
@@ -709,7 +709,7 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 	set := map[string]interface{}{
 		"$set": setMap,
 	}
-	ok := util.MQFW.UpdateById("user", userId, set)
+	ok := config.MQFW.UpdateById("user", userId, set)
 	if !ok {
 		return false, errors.New("大会员创建订单user表大会员状态更新失败")
 	} else {
@@ -719,7 +719,7 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			if serverMap[serverId] != 0 {
 				serverId = serverMap[serverId]
 			}
-			serverData := util.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
+			serverData := config.JysqlDB.FindOne("bigmember_service", map[string]interface{}{"id": mainId}, "", "")
 			frequency := 0
 			var lEndtime time.Time
 			if serverData != nil && len(*serverData) > 0 {
@@ -739,10 +739,10 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			var status1 int64
 			if effectState {
 				sql1 := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?,l_endtime = ? where s_serviceid = ? and s_userid = ?"
-				status1 = util.JysqlDB.UpdateOrDeleteBySql(sql1, frequency, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&lEndtime, date.Date_Full_Layout), serverId, userId)
+				status1 = config.JysqlDB.UpdateOrDeleteBySql(sql1, frequency, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&lEndtime, date.Date_Full_Layout), serverId, userId)
 			} else {
 				sql1 := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?,l_endtime = ?,l_starttime = ?,i_status = ? where s_serviceid = ? and s_userid = ?"
-				status1 = util.JysqlDB.UpdateOrDeleteBySql(sql1, frequency, date.NowFormat(date.Date_Full_Layout), endTime, startTime, 0, serverId, userId)
+				status1 = config.JysqlDB.UpdateOrDeleteBySql(sql1, frequency, date.NowFormat(date.Date_Full_Layout), endTime, startTime, 0, serverId, userId)
 			}
 			if status1 > 0 {
 				log.Println("用户服务表更新成功", userId)
@@ -751,15 +751,15 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			}
 		}
 		//更新子账号延长服务
-		userData, ok := util.MQFW.Find("user", map[string]interface{}{"s_member_mainid": userId, "i_member_sub_status": 1}, nil, nil, false, -1, -1)
+		userData, ok := config.MQFW.Find("user", map[string]interface{}{"s_member_mainid": userId, "i_member_sub_status": 1}, nil, nil, false, -1, -1)
 		if ok && userData != nil && len(*userData) > 0 {
 			var status1 int64
 			if effectState {
 				sql2 := "update bigmember_service_user set l_updatetime = ?,l_endtime = ? where s_serviceid = 2 and s_userid = ?"
-				status1 = util.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&effectiveDate, date.Date_Full_Layout), userId)
+				status1 = config.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), date.FormatDate(&effectiveDate, date.Date_Full_Layout), userId)
 			} else {
 				sql2 := "update bigmember_service_user set l_updatetime = ?,l_endtime = ?,l_starttime = ?,i_status = ? where s_serviceid = 2 and s_userid = ?"
-				status1 = util.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), endTime, startTime, 0, userId)
+				status1 = config.JysqlDB.UpdateOrDeleteBySql(sql2, date.NowFormat(date.Date_Full_Layout), endTime, startTime, 0, userId)
 			}
 			if status1 > 0 {
 				log.Println("用户服务表更新成功", userId)
@@ -768,7 +768,7 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			}
 			for _, v := range *userData {
 				userId := mongodb.BsonIdToSId(v["_id"])
-				oks := util.MQFW.UpdateById("user", userId, map[string]interface{}{
+				oks := config.MQFW.UpdateById("user", userId, map[string]interface{}{
 					"$set": setMap,
 				})
 				if !oks {
@@ -785,7 +785,7 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 	for _, v := range serverArr {
 		if common.IntAll(v["id"]) == 16 {
 			sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ?"
-			serverData := util.JysqlDB.SelectBySql(sqls, 12, userId)
+			serverData := config.JysqlDB.SelectBySql(sqls, 12, userId)
 			updateCountBefore := common.IntAll((*serverData)[0]["i_frequency"])
 			updateCountAfter := updateCountBefore + common.IntAll(v["count"])
 			serverId := 12
@@ -798,7 +798,7 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 				"i_updatecount_after":  updateCountAfter,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_recharge", insert)
+			orderId := config.JysqlDB.Insert("bigmember_recharge", insert)
 			if orderId > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -806,7 +806,7 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 				return false, errors.New("插入充值表失败")
 			}
 			sqls1 := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ?"
-			serverData1 := util.JysqlDB.SelectBySql(sqls1, 13, userId)
+			serverData1 := config.JysqlDB.SelectBySql(sqls1, 13, userId)
 			updateCountBefore1 := common.IntAll((*serverData1)[0]["i_frequency"])
 			updateCountAfter1 := updateCountBefore1 + common.IntAll(v["count"])
 			serverId1 := 13
@@ -819,7 +819,7 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 				"i_updatecount_after":  updateCountAfter1,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId1 := util.JysqlDB.Insert("bigmember_recharge", insert1)
+			orderId1 := config.JysqlDB.Insert("bigmember_recharge", insert1)
 			if orderId1 > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -827,9 +827,9 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 				return false, errors.New("插入充值表失败")
 			}
 			sql1 := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?  where s_serviceid = ? and s_userid = ?"
-			status1 := util.JysqlDB.UpdateOrDeleteBySql(sql1, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 12, userId)
+			status1 := config.JysqlDB.UpdateOrDeleteBySql(sql1, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 12, userId)
 			sql1 = "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ?  where s_serviceid = ? and s_userid = ?"
-			status2 := util.JysqlDB.UpdateOrDeleteBySql(sql1, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 13, userId)
+			status2 := config.JysqlDB.UpdateOrDeleteBySql(sql1, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), 13, userId)
 			if status1 == -1 {
 				return false, errors.New("服务表更新失败")
 			}
@@ -840,10 +840,10 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 		}
 
 		sql2 := "update bigmember_service_user set i_frequency = i_frequency + ?,l_updatetime = ? where s_serviceid = ?  and s_userid = ?"
-		status := util.JysqlDB.UpdateOrDeleteBySql(sql2, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), fmt.Sprint(v["id"]), userId)
+		status := config.JysqlDB.UpdateOrDeleteBySql(sql2, fmt.Sprint(v["count"]), date.NowFormat(date.Date_Full_Layout), fmt.Sprint(v["id"]), userId)
 		if status != -1 {
 			sql3 := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ?"
-			serverData := util.JysqlDB.SelectBySql(sql3, v["id"], userId)
+			serverData := config.JysqlDB.SelectBySql(sql3, v["id"], userId)
 			updateCountBefore := common.IntAll((*serverData)[0]["i_frequency"])
 			updateCountAfter := updateCountBefore + common.IntAll(v["count"])
 			serverId := common.IntAll(v["id"])
@@ -856,7 +856,7 @@ func SupplePackage(userId string, serverArr []map[string]interface{}) (bool, err
 				"i_updatecount_after":  updateCountAfter,
 				"l_createtime":         date.NowFormat(date.Date_Full_Layout),
 			}
-			orderId := util.JysqlDB.Insert("bigmember_recharge", insert)
+			orderId := config.JysqlDB.Insert("bigmember_recharge", insert)
 			if orderId > 0 {
 				log.Println("插入充值表成功", v, userId)
 			} else {
@@ -875,7 +875,7 @@ func getBigMemberProductTypeByOrderCode(orderCode string) string {
 	if orderCode == "" {
 		return ""
 	}
-	res := util.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": orderCode, "product_type": "大会员"}, "filter", "id desc")
+	res := config.JysqlDB.FindOne("dataexport_order", map[string]interface{}{"order_code": orderCode, "product_type": "大会员"}, "filter", "id desc")
 	if res == nil || len(*res) == 0 {
 		return ""
 	}
@@ -924,7 +924,7 @@ func SubAccount(param SubAccountParam) (bool, error) {
 	switch param.BuySubject {
 	//个人
 	case 1:
-		if !util.MQFW.UpdateById("user", param.UserId, map[string]interface{}{
+		if !config.MQFW.UpdateById("user", param.UserId, map[string]interface{}{
 			"$set": map[string]interface{}{
 				"i_pay_sub_num": param.BuyCount,
 				//"i_free_sub_num": 0,
@@ -934,7 +934,7 @@ func SubAccount(param SubAccountParam) (bool, error) {
 			return false, errors.New("user表大会员状态更新失败")
 		} else {
 			if param.InsertBigService {
-				orderId := util.JysqlDB.Insert("bigmember_service_user", map[string]interface{}{
+				orderId := config.JysqlDB.Insert("bigmember_service_user", map[string]interface{}{
 					"s_userid":     param.UserId,
 					"s_serviceid":  2,
 					"l_starttime":  date.FormatDate(&param.StartTime, date.Date_Full_Layout),

src/order/userService.go

@@ -27,13 +27,13 @@ func UpdateUserType(salesChannel, userId string) {
 		setType = 3
 	}
 	//  更新用户人群分类
-	util.MQFW.UpdateById("user", userId, bson.M{"$set": map[string]interface{}{
+	config.MQFW.UpdateById("user", userId, bson.M{"$set": map[string]interface{}{
 		"i_user_type": setType,
 	},
 	})
 	//  查询mysql 表中是否有该用户  有则更新
-	if util.JysqlDB.Count("user", map[string]interface{}{"user_id": userId}) > 0 {
-		util.JysqlDB.Update("user", map[string]interface{}{"user_id": userId}, map[string]interface{}{
+	if config.JysqlDB.Count("user", map[string]interface{}{"user_id": userId}) > 0 {
+		config.JysqlDB.Update("user", map[string]interface{}{"user_id": userId}, map[string]interface{}{
 			"user_type": setType,
 		})
 	}
@@ -42,11 +42,11 @@ func UpdateUserType(salesChannel, userId string) {
 // GetUserIdByPhone 根据手机号查询用户id
 func GetUserIdByPhone(phone string) string {
 
-	user, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
+	user, ok := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": phone})
 	if ok && user != nil && len(*user) > 0 {
 		return mongodb.BsonIdToSId((*user)["_id"])
 	}
-	user2, ok2 := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
+	user2, ok2 := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": phone})
 	if ok2 && user2 != nil && len(*user2) > 0 {
 		return mongodb.BsonIdToSId((*user2)["_id"])
 	}
@@ -68,7 +68,7 @@ func SaveUserInfo(phone string) (userId string) {
 		},
 		"s_regsource": "qmx_admin",
 	}
-	_id := util.MQFW.Save("user", data)
+	_id := config.MQFW.Save("user", data)
 	if _id != "" {
 		userId = _id
 		formdata := map[string]interface{}{
@@ -78,7 +78,7 @@ func SaveUserInfo(phone string) (userId string) {
 		}
 		if !strings.HasPrefix(phone, "9") {
 			ck := &http.Cookie{}
-			usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
+			usercenter.AddBaseUser(*config.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
 			users.SaveUserLog(_id, phone)
 		}
 	}

src/public/message.go

@@ -85,14 +85,14 @@ func AllUserSendMsg(param *Message, loginUserId int, loginUserName string, msgLo
 		}
 	}
 	// mongo  库查询用户
-	count := util.MQFW.Count("user", filter)
+	count := config.MQFW.Count("user", filter)
 	log.Println("发送全部用户，查询user表用户量", count)
 	for f := 0; f < 5; f++ {
 		if lastUserId != "" {
 			filter["_id"] = bson.M{"$gt": mongodb.StringTOBsonId(lastUserId)}
 		}
-		_, client := util.NewMgo.Client(true)
-		defer util.NewMgo.Destory(client)
+		_, client := config.NewMgo.Client(true)
+		defer config.NewMgo.Destory(client)
 		opt := &options.FindOptions{}
 		opt.Projection = bson.M{"_id": 1, "base_user_id": 1, "i_rbuser": 1}
 		opt.Sort = bson.M{"_id": -1}
@@ -111,7 +111,7 @@ func AllUserSendMsg(param *Message, loginUserId int, loginUserName string, msgLo
 			//如果是补发消息前2000条需要判重
 			/*if again && totalCount <= 4000 && common.IntAll(userInfo["i_rbuser"]) == 0 {
 				//做去重处理
-				num := util.MsgTidb.Count("message", map[string]interface{}{"receive_userid": userId, "msg_log_id": common.IntAll(msgLogId)})
+				num := config.MsgTidb.Count("message", map[string]interface{}{"receive_userid": userId, "msg_log_id": common.IntAll(msgLogId)})
 				if num > 0 {
 					continue
 				}
@@ -148,7 +148,7 @@ func AllUserSendMsg(param *Message, loginUserId int, loginUserName string, msgLo
 	//实时发送，消息发送完毕，发送记录发送状态更新为 4 发送完成
 	if param.SendMode == 2 {
 		fmt.Println("url", param.Link+","+param.AndroidUrl+","+param.IosUrl+","+param.WeChatUrl)
-		ok := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": param.Link})
+		ok := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": common.IntAll(msgLogId)}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": param.Link})
 		if !ok {
 			log.Println("消息发送完毕，更新发送记录出错，消息发送记录为：", msgLogId)
 		}
@@ -223,7 +223,7 @@ func GetMegType() {
 	wxBlackPush := map[int]bool{}
 	blackClassMap := map[int]string{}
 	msgTypeToGroupIdMap := map[int]int{}
-	types := util.MsgTidb.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id,g.name FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id")
+	types := config.MsgTidb.SelectBySql("SELECT g.switch,c.wxtmpl_Id,c.msg_type,g.group_id,g.name FROM message_class c INNER JOIN message_group g on c.group_id =g.group_id")
 	if types != nil && len(*types) > 0 {
 		for _, v := range *types {
 			name := common.ObjToString(v["name"])

src/sales/jyPartnerController.go

@@ -84,9 +84,9 @@ func PartnerList(context *admin.Context) (interface{}, error) {
 			sql_c += " and p.name like " + "'" + "%" + param.Keyword + "%" + "'"
 		}
 	}
-	count := util.JysqlDB.CountBySql(sql_c)
+	count := config.JysqlDB.CountBySql(sql_c)
 	sql += " order by p.createtime desc limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	data["total"] = count
 	return data, nil
@@ -214,14 +214,14 @@ func CommissionList(context *admin.Context) (interface{}, error) {
 		sql += " and (p.phone like " + "'%" + param.Keyword + "%'" + " or s.code like " + "'%" + param.Keyword + "%')"
 		sql_c += " and (p.phone like " + "'%" + param.Keyword + "%'" + " or s.code like " + "'%" + param.Keyword + "%')"
 	}
-	count := util.JysqlDB.CountBySql(sql_c)
+	count := config.JysqlDB.CountBySql(sql_c)
 	if param.Export {
 		sql += " order by s.createtime desc "
 	} else {
 		sql += " order by s.createtime desc limit " + fmt.Sprint(param.Page.Offset) + "," + fmt.Sprint(param.Page.PageSize)
 
 	}
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 	data["total"] = count
 	if param.Export {
 		path := ParentDownload(res)
@@ -271,8 +271,8 @@ func WithdrawList(context *admin.Context) (interface{}, error) {
 		str += sqlW
 	}
 	sql += " order by c.createtime desc limit " + fmt.Sprint(param.Page.Offset) + "," + fmt.Sprint(param.Page.PageSize)
-	count := util.JysqlDB.CountBySql(str)
-	res := util.JysqlDB.SelectBySql(sql)
+	count := config.JysqlDB.CountBySql(str)
+	res := config.JysqlDB.SelectBySql(sql)
 	data := make(map[string]interface{})
 	data["lists"] = res
 	data["total"] = count
@@ -293,11 +293,11 @@ func WithdrawDetail(context *admin.Context) (interface{}, error) {
 	}
 	//data := map[string]interface{}{}
 	if param.Type == "1" {
-		res := util.JysqlDB.FindOne(DisCashout, map[string]interface{}{"id": param.Id}, "id,name,account,type,money,code,createtime,cashout_status", "")
+		res := config.JysqlDB.FindOne(DisCashout, map[string]interface{}{"id": param.Id}, "id,name,account,type,money,code,createtime,cashout_status", "")
 		return res, nil
 	} else {
 		sql := "select c.id,p.name,c.name openBank,c.account,c.type,c.money,c.code,c.createtime,c.cashout_status from " + DisCashout + " c left join " + DisPartner + " p on c.uid = p.uid where c.id = ? "
-		res := util.JysqlDB.SelectBySql(sql, param.Id)
+		res := config.JysqlDB.SelectBySql(sql, param.Id)
 		if len(*res) != 0 {
 			return (*res)[0], nil
 		}
@@ -347,8 +347,8 @@ func SettleList(context *admin.Context) (interface{}, error) {
 	}
 
 	sql += " order by c.createtime desc limit " + fmt.Sprint(param.Page.Offset) + "," + fmt.Sprint(param.Page.PageSize)
-	res := util.JysqlDB.SelectBySql(sql)
-	count := util.JysqlDB.CountBySql(str)
+	res := config.JysqlDB.SelectBySql(sql)
+	count := config.JysqlDB.CountBySql(str)
 	data := map[string]interface{}{}
 	if len(*res) != 0 && count != 0 {
 		data["lists"] = res
@@ -370,7 +370,7 @@ func SettleDetails(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	sql := "select c.id,c.code,p.phone,c.createtime,c.sale_cash,c.commission,c.tax_cash,c.auth_cash,c.can_cash from " + DisCount + " c left join " + DisPartner + " p on c.uid = p.uid where c.id = ? "
-	res := util.JysqlDB.SelectBySql(sql, param.Id)
+	res := config.JysqlDB.SelectBySql(sql, param.Id)
 	if len(*res) != 0 {
 		return (*res)[0], nil
 	}
@@ -387,7 +387,7 @@ func BatchFinish(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	sql := "update " + DisCashout + " set cashout_status = 1 where id in (" + param.Ids + ")"
-	i := util.JysqlDB.UpdateOrDeleteBySql(sql)
+	i := config.JysqlDB.UpdateOrDeleteBySql(sql)
 	if i > -1 {
 		return true, nil
 	}
@@ -419,7 +419,7 @@ func Finished(context *admin.Context) (interface{}, error) {
 	if sqlW != "" {
 		sql += sqlW
 	}
-	i := util.JysqlDB.UpdateOrDeleteBySql(sql)
+	i := config.JysqlDB.UpdateOrDeleteBySql(sql)
 	if i > -1 {
 		return true, nil
 	}
@@ -462,7 +462,7 @@ func ExportResults(context *admin.Context) (interface{}, error) {
 	}
 
 	sql += " order by c.createtime desc "
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 
 	if len(*res) > 0 {
 		url := Excel("提现列表导出", param.CashType, res)
@@ -483,9 +483,9 @@ func CapitalDetails(context *admin.Context) (interface{}, error) {
 	sql1 := "select id,code,createtime,commission money,order_id,product_name  from dis_sale where uid=? order by createtime desc"
 	sql2 := "select id,code,createtime,count_cash money,uid from dis_count where uid=? order by createtime desc"
 	sql3 := "select id,code,createtime,money,uid,type ptype from dis_cashout where uid=? order by createtime desc"
-	commission := util.JysqlDB.SelectBySql(sql1, param.Uid)
-	count := util.JysqlDB.SelectBySql(sql2, param.Uid)
-	cash := util.JysqlDB.SelectBySql(sql3, param.Uid)
+	commission := config.JysqlDB.SelectBySql(sql1, param.Uid)
+	count := config.JysqlDB.SelectBySql(sql2, param.Uid)
+	cash := config.JysqlDB.SelectBySql(sql3, param.Uid)
 	resArr := make([]interface{}, 0)
 	if len(*commission) != 0 {
 		for _, v := range *commission {
@@ -533,9 +533,9 @@ func ExamineList(context *admin.Context) (interface{}, error) {
 			sql_c += " and p.name like " + "'" + "%" + param.Search + "%" + "'"
 		}
 	}
-	count := util.JysqlDB.CountBySql(sql_c)
+	count := config.JysqlDB.CountBySql(sql_c)
 	sql += " order by p.createtime desc limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	data["total"] = count
 	return data, nil
@@ -554,7 +554,7 @@ func PartnerExamine(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Adopt == 1 || param.Adopt == 2 {
-		ok := util.JysqlDB.Update("dis_partner", map[string]interface{}{"id": param.Id, "type": 2}, map[string]interface{}{"is_adopt": param.Adopt, "reason": param.Reason, "adopt_time": time.Now().Format("2006-01-02 15:04:05")})
+		ok := config.JysqlDB.Update("dis_partner", map[string]interface{}{"id": param.Id, "type": 2}, map[string]interface{}{"is_adopt": param.Adopt, "reason": param.Reason, "adopt_time": time.Now().Format("2006-01-02 15:04:05")})
 		if param.Adopt == 1 {
 			AddCommodity(param.Id)
 		}
@@ -593,7 +593,7 @@ func AddCommodity(partnerId int) {
 		}) //插入商品管理
 	}
 	for key, _ := range commodityArr {
-		commodity := util.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"partnerId": partnerId, "commodityCode": commodityArr[key]["commodityCode"]}, "", "")
+		commodity := config.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"partnerId": partnerId, "commodityCode": commodityArr[key]["commodityCode"]}, "", "")
 		if commodity != nil {
 			continue
 		}
@@ -615,13 +615,13 @@ func AddCommodity(partnerId int) {
 		default:
 			modular = "Y"
 		}
-		parent := util.JysqlDB.FindOne("dis_partner", map[string]interface{}{"Id": partnerId}, "", "")
+		parent := config.JysqlDB.FindOne("dis_partner", map[string]interface{}{"Id": partnerId}, "", "")
 		word := util.VarLSCPool.GetJob()
 		word = word + "_GX"
 		commodityArr[key]["partnerId"] = partnerId
 		commodityArr[key]["disWord"] = modular + word
 		redis.Put("other", "DIS_"+word, fmt.Sprint((*parent)["name"])+"##"+fmt.Sprint((*parent)["uid"])+"##"+fmt.Sprint(time.Now().Unix()), -1)
-		_ = util.JysqlDB.Insert("dis_commodity", commodityArr[key])
+		_ = config.JysqlDB.Insert("dis_commodity", commodityArr[key])
 	}
 }
 
@@ -629,7 +629,7 @@ func AddCommodity(partnerId int) {
 func EnterpriseList(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	data["status"] = 0
-	parentList := util.JysqlDB.Find("dis_partner", map[string]interface{}{"type": 2, "is_adopt": 1}, "name,id", "adopt_time DESC", -1, -1)
+	parentList := config.JysqlDB.Find("dis_partner", map[string]interface{}{"type": 2, "is_adopt": 1}, "name,id", "adopt_time DESC", -1, -1)
 	data["data"] = parentList
 	data["status"] = 1
 	data["msg"] = "企业查询成功"
@@ -648,7 +648,7 @@ func CommodityList(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	commodityList := util.JysqlDB.Find("dis_commodity", map[string]interface{}{"partnerId": param.PartnerId}, "commodity,link,commodityCode,id,disWord", "", -1, -1)
+	commodityList := config.JysqlDB.Find("dis_commodity", map[string]interface{}{"partnerId": param.PartnerId}, "commodity,link,commodityCode,id,disWord", "", -1, -1)
 	for key, val := range *commodityList {
 		disWord := common.ObjToString(val["disWord"])
 		if disWord[:1] == "A" {
@@ -677,7 +677,7 @@ func CommodityDetails(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	commodity := util.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"id": param.Id}, "disWord,imgUrl,commodity", "")
+	commodity := config.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"id": param.Id}, "disWord,imgUrl,commodity", "")
 	disWord := common.ObjToString((*commodity)["disWord"])
 	if disWord[:1] == "A" {
 		(*commodity)["link"] = config.SysConfigs.Webdomain + "/weixin/frontPage/vipIntro/free/party?" + fmt.Sprint((*commodity)["disWord"]) + "_1"
@@ -722,13 +722,13 @@ func ImgUpload(context *admin.Context) (interface{}, error) {
 	updateData := map[string]interface{}{
 		"imgUrl": "",
 	}
-	commodity := util.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"id": param.Id}, "imgUrl", "")
+	commodity := config.JysqlDB.FindOne("dis_commodity", map[string]interface{}{"id": param.Id}, "imgUrl", "")
 	if (*commodity)["imgUrl"] == "" || (*commodity)["imgUrl"] == nil {
 		updateData["imgUrl"] = param.ImgUrl
 	} else {
 		updateData["imgUrl"] = param.ImgUrl + "," + fmt.Sprint((*commodity)["imgUrl"])
 	}
-	updateBool := util.JysqlDB.Update("dis_commodity", map[string]interface{}{"id": param.Id}, updateData)
+	updateBool := config.JysqlDB.Update("dis_commodity", map[string]interface{}{"id": param.Id}, updateData)
 	if updateBool {
 		data["status"] = 1
 		data["msg"] = "图片存储成功"

src/sales/jyPartnerService.go

@@ -6,7 +6,6 @@ import (
 	"log"
 	"os"
 	"qmx_admin/src/config"
-	"qmx_admin/src/util"
 	"sort"
 	"strconv"
 	"time"
@@ -32,10 +31,10 @@ var publicCash = []string{"name", "bank", "account", "money"}
 
 func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 	//查询MongoDB中剑鱼用户的头像
-	head, _ := util.MQFW.FindById(User, uid, `{"s_headimageurl":1,"s_headimage":1,"s_avatar":1}`)
+	head, _ := config.MQFW.FindById(User, uid, `{"s_headimageurl":1,"s_headimage":1,"s_avatar":1}`)
 	//查询mysql中剑鱼伙伴信息
 	sql := "select p.id,p.name,p.email,p.uid,p.type,p.phone,p.channel,p.auth_status,p.createtime,p.lastlogintime,p.is_adopt,p.reason,p.contacts,a.dis_sales,a.dis_commission,a.dis_order from " + DisPartner + " p left join " + Account + " a on p.uid = a.uid where p.id = ?"
-	data := util.JysqlDB.SelectBySql(sql, id)
+	data := config.JysqlDB.SelectBySql(sql, id)
 	if len(*data) != 0 && head != nil {
 		res = (*data)[0]
 		if common.ObjToString((*head)["s_avatar"]) != "" {
@@ -48,7 +47,7 @@ func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 			}
 		}
 		if common.IntAll((res)["type"]) == 2 {
-			auth := util.JysqlDB.FindOne(DisAuth, map[string]interface{}{"partner_id": res["id"]}, "license", "")
+			auth := config.JysqlDB.FindOne(DisAuth, map[string]interface{}{"partner_id": res["id"]}, "license", "")
 			if auth != nil {
 				res["license"] = (*auth)["license"]
 			} else {
@@ -63,7 +62,7 @@ func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 func FindSalesCount(uid string) (res *[]map[string]interface{}) {
 	//统计dis_sales表中 VIP订阅、数据报告、中标必听课、数据导出销售统计
 	sql := "SELECT product_name,SUM(sale_money) sale_money_sum,SUM(commission) commission_sum,COUNT(id) count,AVG(commission) average FROM " + DisSale + " where uid = ? GROUP BY product_name "
-	res = util.JysqlDB.SelectBySql(sql, uid)
+	res = config.JysqlDB.SelectBySql(sql, uid)
 	return res
 }
 

src/sales/keyphrases/controller.go

@@ -2,14 +2,14 @@ package keyphrases
 
 import (
 	"fmt"
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
-	"qmx_admin/src/util"
 )
 
 var VarKeyPhrasesService *KeyPhrases
 
 func init() {
-	VarKeyPhrasesService = NewKeyPhrasesService(util.MQFW, util.JysqlDB, "base_service.key_phrases", "key_phrases")
+	VarKeyPhrasesService = NewKeyPhrasesService(config.MQFW, config.JysqlDB, "base_service.key_phrases", "key_phrases")
 }
 
 // SaveKeyInfo 保存更新关键词组信息/复制并生成关键词词组

src/task/returnMoneyTask.go

@@ -9,7 +9,6 @@ import (
 	"math"
 	"qmx_admin/src/config"
 	"qmx_admin/src/order"
-	"qmx_admin/src/util"
 	"time"
 )
 
@@ -36,9 +35,9 @@ func StartTask1() {
 	log.Println("自动回款匹配。。。开始")
 	query := "select * from transaction where ISRELATION = 0"
 	log.Println("query: ", query)
-	data := util.CbsDB.SelectBySql(query)
+	data := config.CbsDB.SelectBySql(query)
 	if data != nil && *data != nil && len(*data) > 0 {
-		orderData := util.JysqlDB.Find("dataexport_order", map[string]interface{}{"return_status": 0, "audit_status": 3}, "order_code,pay_money,company_name,commission,procedures_money,filter", "", -1, -1)
+		orderData := config.JysqlDB.Find("dataexport_order", map[string]interface{}{"return_status": 0, "audit_status": 3}, "order_code,pay_money,company_name,commission,procedures_money,filter", "", -1, -1)
 		for _, v := range *data {
 			returnMoney := int(math.Floor(float64(float64(qu.Float64All(v["TRSBAL"]))*100) + 0.5))
 			companyName := qu.ObjToString(v["OTHNAM"])
@@ -58,12 +57,12 @@ func StartTask1() {
 						if !isExists || err != nil {
 							log.Println("自动回款匹配成功", id, orderCode)
 							updateData := map[string]interface{}{"return_status": 1, "order_status": 1}
-							contract := util.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": orderCode}, "", "")
-							count := util.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": orderCode})
+							contract := config.JysqlDB.FindOne("contract", map[string]interface{}{"order_code": orderCode}, "", "")
+							count := config.JysqlDB.Count("return_money_record", map[string]interface{}{"order_code": orderCode})
 							if count < 1 && contract != nil && qu.IntAll((*contract)["contract_archive_status"]) != 1 {
 								updateData["sale_time"] = returnTime
 							}
-							returnId := util.JysqlDB.Insert("return_money_record", map[string]interface{}{
+							returnId := config.JysqlDB.Insert("return_money_record", map[string]interface{}{
 								"order_code":            orderCode,
 								"return_time":           returnTime,
 								"return_money":          money,
@@ -80,8 +79,8 @@ func StartTask1() {
 							redis.Put("qmx_filter", "qmx_auto_return_"+fmt.Sprint(id), 1, 3600)
 							if returnId > 0 {
 								log.Println("自动回款创建回款记录成功", id, orderCode)
-								util.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": orderCode}, updateData)
-								util.CbsDB.Update("transaction", map[string]interface{}{"id": id}, map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)})
+								config.JysqlDB.Update("dataexport_order", map[string]interface{}{"order_code": orderCode}, updateData)
+								config.CbsDB.Update("transaction", map[string]interface{}{"id": id}, map[string]interface{}{"ISRELATION": 1, "return_id": fmt.Sprint(returnId)})
 								filterMap := qu.ObjToMap(o["filter"])
 								paybackOpenServer := false
 								if v, ok := ((*filterMap)["paybackOpenServer"]).(bool); ok {

src/task/task2.go

@@ -29,7 +29,7 @@ type CustomerJson struct {
 func InitTask() {
 	// 获取未执行的消息
 	tim := time.Now().Format(date.Date_Full_Layout)
-	msg := util.JysqlDB.SelectBySql("select * from message_send_log where send_status = 1 and send_time >= ? and isdel = 1", tim)
+	msg := config.JysqlDB.SelectBySql("select * from message_send_log where send_status = 1 and send_time >= ? and isdel = 1", tim)
 	if msg != nil {
 		for _, val := range *msg {
 			now := time.Now()
@@ -55,7 +55,7 @@ func InitTask() {
 func Task(msgId int, sendTime string) {
 	util.OnTimeSendMap.Delete(strconv.Itoa(msgId) + sendTime)
 	//  消息id查库 获取消息信息  库里的发送时间 和创建任务时的时间比较 发送状态为未发送 未删除 判断本次是否需要执行
-	msg := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": msgId, "isdel": 1, "send_status": 1, "send_time": sendTime, "send_mode": 1}, "", "")
+	msg := config.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": msgId, "isdel": 1, "send_status": 1, "send_time": sendTime, "send_mode": 1}, "", "")
 	if msg == nil || len(*msg) <= 0 {
 		log.Println("消息可能已经删除或者修改了时间，本次不执行发送了", msg)
 		return
@@ -64,7 +64,7 @@ func Task(msgId int, sendTime string) {
 	url, androidUrl, iosUrl, wx := public.GetMsgUrlString(links[0], links[1], links[2], links[3], common.InterfaceToStr(msgId))
 	(*msg)["link"] = url
 	// 更新消息为发送中
-	ok1 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 2})
+	ok1 := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 2})
 	if ok1 {
 		//更新消息汇总表
 		err := util.BitmapMsgSummaryPost(int64(msgId), common.Int64All((*msg)["group_id"]), common.Int64All((*msg)["msg_type"])) //更新消息汇总表
@@ -89,7 +89,7 @@ func Task(msgId int, sendTime string) {
 			}
 			// 执行全部发送定时任务
 			public.AllUserSendMsg(&message, common.IntAll((*msg)["send_userid"]), common.ObjToString((*msg)["send_name"]), strconv.Itoa(msgId), false)
-			util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4})
+			config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4})
 		} else {
 			// 执行发送  分组用户
 			code, err := TaskSaveMsg(msgId, msg, url, androidUrl, iosUrl, wx, false)
@@ -102,7 +102,7 @@ func CustomTask(msgId int, sendTime string) {
 	util.OnTimeSendMap.Delete(strconv.Itoa(msgId) + sendTime)
 	log.Println("开始执行任务", msgId, sendTime, time.Now())
 	//  消息id查库 获取消息信息  库里的发送时间 和创建任务时的时间比较 发送状态为未发送 未删除 判断本次是否需要执行
-	msg := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": msgId, "isdel": 1, "send_status": 1, "send_time": sendTime, "send_mode": 1}, "", "")
+	msg := config.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": msgId, "isdel": 1, "send_status": 1, "send_time": sendTime, "send_mode": 1}, "", "")
 	if msg == nil || len(*msg) <= 0 {
 		log.Println("消息可能已经删除或者修改了时间，本次不执行发送了", msg)
 		return
@@ -111,7 +111,7 @@ func CustomTask(msgId int, sendTime string) {
 	url, androidUrl, iosUrl, wx := public.GetMsgUrlString(links[0], links[1], links[2], links[3], common.InterfaceToStr(msgId))
 	(*msg)["link"] = url
 	// 更新消息为发送中
-	ok1 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 2})
+	ok1 := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 2})
 	if ok1 {
 		//更新消息汇总表
 		err := util.BitmapMsgSummaryPost(int64(msgId), common.Int64All((*msg)["group_id"]), common.Int64All((*msg)["msg_type"])) //更新消息汇总表
@@ -158,11 +158,11 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl, iosU
 		} else {
 			sqlStr = " WHERE b.userid != ''"
 		}
-		count := util.ConvertlabDB.CountBySql(fmt.Sprintf("SELECT count(DISTINCT(b.userid)) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", common.ObjToString(msgs["send_usergroup_id"]), sqlStr))
+		count := config.ConvertlabDB.CountBySql(fmt.Sprintf("SELECT count(DISTINCT(b.userid)) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", common.ObjToString(msgs["send_usergroup_id"]), sqlStr))
 		log.Println("需要发送消息总量为", count)
 		if count > 0 {
 			sql := fmt.Sprintf("SELECT DISTINCT ( b.userid ) FROM (SELECT DISTINCT (customerid) AS customerid FROM `groupcustomers` WHERE groupid IN (%s)) a LEFT JOIN `customers_user` b ON a.customerid = b.customerid %s ORDER BY b.userid ASC", common.ObjToString(msgs["send_usergroup_id"]), sqlStr)
-			users := util.ConvertlabDB.SelectBySql(sql)
+			users := config.ConvertlabDB.SelectBySql(sql)
 			if users != nil && len(*users) > 0 {
 				for _, val := range *users {
 					j++
@@ -182,7 +182,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl, iosU
 					}
 					//如果是补发消息前2000条需要判重
 					/*if again && j <= 2000 {
-						num := util.MsgTidb.Count("message", map[string]interface{}{"receive_userid": userId, "msg_log_id": msgId})
+						num := config.MsgTidb.Count("message", map[string]interface{}{"receive_userid": userId, "msg_log_id": msgId})
 						if num > 0 {
 							continue
 						}
@@ -190,7 +190,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl, iosU
 					//查询mongo库用户信息
 					userData := &map[string]interface{}{}
 					ok := false
-					userData, ok = util.MQFW.FindById("user", userId, public.MsgUserInfoField)
+					userData, ok = config.MQFW.FindById("user", userId, public.MsgUserInfoField)
 					if userData == nil || len(*userData) == 0 || !ok {
 						continue
 					}
@@ -227,7 +227,7 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl, iosU
 		i = 0
 	}
 	//更新消息发送状态
-	ok2 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": pcUrl})
+	ok2 := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4, "lastUserId": lastUserId, "link": pcUrl})
 	if ok2 {
 		return 1, nil
 	} else {
@@ -258,7 +258,7 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl
 		"wxPushUrl":   wxUrl,
 		"iosPushUrl":  iosUrl,
 	}
-	user := util.MsgTidb.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "user_id", "", -1, -1)
+	user := config.MsgTidb.Find("sendmsg_customer_info", map[string]interface{}{"msg_id": msgId}, "user_id", "", -1, -1)
 	if user != nil && len(*user) > 0 {
 		for _, val := range *user {
 			userId := common.ObjToString(val["user_id"])
@@ -277,7 +277,7 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl
 			//查询mongo库用户信息
 			userData := &map[string]interface{}{}
 			ok := false
-			userData, ok = util.MQFW.FindById("user", userId, public.MsgUserInfoField)
+			userData, ok = config.MQFW.FindById("user", userId, public.MsgUserInfoField)
 			if userData == nil || len(*userData) == 0 || !ok {
 				continue
 			}
@@ -301,7 +301,7 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, pcUrl, androidUrl
 		log.Println("定时任务,获取分组及分组下用户耗时：", time.Since(st))
 	}
 	//更新消息发送状态
-	ok2 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4, "link": pcUrl})
+	ok2 := config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 4, "link": pcUrl})
 	if ok2 {
 		return 1, nil
 	} else {
@@ -320,7 +320,7 @@ func MsgAgain(id int) {
 		sql = fmt.Sprintf("SELECT * FROM message_send_log WHERE id = %d", id)
 	}
 	//查询发送记录中发送状态为发送中 2  发送失败 3 的数据
-	list := util.JysqlDB.SelectBySql(sql)
+	list := config.JysqlDB.SelectBySql(sql)
 	if list != nil && len(*list) > 0 {
 		for _, val := range *list {
 			//补发数据
@@ -346,7 +346,7 @@ func MsgAgain(id int) {
 				}
 				// 执行全部发送定时任务
 				public.AllUserSendMsg(&message, common.IntAll(val["send_userid"]), common.ObjToString(val["send_name"]), strconv.Itoa(msgLogId), true)
-				//util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgLogId}, map[string]interface{}{"send_status": 4})
+				//config.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgLogId}, map[string]interface{}{"send_status": 4})
 			} else {
 				// 执行发送  分组用户
 				code, err := TaskSaveMsg(msgLogId, &val, pcUrl, androidUrl, iosUrl, wx, true)

src/task/vipTask.go

@@ -6,22 +6,22 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"go.mongodb.org/mongo-driver/bson"
 	"log"
+	"qmx_admin/src/config"
 	"qmx_admin/src/order"
-	"qmx_admin/src/util"
 	"time"
 )
 
 func VipStateTask() {
 	defer common.Catch()
 	log.Println("定时任务，开始更新vip状态")
-	sess := util.MQFW.GetMgoConn()
+	sess := config.MQFW.GetMgoConn()
 	for {
 		if sess != nil {
-			defer util.MQFW.DestoryMongoConn(sess)
+			defer config.MQFW.DestoryMongoConn(sess)
 			break
 		}
 		time.Sleep(time.Minute)
-		sess = util.MQFW.GetMgoConn()
+		sess = config.MQFW.GetMgoConn()
 	}
 	nowTime := time.Now().Format(date.Date_Short_Layout)
 	t2, _ := time.ParseInLocation(date.Date_Short_Layout, nowTime, time.Local)
@@ -44,7 +44,7 @@ func VipStateTask() {
 			set := map[string]interface{}{
 				"i_vip_status": common.If(false, -2, 2), //1试用 2正式
 			}
-			isOk := util.MQFW.UpdateById("user", _id, bson.M{
+			isOk := config.MQFW.UpdateById("user", _id, bson.M{
 				"$set": set,
 			})
 			if isOk {

src/template/jyTemplateController.go

@@ -2,8 +2,7 @@ package template
 
 import (
 	"errors"
-	"qmx_admin/src/util"
-
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 )
 
@@ -22,7 +21,7 @@ func TemplateList(context *admin.Context) (interface{}, error) {
 	if param.Search != "" {
 		sql = "SELECT * FROM template_message where title like '%" + param.Search + "%'"
 	}
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	data["total"] = len((*res))
 	return data, nil
@@ -91,12 +90,12 @@ func AddfirstData(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("firstdata不可为空")
 	}
 	if param.Id != 0 {
-		ok := util.JysqlDB.Update("template_config", map[string]interface{}{"id": param.Id}, map[string]interface{}{"firstdata": param.Firstdata, "advertCode": param.AdvertCode})
+		ok := config.JysqlDB.Update("template_config", map[string]interface{}{"id": param.Id}, map[string]interface{}{"firstdata": param.Firstdata, "advertCode": param.AdvertCode})
 		if !ok {
 			return nil, errors.New("更新firstdata失败")
 		}
 	} else {
-		id := util.JysqlDB.Insert("template_config", map[string]interface{}{
+		id := config.JysqlDB.Insert("template_config", map[string]interface{}{
 			"sceneId":    param.SceneId,
 			"advertCode": param.AdvertCode,
 			"firstdata":  param.Firstdata,
@@ -120,7 +119,7 @@ func DelfirstData(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Id != 0 {
-		ok := util.JysqlDB.Delete("template_config", map[string]interface{}{"id": param.Id})
+		ok := config.JysqlDB.Delete("template_config", map[string]interface{}{"id": param.Id})
 		if !ok {
 			return nil, errors.New("删除firstdata失败")
 		}

src/template/jyTemplateService.go

@@ -7,7 +7,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"qmx_admin/src/config"
-	"qmx_admin/src/util"
 	"strings"
 )
 
@@ -17,21 +16,21 @@ const (
 	TemplateConfig  = "template_config"  //模板配置firstdata表
 )
 
-//模板详情
+// 模板详情
 func FindOneTemplate(id int) (res map[string]interface{}) {
-	template := util.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"id": id}, "", "")
+	template := config.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"id": id}, "", "")
 	data := map[string]interface{}{}
 	data["template"] = template
-	sceneList := util.JysqlDB.Find(Scene, map[string]interface{}{"templateId": id}, "", "", -1, -1)
+	sceneList := config.JysqlDB.Find(Scene, map[string]interface{}{"templateId": id}, "", "", -1, -1)
 	// data["scene"] = sceneList
 	// sql := "select a.id,a.pushLogic,a.pushUser,a.sceneName,a.sceneCode,a.templateId,b.sceneId,b.advertCode,b.firstdata,b.state,b.isTest from scene a inner join template_config b on a.id = b.sceneId where a.templateId = %d order by b.id desc"
 	// sql = fmt.Sprintf(sql, id)
-	// sceneList := util.JysqlDB.SelectBySql(sql)
+	// sceneList := config.JysqlDB.SelectBySql(sql)
 	// data["scene"] = sceneList
 	// data["sceneLen"] = 0
 	if sceneList != nil && *sceneList != nil {
 		for _, v := range *sceneList {
-			data := util.JysqlDB.Find(TemplateConfig, map[string]interface{}{"sceneId": v["id"]}, "", "", -1, -1)
+			data := config.JysqlDB.Find(TemplateConfig, map[string]interface{}{"sceneId": v["id"]}, "", "", -1, -1)
 			v["list"] = data
 		}
 	}
@@ -39,7 +38,7 @@ func FindOneTemplate(id int) (res map[string]interface{}) {
 	return data
 }
 
-//模板拉取
+// 模板拉取
 func TemplatePullList() map[string]interface{} {
 	req, _ := http.NewRequest("GET", "https://api.weixin.qq.com/cgi-bin/template/get_all_private_template?access_token=47_NIJT-59WmVJcTogFEz45Y7m7gps0vS-EArEcWaXSfdJXbwt79tEdaobKy4MF_n_7aN2HLrsQukn9w2KVqGzrGoOBCLSzACj_9uM5478nCc5cDDNiNl0WRww85xHjclCDBJp05rvLNh_VFexWLUQbAGAVEA", nil)
 	fmt.Println(config.SysConfigs.Domain + "/jyMarketing/activity/findCommodity")
@@ -58,7 +57,7 @@ func TemplatePullList() map[string]interface{} {
 	}{}
 	_ = json.Unmarshal([]byte(body), &dat)
 	for _, value := range dat.template_list {
-		template := util.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"templateId": value.template_id}, "", "")
+		template := config.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"templateId": value.template_id}, "", "")
 		if template != nil {
 			data := map[string]interface{}{}
 			data["templateId"] = value.template_id
@@ -67,29 +66,29 @@ func TemplatePullList() map[string]interface{} {
 			data["title"] = value.deputy_industry
 			data["deputyIndustry"] = value.primary_industry
 			data["example"] = value.example
-			_ = util.JysqlDB.Insert(TemplateMessage, data)
+			_ = config.JysqlDB.Insert(TemplateMessage, data)
 		}
 	}
 	return nil
 }
 
-//修改场景
+// 修改场景
 func UpdateSceneOne(id int, firstdata string, model int) bool {
 	switch model {
 	//修改firstdata字段
 	case 0:
 		sql := "update " + TemplateConfig + " set state = 0 ,isTest=0, firstdata = '" + firstdata + "' where id =" + fmt.Sprint(id)
-		i := util.JysqlDB.UpdateOrDeleteBySql(sql)
+		i := config.JysqlDB.UpdateOrDeleteBySql(sql)
 		if i > -1 {
 			return true
 		}
 		//测试
 	case 1:
 		sql := "update " + TemplateConfig + " set isTest = 1 where id =" + fmt.Sprint(id)
-		_ = util.JysqlDB.UpdateOrDeleteBySql(sql)
-		scene := util.JysqlDB.FindOne(TemplateConfig, map[string]interface{}{"id": id}, "", "")
-		scenes := util.JysqlDB.FindOne(Scene, map[string]interface{}{"id": (*scene)["sceneId"]}, "", "")
-		template := util.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"id": (*scenes)["templateId"]}, "", "")
+		_ = config.JysqlDB.UpdateOrDeleteBySql(sql)
+		scene := config.JysqlDB.FindOne(TemplateConfig, map[string]interface{}{"id": id}, "", "")
+		scenes := config.JysqlDB.FindOne(Scene, map[string]interface{}{"id": (*scene)["sceneId"]}, "", "")
+		template := config.JysqlDB.FindOne(TemplateMessage, map[string]interface{}{"id": (*scenes)["templateId"]}, "", "")
 		tmplData := map[string]*qrpc.TmplItem{
 			"first": &qrpc.TmplItem{
 				Value: fmt.Sprint((*scene)["firstdata"]),
@@ -110,7 +109,7 @@ func UpdateSceneOne(id int, firstdata string, model int) bool {
 		//确认生效
 	case 2:
 		sql := "update " + TemplateConfig + " set state = 1 where id =" + fmt.Sprint(id)
-		i := util.JysqlDB.UpdateOrDeleteBySql(sql)
+		i := config.JysqlDB.UpdateOrDeleteBySql(sql)
 		if i > -1 {
 			return true
 		}

src/templateManage/jyTemplateManageController.go

@@ -6,9 +6,9 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
+	"qmx_admin/src/config"
 	"qmx_admin/src/otherPackage/baiy/Cadmin-server-go/admin"
 	"qmx_admin/src/public"
-	"qmx_admin/src/util"
 	"time"
 )
 
@@ -30,13 +30,13 @@ func List(context *admin.Context) (interface{}, error) {
 	if param.Search != "" {
 		sql = "SELECT * FROM template_manage where state=1 and  ( template_name like '%" + param.Search + "%'  or template_id like '%" + param.Search + "%') ORDER BY create_time desc"
 	}
-	res := util.JysqlDB.SelectBySql(sql)
+	res := config.JysqlDB.SelectBySql(sql)
 	data["total"] = len((*res))
 	sql = "SELECT * FROM template_manage where   state=1 ORDER BY create_time desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
 	if param.Search != "" {
 		sql = "SELECT * FROM template_manage where state=1 and  ( template_name like '%" + param.Search + "%'  or template_id like '%" + param.Search + "%') ORDER BY create_time desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
 	}
-	res = util.JysqlDB.SelectBySql(sql)
+	res = config.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	return data, nil
 }
@@ -101,7 +101,7 @@ func Add(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("模板名称不可为空")
 	}
 	now := time.Now()
-	id := util.JysqlDB.Insert(TemplateManage, map[string]interface{}{
+	id := config.JysqlDB.Insert(TemplateManage, map[string]interface{}{
 		"template_name": param.TemplateName,
 		"news_type":     param.NewsType,
 		"news_title":    param.NewsTitle,
@@ -134,7 +134,7 @@ func Delete(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	if param.Id != 0 {
-		ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0, "last_time": time.Now().Format(date.Date_Full_Layout), "last_people": context.User.Username})
+		ok := config.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": param.Id}, map[string]interface{}{"state": 0, "last_time": time.Now().Format(date.Date_Full_Layout), "last_people": context.User.Username})
 		if !ok {
 			return nil, errors.New("删除模板信息失败")
 		}

src/templateManage/jyTemplateManageService.go

@@ -3,8 +3,8 @@ package templateManage
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
+	"qmx_admin/src/config"
 	"qmx_admin/src/public"
-	"qmx_admin/src/util"
 	"time"
 )
 
@@ -13,14 +13,14 @@ const (
 )
 
 func FindOneTemplate(id int) (res map[string]interface{}) {
-	template := util.JysqlDB.FindOne(TemplateManage, map[string]interface{}{"id": id}, "", "")
+	template := config.JysqlDB.FindOne(TemplateManage, map[string]interface{}{"id": id}, "", "")
 	data := map[string]interface{}{}
 	data["template"] = template
 	return data
 }
 
 func UpdateSceneOne(id int, newsContent, newsTitle, newsType, pcLink, templateName, wxLink, androidLink, appleLink, username string) bool {
-	ok := util.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now().Format(date.Date_Full_Layout), "last_people": username, "group_id": public.MsgTypeToGroupId[common.IntAll(newsType)]})
+	ok := config.JysqlDB.Update(TemplateManage, map[string]interface{}{"id": id}, map[string]interface{}{"news_content": newsContent, "news_title": newsTitle, "news_type": newsType, "pc_link": pcLink, "template_name": templateName, "wx_link": wxLink, "android_link": androidLink, "apple_link": appleLink, "last_time": time.Now().Format(date.Date_Full_Layout), "last_people": username, "group_id": public.MsgTypeToGroupId[common.IntAll(newsType)]})
 	if !ok {
 		return false
 	}

src/users/organizationAudit.go

@@ -180,11 +180,11 @@ func OrganizationDetail(context *admin.Context) (interface{}, error) {
 		info = resMap["data"].(map[string]interface{})
 		if userPhone, ok := info["regPhone"]; ok {
 			//	根据手机号查用户id
-			userData, ok2 := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": userPhone})
+			userData, ok2 := config.MQFW.FindOne("user", map[string]interface{}{"s_phone": userPhone})
 			if ok2 && userData != nil && len(*userData) > 0 {
 				userId = mongodb.BsonIdToSId((*userData)["_id"])
 			} else {
-				userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": userPhone})
+				userDatas, oks := config.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": userPhone})
 				if oks && userDatas != nil && len(*userDatas) > 0 {
 					userId = mongodb.BsonIdToSId((*userDatas)["_id"])
 				}