xuzhiheng преди 2 години
родител
ревизия
606bf437d9
променени са 34 файла, в които са добавени 80 реда и са изтрити 358 реда
  1. 0 9
      src/customerService/advancedProjectService.go
  2. 4 5
      src/customerService/customController.go
  3. 2 19
      src/customerService/customService.go
  4. 6 6
      src/customerService/dataExportLogController.go
  5. 3 24
      src/customerService/dataExportLogService.go
  6. 0 3
      src/customerService/newsController.go
  7. 0 29
      src/customerService/newsService.go
  8. 4 7
      src/export_log/exportLog.go
  9. 0 9
      src/infoManage/infoManageService.go
  10. 1 1
      src/leads/leadsservice.go
  11. 4 3
      src/main.go
  12. 5 11
      src/operateAnalysis/industrySolutionsController.go
  13. 2 3
      src/operateAnalysis/industrySolutionsService.go
  14. 1 1
      src/operateAnalysis/router.go
  15. 0 10
      src/order/helpUserOrderController.go
  16. 0 5
      src/order/invoiceService.go
  17. 1 29
      src/order/orderManageController.go
  18. 0 7
      src/order/orderManageService.go
  19. 1 7
      src/order/orderService.go
  20. 0 20
      src/order/otherOrderController.go
  21. 1 21
      src/order/otherOrderService.go
  22. 2 9
      src/order/smallShopTask.go
  23. 0 8
      src/order/suppleSalePerson.go
  24. 2 8
      src/order/userService.go
  25. 0 2
      src/public/message.go
  26. 24 37
      src/sales/jyPartnerController.go
  27. 4 8
      src/sales/jyPartnerService.go
  28. 0 17
      src/task/task2.go
  29. 3 7
      src/users/organizationAudit.go
  30. 3 12
      src/users/userManage.go
  31. 0 4
      src/util/common.go
  32. 3 4
      src/util/random.go
  33. 0 5
      src/util/requests.go
  34. 4 8
      src/util/uploadfile.go

+ 0 - 9
src/customerService/advancedProjectService.go

@@ -28,17 +28,10 @@ func GetTitleService(noticeAddress string) (string, string) {
 		return "", ""
 	}
 	infoIdStr := firstArr[len(firstArr)-1] // 获取id
-	//secondArr := strings.Split(firstArr[len(firstArr)-1], ".")
-	//if len(secondArr) == 0 {
-	//	return "", ""
-	//}
-	//infoIdStr := secondArr[0]
-	log.Println("公告加密id", infoIdStr)
 	infoId := qutil.DecodeArticleId2ByCheck(infoIdStr)[0]
 	if infoId == "" {
 		return "", ""
 	}
-	log.Println("公告解密id", infoId)
 	baseData := util.GlobalCommonDataDB.FindOne(util.BsaeInfo, map[string]interface{}{"infoId": infoId}, "title", "")
 	if baseData == nil {
 		return "", ""
@@ -114,10 +107,8 @@ 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, "  "))
-	log.Println("sql", "select  count(a.id) "+sql)
 	count := util.BaseDB.CountBySql("select  count(a.id) " + sql)
 	sql += fmt.Sprintf(" ORDER BY a.id desc limit  %d ,%d", param.Offset, param.PageSize)
-	log.Println("分页sql", findSql+sql)
 	list := util.BaseDB.SelectBySql(findSql + sql)
 	if list != nil && len(*list) > 0 {
 		for i := 0; i < len(*list); i++ {

+ 4 - 5
src/customerService/customController.go

@@ -2,13 +2,14 @@ package customerService
 
 import (
 	"errors"
-	"github.com/baiy/Cadmin-server-go/admin"
-	"github.com/baiy/Cadmin-server-go/system/utils"
-	"github.com/tealeg/xlsx"
 	"io/ioutil"
 	"log"
 	qutil "qfw/util"
 	"util"
+
+	"github.com/baiy/Cadmin-server-go/admin"
+	"github.com/baiy/Cadmin-server-go/system/utils"
+	"github.com/tealeg/xlsx"
 )
 
 type customMsg struct {
@@ -63,7 +64,6 @@ func MyCustomerList(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	log.Println(param)
 	adminPhone := context.User.Phone
 	count, data := MyCustomerService(param.State, param.UpdateTimeStart, param.UpdateTimeEnd, param.CompanyName, param.Phone, adminPhone, param.Page.Offset, param.Page.PageSize)
 	return map[string]interface{}{
@@ -138,7 +138,6 @@ func ImportUser(context *admin.Context) (interface{}, error) {
 	var saveData [][]interface{}            // 用于写入错误原因文件的数据   数据结构: [[userId,errReason],...]
 	var selectUser []map[string]interface{} // 用户选择的数据  数据结构[{userId:"1",phone:"18238182402"}...]
 	//遍历用户id 验证数据有效性
-	log.Println(userData)
 	for _, v := range userData {
 		recordCount++ // 记录读取到的条数
 		// 判断是否超过2000条数据,原因:超过2000条以后的数据导入失败。

+ 2 - 19
src/customerService/customService.go

@@ -5,7 +5,6 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/tealeg/xlsx"
 	"log"
 	"order"
 	"os"
@@ -16,6 +15,8 @@ import (
 	"task"
 	"time"
 	"util"
+
+	"github.com/tealeg/xlsx"
 )
 
 func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string, loginUserId int) (int, error) {
@@ -41,8 +42,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				args = append(args, time.Now().Format(qutil.Date_Full_Layout))
 				args = append(args, param.Id)
 			}
-			log.Println(fields)
-			log.Println(args)
 			count, _ := util.JysqlDB.InsertBatch("sendmsg_customer_info", fields, args)
 			ok := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": param.Id}, map[string]interface{}{
 				"send_usergroup_id":   "",
@@ -77,13 +76,10 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				sendTime = param.SendTime + ":00"
 			}
 			key := strconv.Itoa(param.Id)
-			log.Println("定时时间", sendTime)
 			if _, t := util.OnTimeSendMap.Load(key + sendTime); !t {
 				sendTime2, _ := time.ParseInLocation(qutil.Date_Full_Layout, sendTime, now.Location())
 				execTime := sendTime2.Unix() - now.Unix()
-				log.Println(execTime, sendTime, now.Format(qutil.Date_Full_Layout), sendTime2.Unix(), now.Unix())
 				util.OnTimeSendMap.Store(key+sendTime, true)
-				log.Println("打印信息。。。。。。。", time.Duration(execTime)*time.Second)
 				time.AfterFunc(time.Duration(execTime)*time.Second, func() {
 					// 执行任务
 					log.Println("创建、修改添加定时任务")
@@ -97,7 +93,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 	} else {
 		//保存发送的消息
 		var msgId int64
-		log.Println("发送消息发送时间:", param.SendTime)
 		isOk := util.JysqlDB.ExecTx("更新消息出错", func(tx *sql.Tx) bool {
 			msgId = util.JysqlDB.Insert("message_send_log", map[string]interface{}{
 				"send_usergroup_id":   "",
@@ -132,8 +127,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				args = append(args, time.Now().Format(qutil.Date_Full_Layout))
 				args = append(args, msgId)
 			}
-			log.Println(fields)
-			log.Println(args)
 			count, _ := util.JysqlDB.InsertBatch("sendmsg_customer_info", fields, args)
 			return msgId > -1 && count > 0
 		})
@@ -152,8 +145,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 				util.OnTimeSendMap.Store(strconv.Itoa(msgId)+param.SendTime+":00", true)
 				time.AfterFunc(days, func() {
 					// 执行任务
-					//log.Println("创建、修改添加定时任务")
-					log.Println(msgId, sendTime)
 					task.CustomTask(msgId, sendTime.Format("2006-01-02 15:04:05"), param.AndroidUrl, param.IosUrl)
 				})
 				return 1, nil
@@ -169,7 +160,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 		if err != nil {
 			log.Println("建立数据库连接出错:", err)
 		}
-		log.Println("--------", sendStatus)
 		userNames := ""
 		userIds := ""
 		i := 0
@@ -243,7 +233,6 @@ func CustomSendMsgService(param *customMsg, sendStatus int, loginUserName string
 			}
 			if i >= 100 {
 				//调用消息中台
-				log.Println("发送用户id", userIds)
 				util.MultipleSaveMessage(msg, userIds, userNames)
 				userNames = ""
 				userIds = ""
@@ -292,8 +281,6 @@ func MyCustomerService(state, updateTimeStart, updateTimeEnd, companyName, phone
 			sqlc += str
 		}
 		sqlStr += " order by lastUpdateTime desc limit " + fmt.Sprint(offSet) + " " + "," + " " + fmt.Sprint(pageSize)
-		log.Println("sql:", sqlStr)
-		log.Println("sqlc:", sqlc)
 		count = util.CusTiDb.CountBySql(sqlc)
 		if count > 0 {
 			res := util.CusTiDb.SelectBySql(sqlStr)
@@ -342,7 +329,6 @@ func SaveFile(rdata [][]interface{}, templatePath string, savePath string, saveN
 		row := sh.AddRow()
 		for j := 0; j < len(data); j++ {
 			row.AddCell().SetValue(data[j])
-			log.Println(data[j], "写入文件")
 		}
 	}
 	now := time.Now()
@@ -358,16 +344,13 @@ func SaveFile(rdata [][]interface{}, templatePath string, savePath string, saveN
 	t2 := fmt.Sprintf("%d%d%d%d%d%d", now.Year(), now.Month(), now.Day(), now.Hour(), now.Minute(), now.Second())
 
 	fileName := saveName + t2 + ".xlsx"
-	log.Println(dir + fileName)
 	err = xf.Save(dir + fileName)
-	log.Println(err)
 	url = qutil.ObjToString(config.SysConfigs.Domain) + dirs + fileName
 	return url, err
 }
 
 func GetUserById(id string) (userData *map[string]interface{}, ok bool) {
 	userData, ok = util.MQFW.FindById("user", id, `phone,s_phone`)
-	//log.Println(userData, ok)
 	return userData, ok
 }
 

+ 6 - 6
src/customerService/dataExportLogController.go

@@ -1,12 +1,13 @@
 package customerService
 
 import (
-	"github.com/baiy/Cadmin-server-go/admin"
 	"log"
+
+	"github.com/baiy/Cadmin-server-go/admin"
 	//"github.com/baiy/Cadmin-server-go/system/utils"
 )
 
-//导出记录返回值
+// 导出记录返回值
 type ExportLog struct {
 	UserName      string `json:"username"`
 	Phone         string `json:"phone"`
@@ -24,7 +25,7 @@ type ExportLog struct {
 	DownloadUrl   string `json:"downloadUrl"`   //下载链接
 }
 
-//导出记录详情
+// 导出记录详情
 func ExportLogDetails(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Id     int `form:"id"`
@@ -51,7 +52,7 @@ func ExportLogList(context *admin.Context) (interface{}, error) {
 		EntName   string `form:"entName"`   //企业名称
 		StartTime int    `form:"startTime"` //开始时间
 		EndTime   int    `form:"endTime"`   //结束时间
-		PageNum   int    `form:"offset"`   //页面
+		PageNum   int    `form:"offset"`    //页面
 		PageSize  int    `form:"pageSize"`  //
 	}
 	param := Params{}
@@ -65,9 +66,8 @@ func ExportLogList(context *admin.Context) (interface{}, error) {
 		log.Println(err)
 		return nil, err
 	}
-	log.Println(param)
 	data, totalCount := FindExportLogList(param.Phone, param.NickName, param.EntName, param.StartTime, param.EndTime, param.PageNum, param.PageSize)
-	if data == nil{
+	if data == nil {
 		data = []map[string]interface{}{}
 	}
 	return map[string]interface{}{

+ 3 - 24
src/customerService/dataExportLogService.go

@@ -30,11 +30,9 @@ func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 	return nil
 }
 
-//查询商机管理企业账户余额
+// 查询商机管理企业账户余额
 func getCurrEntCount(entName, entPhone string) int {
-	log.Println("查找余额条件", entName, entPhone)
 	current, ok := util.JyqyfwMgo.FindOne("user", map[string]interface{}{"phone": entPhone, "username": entName})
-	log.Println(current, ok, "查找余额结果")
 	if current == nil || !ok {
 		return 0
 	}
@@ -153,7 +151,6 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 				if len(tmpFilterList) > 0 {
 					tmpFilterSql = fmt.Sprintf(" where %s ", strings.Join(tmpFilterList, " and "))
 				}
-				//log.Println(888888, tmpFilterSql)
 				datapackSql = fmt.Sprintf("(SELECT id AS log_id,'' AS ent_id,useid AS user_id,master_id AS master_id,date AS exportDate,type AS data_from,export_num AS export_num,'2' AS source,'' AS phone,'' AS ent_name,'' AS admin_phone,isSenior as isSenior  FROM datapacket_record %s)  ", tmpFilterSql)
 				searchStrList = append(searchStrList, datapackSql)
 			}
@@ -173,7 +170,6 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 			if len(tmpFilterList) > 0 {
 				tmpFilterSql = fmt.Sprintf(" where %s ", strings.Join(tmpFilterList, " and "))
 			}
-			//log.Println(888888, tmpFilterSql)
 			datapackSql = fmt.Sprintf("(SELECT id AS log_id,'' AS ent_id,useid AS user_id,master_id AS master_id,date AS exportDate,type AS data_from,export_num AS export_num,'2' AS source,'' AS phone ,'' AS ent_name,'' as admin_phone,isSenior as isSenior FROM datapacket_record %s)  ", tmpFilterSql)
 			searchStrList = append(searchStrList, datapackSql)
 		}
@@ -185,7 +181,6 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 
 	// 处理手机号或者昵称条件匹配到的用户id
 	// 根据昵称匹配到了用户 拿到了用户手机号才能去查商机管理表
-	//log.Println(userNameIn)
 	if userNameIn != "" {
 		if len(nickPhoneList) > 0 {
 			if startTimeIn != 0 {
@@ -212,7 +207,6 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 			if len(tmpFilterList2) > 0 {
 				tmpFilterSql2 = fmt.Sprintf(" and %s ", strings.Join(tmpFilterList2, " and "))
 			}
-			//log.Println(tmpFilterSql2, "99888888")
 			// 数据流量包(线下)
 			entnicheSql = fmt.Sprintf("(SELECT a.id AS log_id, a.ent_id AS ent_id,a.user_id AS user_id,'' AS master_id,UNIX_TIMESTAMP( a.export_time ) AS exportDate,0 AS data_from,a.export_num AS export_num,'1' AS source,a.phone as phone ,b.NAME AS ent_name,b.phone as admin_phone ,'' as isSenior FROM entniche_export_log AS a,entniche_info AS b WHERE a.ent_id = b.id  %s)", tmpFilterSql2)
 			searchStrList = append(searchStrList, entnicheSql)
@@ -273,8 +267,6 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 		"FROM  (%s) AS finalData", b)
 	//查询
 	// 补充字段  支付方式 处理单日限量包   用户微信昵称  单日限量包和数据流量包线上需要补充 用户手机号
-	log.Println(c)
-	log.Println(searchValueList)
 	resultList := util.JysqlDB.Query(c, searchValueList...)
 
 	if resultList == nil || len(*resultList) == 0 {
@@ -286,32 +278,25 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 	for _, row := range *resultList {
 		//  根据类型查询  mongo 库
 		//	商机管理的根据手机号查询mongo库   获取用户微信昵称  source  0商机管理的数据  1  datapack的数据
-		//log.Println(row)
 		if row["source"] == "1" {
 
 			userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"s_phone": row["phone"]})
 			if ok && userData != nil && len(*userData) > 0 {
-				//log.Println("11", userData)
 				row["nickname"] = (*userData)["s_nickname"]
 			} else {
 				userDatas, oks := util.MQFW.FindOne("user", map[string]interface{}{"s_m_phone": row["phone"]})
 				if oks && userDatas != nil && len(*userDatas) > 0 {
-					//log.Println("22", userData)
 					row["nickname"] = (*userDatas)["s_nickname"]
 				} else {
 					log.Println("未找到对应信息2")
 				}
 			}
-			//log.Println("5555555",userData,row)
 			//	商机管理查询用户余额
-			log.Println(row["ent_name"], row["admin_phone"], "查找企业余额")
 			leftCount := getCurrEntCount(qutil.ObjToString(row["ent_name"]), qutil.ObjToString(row["admin_phone"]))
 			row["leftCount"] = leftCount
 		} else {
 			//	单日限量包和数据流量包线上的根据用户id查询mongo库  获取用户微信昵称和手机号
-			log.Println(row["user_id"])
 			data, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(qutil.ObjToString(row["user_id"]))})
-			log.Println(data, "补充用户手机号")
 			if ok && data != nil && len(*data) > 0 {
 				row["nickname"] = (*data)["s_nickname"]
 				if qutil.ObjToString((*data)["s_phone"]) == "" {
@@ -328,9 +313,8 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 			//	单日限量包  当日限额
 			if qutil.IntAll(row["data_from"]) == 1 {
 				// 查主账号余额
-				dayUse := redis.GetInt(RedisCacheDb, fmt.Sprintf(DataPacketUsedNum,qutil.ObjToString(row["master_id"]), time.Now().Day()))
-				//log.Println(dayUse)
-				todayLimit:= GetDailyNum(qutil.ObjToString(row["master_id"]))
+				dayUse := redis.GetInt(RedisCacheDb, fmt.Sprintf(DataPacketUsedNum, qutil.ObjToString(row["master_id"]), time.Now().Day()))
+				todayLimit := GetDailyNum(qutil.ObjToString(row["master_id"]))
 				row["leftCount"] = todayLimit - dayUse
 
 				//  补充公司名称  根据master_id 去member表里 mongo 查数据
@@ -380,14 +364,11 @@ func FindExportLogList(phoneIn, userNameIn, entNameIn string, startTimeIn, endTi
 		}
 		returnList = append(returnList, row)
 	}
-	//log.Println(resultList)
 	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)
-	//log.Println("啊 =====",serviceList)
 	if serviceList != nil && len(*serviceList) != 0 {
-		//log.Println(serviceList,"呜呜呜")
 		for _, item := range *serviceList {
 			serviceid := qutil.IntAll(item["s_serviceid"])
 			if serviceid == 17 || serviceid == 18 { //每日数据包
@@ -433,7 +414,6 @@ func CommonPost(path string, param url.Values) (map[string]interface{}, error) {
 	defer res.Body.Close()
 	bs, _ := ioutil.ReadAll(res.Body)
 	resMap := map[string]interface{}{}
-	log.Println("req", param.Encode(), "body:", string(bs), "err", err)
 	err = json.Unmarshal(bs, &resMap)
 	if err != nil {
 		return nil, fmt.Errorf("%s 请求中台返回内容异常 %s", path, string(bs))
@@ -566,7 +546,6 @@ func FindExportLog(id, source int) (result ExportLog, err error) {
 				}
 				//今日已导出数量
 				dayUse := redis.GetInt(RedisCacheDb, fmt.Sprintf(DataPacketUsedNum, qutil.ObjToString((*packExportLog)["master_id"]), time.Now().Day()))
-				//log.Println(dayUse)
 				balance = todayLimit - dayUse
 				//查询企业名称
 				companyName := ""

+ 0 - 3
src/customerService/newsController.go

@@ -3,7 +3,6 @@ package customerService
 import (
 	"config"
 	"errors"
-	"log"
 	"public"
 	qutil "qfw/util"
 	"strconv"
@@ -95,7 +94,6 @@ func MessageList(context *admin.Context) (interface{}, error) {
 			}
 		}
 	}
-	log.Println(isLookAll)
 	data, count := MsgList(param, isLookAll, loginUserId, loginUserName)
 	return map[string]interface{}{
 		"lists": data,
@@ -135,7 +133,6 @@ func MessageShow(context *admin.Context) (interface{}, error) {
 		(*data)["sendMode"] = (*data)["send_mode"]
 		(*data)["sendTime"] = (*data)["send_status"]
 		link := qutil.ObjToString((*data)["link"])
-		//log.Println("详情连接:", link)
 		arr := strings.Split(link, ",")
 		if len(arr) == 4 {
 			(*data)["link"] = arr[0]

+ 0 - 29
src/customerService/newsService.go

@@ -41,7 +41,6 @@ type CustomerId struct {
 // MsgDelete 删除消息
 func MsgDelete(id string) (int, error) {
 	ok := util.JysqlDB.UpdateOrDeleteBySql("UPDATE message_send_log SET isdel = -1 WHERE id = ?", id)
-	log.Println("修改结果", ok)
 	if ok < 0 {
 		return 0, errors.New("修改isDel删除状态出错")
 	}
@@ -53,7 +52,6 @@ func MsgDetail(id int) (*map[string]interface{}, error) {
 	info := util.JysqlDB.FindOne("message_send_log", map[string]interface{}{"id": id}, "", "")
 	if info != nil && len(*info) > 0 {
 		link := qutil.ObjToString((*info)["link"])
-		//log.Println("详情连接:", link)
 		arr := strings.Split(link, ",")
 		if len(arr) == 4 {
 			(*info)["link"] = arr[0]
@@ -74,7 +72,6 @@ func MsgDetail(id int) (*map[string]interface{}, error) {
 		} else {
 			(*info)["menuname"] = "message"
 		}
-		log.Println("消息详情信息:", *info)
 		return info, nil
 	}
 	return nil, errors.New("查询出错")
@@ -113,11 +110,9 @@ func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName s
 	if param.UpdateTimeEnd != "" {
 		str += " a.update_time <= '" + param.UpdateTimeEnd + " 23:59:59" + "' and"
 	}
-	log.Println("isLookAllMsg", isLookAllMsg)
 	if isLookAllMsg == 0 {
 		str += " a.send_userid = " + strconv.Itoa(loginUserId) + " and"
 	} else if isLookAllMsg == 1 {
-		log.Println("查询创建人为:", param.Creator)
 		if param.Creator != "" {
 			str += " a.send_name like '%" + param.Creator + "%' and"
 		}
@@ -141,8 +136,6 @@ func MsgList(param *MsgListParam, isLookAllMsg, loginUserId int, loginUserName s
 	}
 	sql += page
 	//sql += " ORDER BY id DESC"
-	log.Println("查询sql:", sql)
-	log.Println("统计sql:", sqlc)
 	data := util.JysqlDB.SelectBySql(sql)
 	count := util.JysqlDB.CountBySql(sqlc)
 	return data, int(count)
@@ -201,12 +194,9 @@ func SendMsg(param *public.Message, sendStatus int, loginUserName string, loginU
 			if _, t := util.OnTimeSendMap.Load(key + sendTime); !t {
 				sendTime2, _ := time.ParseInLocation(qutil.Date_Full_Layout, sendTime, now.Location())
 				execTime := sendTime2.Unix() - now.Unix()
-				//log.Println(execTime, sendTime, now.Format(qutil.Date_Full_Layout), sendTime2.Unix(), now.Unix())
 				util.OnTimeSendMap.Store(key+sendTime, true)
 				time.AfterFunc(time.Duration(execTime)*time.Second, func() {
 					// 执行任务
-					log.Println("创建、修改添加定时任务")
-					//log.Println(param.Id, sendTime)
 					task.Task(param.Id, sendTime, param.AndroidUrl, param.IosUrl)
 				})
 			}
@@ -246,23 +236,18 @@ func SendMsg(param *public.Message, sendStatus int, loginUserName string, loginU
 		if param.SendMode == 1 {
 			if msgId > 0 {
 				msgId := qutil.IntAll(msgId)
-				//log.Println("前端时间:", param.SendTime)
 				sendTime, _ := time.ParseInLocation(qutil.Date_Full_Layout, param.SendTime+":00", time.Now().Location())
 				now := time.Now()
 				days := sendTime.Sub(now)
-				//log.Println("时间:", days)
 				util.OnTimeSendMap.Store(strconv.Itoa(msgId)+param.SendTime+":00", true)
 				time.AfterFunc(days, func() {
 					// 执行任务
-					//log.Println("创建、修改添加定时任务")
-					log.Println(msgId, sendTime)
 					task.Task(msgId, sendTime.Format("2006-01-02 15:04:05"), param.AndroidUrl, param.IosUrl)
 				})
 				return 1, nil
 			}
 		}
 	}
-	log.Println("*********", msgLogId)
 	if param.SendMode == 2 && param.Sign != 4 {
 		if param.UserGroupId == public.AllUserCode {
 			// 全部用户发送消息 直接查询mongo库用户
@@ -340,7 +325,6 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 				userId = config.SysConfigs.UserIdMap[userId]
 			}
 			if _, ok := projectIdMap.Load(userId); ok {
-				log.Println("########################已发送,本次跳过。。。。。。。。。。。。。", userId)
 				continue
 			} else {
 				projectIdMap.Store(userId, true)
@@ -392,9 +376,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 			}
 			if i >= 100 {
 				//调用消息中台
-				log.Println("100个用户开始发送消息:", i)
 				util.MultipleSaveMessage(msg, userIds, userNames)
-				log.Println("100个用户发送消息完成")
 				userNames = ""
 				userIds = ""
 				i = 0
@@ -403,9 +385,7 @@ func pushMsg(param *SendMessage, sendStatus int) (int, error) {
 		}
 		if i > 0 {
 			//调用中台接口
-			log.Println("最后一批用户开始发送消息:", i)
 			util.MultipleSaveMessage(msg, userIds, userNames)
-			log.Println("最后一批用户发送消息完成")
 			userNames = ""
 			userIds = ""
 			i = 0
@@ -424,7 +404,6 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 	if err != nil {
 		log.Println("建立数据库连接出错:", err)
 	}
-	log.Println("--------", param.UserGroupId, sendStatus)
 	userNames := ""
 	userIds := ""
 	i := 0
@@ -450,7 +429,6 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 		log.Println("查询tidb中剑鱼用户出错:", err)
 		return err
 	}
-	log.Println("rows", rows)
 	defer rows.Close()
 	for rows.Next() {
 		j++
@@ -464,12 +442,10 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 			userId = config.SysConfigs.UserIdMap[userId]
 		}
 		if _, ok := projectIdMap.Load(userId); ok {
-			log.Println("########################已发送,本次跳过。。。。。。。。。。。。。", userId)
 			continue
 		} else {
 			projectIdMap.Store(userId, true)
 		}
-		log.Println("单条数据用户id:", user.UserId)
 		//查询mongo库用户信息
 		userData := &map[string]interface{}{}
 		ok := false
@@ -482,12 +458,9 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 		//name := qutil.ObjToString((*userData)["s_name"])
 		userNames += "" + ","
 		public.AppPushMsg(param, *userData, loginUserId, loginUserName, msgType)
-		log.Println("用户数量:", i)
 		if i >= 100 {
-			log.Println("100用户开始发送消息:", len(userIds))
 			//调用消息中台
 			util.MultipleSaveMessage(msg, userIds, userNames)
-			log.Println("100个用户发送消息完成......")
 			userNames = ""
 			userIds = ""
 			i = 0
@@ -495,10 +468,8 @@ func GroupSendMsg(param *public.Message, sendStatus int, loginUserId int, loginU
 
 	}
 	if i > 0 {
-		log.Println("最后一批用户开始发送消息:", len(userIds))
 		//调用中台接口
 		util.MultipleSaveMessage(msg, userIds, userNames)
-		log.Println("最后一批用户发送消息:完成")
 		userNames = ""
 		userIds = ""
 		i = 0

+ 4 - 7
src/export_log/exportLog.go

@@ -1,17 +1,16 @@
 package export_log
 
 import (
-
-
-	"github.com/go-xweb/xweb"
 	"log"
 	qutil "qfw/util"
 	"time"
+
+	"github.com/go-xweb/xweb"
 )
 
 /*
- 	商机管理-用户导出日志
-    对应数据库表 entniche_export_log
+		商机管理-用户导出日志
+	   对应数据库表 entniche_export_log
 */
 type ExportLog struct {
 	UserName    string    `json:"user_name"`    //用户名称
@@ -33,7 +32,6 @@ type Action struct {
 
 func (a *Action) Query() {
 	entId := qutil.IntAll(a.GetSession("entId"))
-	log.Println("entniche_export_log Query entId:", entId)
 	phone := a.GetString("phone")            //用户手机号
 	userName := a.GetString("userName")      //用户姓名
 	startTimeStr := a.GetString("startTime") //开始时间
@@ -59,4 +57,3 @@ func (a *Action) Query() {
 	data := util.Mysql.SelectBySql(sql, val...)
 	a.ServeJson(Result{Data: data})
 }
-

+ 0 - 9
src/infoManage/infoManageService.go

@@ -3,7 +3,6 @@ package infoManage
 import (
 	"config"
 	"errors"
-	"log"
 	qutil "qfw/util"
 	"util"
 )
@@ -11,7 +10,6 @@ import (
 func infoList(param *listParam) (*map[string]interface{}, error) {
 	result := &map[string]interface{}{}
 	path := config.SysConfigs.JyInfo["infoList"]
-	log.Println("请求地址:", path)
 	sendParam := map[string]interface{}{
 		"pageIndex": param.CurrentPage,
 		"pageSize":  param.Page.PageSize,
@@ -46,9 +44,7 @@ func infoList(param *listParam) (*map[string]interface{}, error) {
 		sendParam["recommendedService"] = qutil.IntAll(param.RecommendedService)
 	}
 
-	log.Println("请求参数", sendParam)
 	resp, err := util.Common_post(path, sendParam, 0)
-	log.Println("列表调用中台返回结果", resp, err)
 	if err != nil {
 		return nil, err
 	}
@@ -70,9 +66,7 @@ func InfoDetails(msgId, types string) (*map[string]interface{}, error) {
 		"appId": util.AppId,
 		"type":  qutil.IntAll(types),
 	}
-	log.Println("请求参数:", sendParam)
 	resp, err := util.Common_post(config.SysConfigs.JyInfo["infoDetail"], sendParam, 0)
-	log.Println("details", resp, err)
 	if err != nil {
 		return nil, err
 	}
@@ -97,11 +91,8 @@ func InfoExamine(msgId, reviewStatus, reviewDetail, msgType, loginUserName strin
 		"msgType":      qutil.IntAll(msgType),
 		"auditor":      loginUserName,
 	}
-	log.Println("请求参数:", sendParam)
 	path := config.SysConfigs.JyInfo["infoExamine"]
 	resp, err := util.Common_post(path, sendParam, 0)
-	log.Println("请求中台返回结果", resp)
-	log.Println("请求中台返回错误", err)
 	if err != nil {
 		return nil, err
 	}

+ 1 - 1
src/leads/leadsservice.go

@@ -76,7 +76,7 @@ func (m *saleLeadsService) RecordList(param RecordReq) (total int64, list []map[
 		cond := fmt.Sprintf("select GROUP_CONCAT(id) as count from %s where username like \"%%%s%%\" ", m.TableAdminUser, param.CreatePerson)
 		userIds := m.AdminDb.SelectBySql(cond)
 		if userIds == nil || len(*userIds) == 0 {
-			log.Println("查询到用户信息")
+			log.Println("查询到用户信息")
 			return 0, []map[string]interface{}{}
 		}
 		filter = append(filter, fmt.Sprintf("creater in (%s)", (*userIds)[0]["count"]))

+ 4 - 3
src/main.go

@@ -22,10 +22,11 @@ import (
 	_ "users"
 	"util"
 
+	_ "leads"
+
 	"github.com/baiy/Cadmin-server-go/admin"
 	_ "github.com/baiy/Cadmin-server-go/system" // 注册内置请求处理方法
 	"github.com/cron"
-	_ "leads"
 )
 
 func main() {
@@ -48,9 +49,9 @@ func main() {
 		// 前后端分离项目一般会有跨域问题 自行处理
 		writer.Header().Add("Access-Control-Allow-Origin", "*")
 		writer.Header().Add("Access-Control-Allow-Headers", "Content-Type")
-		actionArr := "/load,/order/getServer,/order/getCombo,/users/userList,/order/orderList,/message/messageList,/message/messageDetails,/message/getGroup"
+		actionArr := "/system/user/save,/system/user/remove,/order/orderList/confirmRefund,/order/orderList/transferAccounts,/users/subAdd,/users/subOpenClose,/order/createBigOrder,/order/createSubOrder,/order/createSupplyOrder,/order/updateCombo,/order/delCombo,/order/openInvoice,/order/createOtherOrder,/order/editReturnInfo,/order/updateSalesperson,/order/editBatchReturnMoneyInfo,/order/updateBigOrder,/order/updateOtherOrder,/order/updateSupplyOrder,/order/updateSubOrder,/order/myCreateOtherOrder,/order/myCreateBigOrder,/order/suppleInfoExamine,/order/ordersExamine,/order/myUpdateOtherOrder,/order/myUpdateBigOrder,/order/myCreateSubOrder,/order/myCreateSupplyOrder,/order/myUpdateSupplySubOrder,/order/helpUserOrders,/order/logicalDelOrder,/order/addUpdateRecord"
 		context := admin.NewContext(writer, request)
-		if context.User != nil && !strings.Contains(actionArr, context.Action) {
+		if context.User != nil && strings.Contains(actionArr, context.Action) {
 			res, _ := json.Marshal(context.Response)
 			//formParam:=map[string]interface{}{}
 			formParam, _ := json.Marshal(request.Form)

+ 5 - 11
src/operateAnalysis/industrySolutionsController.go

@@ -4,11 +4,12 @@ package operateAnalysis
 import (
 	"errors"
 	"fmt"
-	"github.com/baiy/Cadmin-server-go/admin"
-	"github.com/baiy/Cadmin-server-go/system/utils"
 	"log"
 	"time"
 	"util"
+
+	"github.com/baiy/Cadmin-server-go/admin"
+	"github.com/baiy/Cadmin-server-go/system/utils"
 )
 
 const (
@@ -27,7 +28,6 @@ type ListRequest struct {
 
 // IndustrySolutionsList  行业解决方案-列表
 func IndustrySolutionsList(context *admin.Context) (interface{}, error) {
-	//log.Println("啦啦啦")
 	param := new(ListRequest)
 	err := context.Form(param)
 	if err != nil {
@@ -88,7 +88,7 @@ func IndustrySolutionsListExport(context *admin.Context) (interface{}, error) {
 	}, nil
 }
 
-//合作商招募列表
+// 合作商招募列表
 func PartnerRecruit(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		StartTime int `form:"startTime"`
@@ -117,7 +117,6 @@ func PartnerRecruit(context *admin.Context) (interface{}, error) {
 		}
 		query["createtime"] = tmp
 	}
-	//log.Println(param.Source)
 	if param.Source == 1 {
 		query["source"] = "partner_recruit_page"
 	} else if param.Source == 2 {
@@ -127,8 +126,6 @@ func PartnerRecruit(context *admin.Context) (interface{}, error) {
 			"$in": []string{"partner_recruit_page", "channelPartner"},
 		}
 	}
-	//query["source"] = PartnerSource
-	//log.Println(query)
 	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)
 	if !ok {
@@ -140,7 +137,7 @@ func PartnerRecruit(context *admin.Context) (interface{}, error) {
 	}, nil
 }
 
-//合作商招募导出
+// 合作商招募导出
 func PartnerRecruitExport(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		StartTime int `form:"startTime"`
@@ -168,8 +165,6 @@ func PartnerRecruitExport(context *admin.Context) (interface{}, error) {
 		}
 		query["createtime"] = tmp
 	}
-	//query["source"] = PartnerSource
-	//log.Println(param.Source)
 	if param.Source == 1 {
 		query["source"] = "partner_recruit_page"
 	} else if param.Source == 2 {
@@ -204,7 +199,6 @@ func PartnerRecruitExport(context *admin.Context) (interface{}, error) {
 	dirs := fmt.Sprintf("%s%s/", "/static/xlsx/partnerRecruit/", t)
 	fileName := fmt.Sprintf("%s%s.xlsx", name, t)
 	url, err := partnerRecruitExport(list, titles, keys, dir, fileName, dirs)
-	log.Println(url, err)
 	if url == "" && err == nil {
 		return map[string]interface{}{
 			"path": "",

+ 2 - 3
src/operateAnalysis/industrySolutionsService.go

@@ -3,13 +3,14 @@ package operateAnalysis
 import (
 	. "config"
 	"errors"
-	"github.com/tealeg/xlsx"
 	"log"
 	"order"
 	"os"
 	"qfw/util"
 	"time"
 	util2 "util"
+
+	"github.com/tealeg/xlsx"
 )
 
 const (
@@ -114,7 +115,6 @@ func PathExists(path string) bool {
 	if err == nil {
 		return true
 	}
-	log.Println("err", err)
 	if os.IsNotExist(err) {
 		return false
 	}
@@ -165,7 +165,6 @@ func partnerRecruitExport(data *[]map[string]interface{}, title, keys []string,
 	if b := order.PathExists(saveDir); !b {
 		err1 := os.MkdirAll(saveDir, os.ModePerm)
 		if err1 != nil {
-			//log.Println("mkdir err", saveDir)
 			return "", err1
 		}
 	}

+ 1 - 1
src/operateAnalysis/router.go

@@ -3,6 +3,7 @@ package operateAnalysis
 import (
 	"errors"
 	"fmt"
+
 	. "github.com/baiy/Cadmin-server-go/admin"
 )
 
@@ -65,7 +66,6 @@ func (d *OperateAnalysisDispatchers) Register(methods map[string]OperateAnalysis
 }
 
 func init() {
-	//log.Println("8888888")
 	RegisterOperateAnalysis(map[string]OperateAnalysisDispatcherHandleMethod{
 		"Baiy.Cadmin.OperateAnalysis.industrySolutionList":       IndustrySolutionsList,       // 行业解决方案
 		"Baiy.Cadmin.OperateAnalysis.industrySolutionListExport": IndustrySolutionsListExport, // 行业解决方案-列表数据导出

+ 0 - 10
src/order/helpUserOrderController.go

@@ -101,22 +101,13 @@ func CreateUserAccount(context *admin.Context) (interface{}, error) {
 				"password": "",
 			}
 			if !strings.HasPrefix(param.UserId, "9") {
-				log.Println("addBaseUser start")
 				ck := &http.Cookie{}
 				usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formData, ck)
-				log.Println("addBaseUser end")
-			} else {
-				log.Println("prefix with 9")
 			}
 		}
 	} else if len(param.UserId) == 24 {
 		userId = param.UserId
 	}
-	//返回用户信息
-	//str := fmt.Sprintf("userId=%s&tt=%d&tn=%d&sId=%d&sName=%s&t=%d", mongodb.BsonIdToSId((*userData)["_id"]), param.CycleCount, param.CycleUnit, context.User.Id, context.User.Username, time.Now().Unix())
-	//log.Println("拼接字符串str", str)
-	//加密
-	//token = cm.SE.Encode2Hex(str)
 	token = GetSellerToken(userId, context.User.Username, context.User.Id, map[string]interface{}{
 		"tt": param.CycleUnit,
 		"tn": param.CycleCount,
@@ -190,7 +181,6 @@ func UpdateCouponState(userId, userLotteryId string, model int) (b bool) {
 	bs, _ := ioutil.ReadAll(res.Body)
 	resMap := map[string]interface{}{}
 	err = json.Unmarshal([]byte(bs), &resMap)
-	log.Println("调用活动中台返回:", resMap)
 	if err != nil {
 		log.Println("json.unmarshal err", resMap)
 	} else {

+ 0 - 5
src/order/invoiceService.go

@@ -45,7 +45,6 @@ func (*InvoiceService) SaveInvoice(fieldName []string, valueList []interface{},
 			return false
 		}
 		updateSql := fmt.Sprintf("update %v set applybill_status=2 where order_code in ('%v')", DataExportOrder, strings.Join(orderCode, "','"))
-		log.Println("更新订单发票状态sql:", updateSql)
 		updateCount := util.JysqlDB.UpdateOrDeleteBySqlByTx(tx, updateSql)
 		if updateCount < 0 {
 			return false
@@ -56,10 +55,6 @@ func (*InvoiceService) SaveInvoice(fieldName []string, valueList []interface{},
 
 // RangeRand 生成指定范围的随机数
 func RangeRand(min, max int64) int64 {
-	//if min > max {
-	//	log.Println("the min is greater than max!")
-	//}
-
 	if min < 0 {
 		f64Min := math.Abs(float64(min))
 		i64Min := int64(f64Min)

+ 1 - 29
src/order/orderManageController.go

@@ -397,19 +397,15 @@ func orderList(context *admin.Context) (interface{}, error) {
 	money, moneyLine, refundMoney := int64(0), int64(0), int64(0)
 	if count > 0 {
 		moneyRs := util.JysqlDB.SelectBySql(sqlM)
-		log.Println("查询结果:", moneyRs)
 		if moneyRs != nil && len(*moneyRs) > 0 {
 			money = qutil.Int64All((*moneyRs)[0]["sum_line"])
 			moneyLine = qutil.Int64All((*moneyRs)[0]["sum_qmx"])
 		}
-		log.Println("线上订单金额", moneyLine, "线下订单金额", money, "订单金额sql", sqlM)
-		log.Println(sqlRefund2)
 		refundMoney = util.JysqlDB.CountBySql(sqlRefund2)
 		if refundMoney < 0 {
 			refundMoney = 0
 		}
 	}
-	log.Println(sqlFind)
 	res := util.JysqlDB.SelectBySql(sqlFind)
 	if res != nil && len(*res) > 0 {
 		data := map[string]interface{}{}
@@ -934,7 +930,6 @@ func ExportOrder(context *admin.Context) (interface{}, error) {
 		sql += str
 	}
 	sql += " order by e.create_time desc "
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 	if product_type == "中标必听课" {
 		excel_path = CourseDownload(product_type, res)
@@ -1163,7 +1158,6 @@ func CreateBigOrder(context *admin.Context) (interface{}, error) {
 				}
 
 				_id := util.MQFW.Save("user", data)
-				log.Println("新增用户", _id)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -1172,22 +1166,16 @@ func CreateBigOrder(context *admin.Context) (interface{}, error) {
 						"password": "",
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
-						log.Println("addBaseUser start")
 						ck := &http.Cookie{}
 						usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-						log.Println("addBaseUser end")
-					} else {
-						log.Println("prefix with 9")
 					}
-
 				}
 			}
 		}
-
-		log.Println("------------user表的时间数据-----------:", bigEnd, "--时间:", time.Unix(bigEnd, 0))
 		if param.CreateType == 3 {
 			if bigEnd != 0 {
 				enddate = GetDATE(param.PayCycle, param.CycleType, bigEnd)
+				startdate = time.Unix(bigEnd, 0)
 			}
 		}
 		if param.CreateType == 2 {
@@ -1402,7 +1390,6 @@ func UpdateBigOrder(context *admin.Context) (interface{}, error) {
 			}
 			if userId == "" {
 				_id := util.MQFW.Save("user", data)
-				log.Println("新增用户", _id)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -1411,14 +1398,9 @@ func UpdateBigOrder(context *admin.Context) (interface{}, error) {
 						"password": "",
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
-						log.Println("addBaseUser start")
 						ck := &http.Cookie{}
 						usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-						log.Println("addBaseUser end")
-					} else {
-						log.Println("prefix with 9")
 					}
-
 				}
 			}
 			if strings.HasPrefix(qutil.ObjToString(res["user_phone"]), "9") {
@@ -1677,7 +1659,6 @@ func MyUpdateBigOrder(context *admin.Context) (interface{}, error) {
 					"i_member_endtime": bigEnd,
 				}
 				_id := util.MQFW.Save("user", data)
-				log.Println("新增用户", _id)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -1686,14 +1667,9 @@ func MyUpdateBigOrder(context *admin.Context) (interface{}, error) {
 						"password": "",
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
-						log.Println("addBaseUser start")
 						ck := &http.Cookie{}
 						usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-						log.Println("addBaseUser end")
-					} else {
-						log.Println("prefix with 9")
 					}
-
 				}
 			}
 			if strings.HasPrefix(qutil.ObjToString(res["user_phone"]), "9") {
@@ -1742,7 +1718,6 @@ func MyUpdateBigOrder(context *admin.Context) (interface{}, error) {
 				returnStatus = 2
 			}
 		}
-		log.Println("------------user表的时间数据-----------:", bigEnd, "--时间:", time.Unix(bigEnd, 0))
 		oldidMap := map[string]bool{
 			"4":  true,
 			"13": true,
@@ -2534,7 +2509,6 @@ func CreateSupplyOrder(context *admin.Context) (interface{}, error) {
 				if qutil.IntAll(v["id"]) == 16 {
 					sqls := "select * from bigmember_service_user where s_serviceid = ? and s_userid = ?"
 					serverData := util.JysqlDB.SelectBySql(sqls, 12, userId)
-					log.Println("下标越界bug测试+++++++++", serverData)
 					updatecount_before := qutil.IntAll((*serverData)[0]["i_frequency"])
 					updatecount_after := updatecount_before + qutil.IntAll(v["count"])
 					serverId := 12
@@ -3224,7 +3198,6 @@ func GetServer(context *admin.Context) (interface{}, error) {
 	datas := util.JysqlDB.Find("bigmember_service", map[string]interface{}{"i_status": 0}, "", "", 0, 0)
 	if datas != nil && len(*datas) > 0 {
 		for _, v := range *datas {
-			log.Println(oldidMap[strconv.Itoa(qutil.IntAll(v["id"]))])
 			// 老版的拼上500的
 			if oldidMap[strconv.Itoa(qutil.IntAll(v["id"]))] {
 				v["s_name"] = fmt.Sprintf("%v(关注%v个)", v["s_name"], v["s_count_year"])
@@ -3590,7 +3563,6 @@ func GetSalesChannelItem(context *admin.Context) (interface{}, error) {
 			val["children"] = item
 			res = append(res, val)
 		}
-		log.Println(res)
 		return map[string]interface{}{
 			"code": 1,
 			"msg":  "查询成功",

+ 0 - 7
src/order/orderManageService.go

@@ -905,12 +905,6 @@ func CourseOrderDetails(res *map[string]interface{}, name string) map[string]int
 	result := map[string]interface{}{}
 	order_status := qutil.IntAll((*res)["order_status"])
 	pay_time := qutil.ObjToString((*res)["pay_time"])
-	// if name != "线下课程" {
-	//invoice := util.JysqlDB.FindOne("invoice", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "create_time desc")
-	////log.Println("线上课程查询到发票的信息", invoice)
-	//if invoice != nil {
-	//	(*res)["invoice"] = invoice
-	//}
 	(*res)["invoice"] = []map[string]interface{}{}
 	data := util.JysqlDB.Find("invoice", map[string]interface{}{"order_code": (*res)["order_code"]}, "", "create_time desc", 0, 0)
 	if *data != nil && len(*data) != 0 {
@@ -4401,7 +4395,6 @@ func UpdateNewBigOrder(subStatus, dateType int, now, startdate, enddate time.Tim
 						}
 					}
 				}
-				log.Println("大会员更新订单 清空大会员权益缓存++++++++++++", qutil.InterfaceToStr(paramOrder["user_id"]))
 				ClearBigVipUserPower(qutil.InterfaceToStr(paramOrder["user_id"]))
 			}
 		}

+ 1 - 7
src/order/orderService.go

@@ -107,12 +107,10 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 		d, _ := time.ParseDuration("-24h")
 		vipStartTime = vipStartTime.Add(d)
 	}
-	log.Println(vipStartTime)
 	if param.CycleUnit == 3 {
 		_endTime := vipStartTime.AddDate(0, 0, param.CycleCount)
 		t := _endTime.Format(qutil.Date_Short_Layout) + " 23:59:59"
 		endTime, _ = time.ParseInLocation(qutil.Date_Full_Layout, t, time.Local)
-		//log.Println("截止时间:", endTime)
 	} else {
 		endTime = GetDATE1(month, vipStartTime.Unix())
 	}
@@ -263,8 +261,6 @@ func myUpdateSupSub(param *CreateOtherOrderParams, code string, returnStatus int
 		if param.ContractTime == "" {
 			delete(contractData, "contract_time")
 		}
-		log.Println(insertData)
-
 		ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
 			"order_code": code,
 		}, insertData)
@@ -291,7 +287,6 @@ func AuditRecordsList(orderCode string, start, pageSize int) *[]map[string]inter
 
 // MyUpdateOrder 只更新订单信息
 func MyUpdateOrder(subStatus, dateType int, now, startdate, enddate time.Time, userId, code string, param *Params, return_status int) error {
-	log.Println("大会员更新订单参数:", subStatus, dateType, now, startdate, enddate, userId, code)
 	//先处理之前的订单
 	var contractStatus int
 	if param.ContractUrl != "" {
@@ -330,8 +325,7 @@ func MyUpdateOrder(subStatus, dateType int, now, startdate, enddate time.Time, u
 	}
 	filter, _ := json.Marshal(filter_map)
 	agreementTime := time.Unix(param.AgreementTime, 0)
-	serverMap := GetServerPid()
-	log.Println("serverMap", serverMap)
+	// serverMap := GetServerPid()
 	if param.BigPayMoney > -1 {
 		paramOrder := map[string]interface{}{
 			"order_money":        param.BigMoney + param.SubMoney + param.SupplyMoney,

+ 0 - 20
src/order/otherOrderController.go

@@ -327,7 +327,6 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 				"s_regsource": "qmx_admin",
 			}
 			_id := util.MQFW.Save("user", data)
-			log.Println("新增用户", _id)
 			if _id != "" {
 				userId = _id
 				formdata := map[string]interface{}{
@@ -336,14 +335,9 @@ func UpdateOtherOrder(context *admin.Context) (interface{}, error) {
 					"password": "",
 				}
 				if !strings.HasPrefix(param.Phone, "9") {
-					log.Println("addBaseUser start")
 					ck := &http.Cookie{}
 					usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-					log.Println("addBaseUser end")
-				} else {
-					log.Println("prefix with 9")
 				}
-
 			}
 		}
 		if param.ProductType == "VIP订阅" && param.BuySubject != "2" {
@@ -937,7 +931,6 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 	if err != nil {
 		return nil, err
 	}
-	log.Println(param)
 	orderData := util.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("输入内容不能为空")
@@ -991,7 +984,6 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 				"i_free_sub_num":     freeSub,
 			}
 			_id := util.MQFW.Save("user", data)
-			log.Println("新增用户", _id)
 			if _id != "" {
 				userId = _id
 				formdata := map[string]interface{}{
@@ -1000,14 +992,9 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 					"password": "",
 				}
 				if !strings.HasPrefix(param.Phone, "9") {
-					log.Println("addBaseUser start")
 					ck := &http.Cookie{}
 					usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-					log.Println("addBaseUser end")
-				} else {
-					log.Println("prefix with 9")
 				}
-
 			}
 		} else {
 			datas, oks := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
@@ -1080,13 +1067,11 @@ 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)})
-		log.Println(datas, oks)
 		memberState, buyStart := 0, int64(0)
 		if oks && datas != nil && len(*datas) > 0 {
 			memberState = qutil.IntAll((*datas)["i_member_status"])
 			buyStart = qutil.Int64All((*datas)["i_member_starttime"])
 		}
-		log.Println(buyStart, time.Now().Unix())
 		if time.Now().Unix() >= buyStart {
 
 			if !strings.HasPrefix(param.UserPhone, "9") {
@@ -1124,7 +1109,6 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 		updateSubPhone := (*orderData2)["user_phone"]
 		createMin, createMax := GetDayMinMax(today)
 		//2. 根据查询条件查询出需要更新订单
-		log.Println("userphone")
 		subDataList := util.JysqlDB.SelectBySql("select * from dataexport_order where user_phone=? and create_time>=? and create_time<=?", updateSubPhone, qutil.FormatDateByInt64(&createMin, qutil.Date_Full_Layout), qutil.FormatDateByInt64(&createMax, qutil.Date_Full_Layout))
 		if subDataList != nil && len(*subDataList) > 0 {
 			//3. 执行更新操作
@@ -1151,7 +1135,6 @@ func UpdateSalesperson(context *admin.Context) (interface{}, error) {
 	if param.SaleTime != "" {
 		if orderData != nil {
 			isBack := (*orderData)["is_backstage_order"]
-			log.Println(isBack, (*orderData))
 			if qutil.IntAll(isBack) == 1 {
 				return nil, errors.New("后台创建订单不可修改销售统计时间")
 
@@ -1192,7 +1175,6 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 			"$gt": time.Now().Unix(),
 		},
 	}
-	log.Println(query)
 	count1 := util.MQFW.Count("user", query)
 	if count1 > 0 {
 		willEffect = true
@@ -1241,7 +1223,6 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 		}
 	}
 	if userInfo != nil && len(userInfo) > 0 {
-		log.Println(userInfo)
 		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)
@@ -1253,7 +1234,6 @@ func VipInfo(context *admin.Context) (interface{}, error) {
 		areaCount := qutil.IntAll((*buySet)["areacount"])
 		//判断购买区域是否是全国
 		nationwide := false
-		//log.Println(area)
 		if areaCount == -1 {
 			nationwide = true
 		}

+ 1 - 21
src/order/otherOrderService.go

@@ -53,7 +53,6 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 	price := 0
 	packNum := 0
 	if param.ProductType == "广告" {
-		log.Println("AdSourceMap[param.AdSource]", AdSourceMap[param.AdSource])
 		filter_map["adSource"] = AdSourceMap[param.AdSource]
 	} else if param.ProductType == "数据流量包" {
 		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
@@ -90,7 +89,6 @@ func createOtherOrder(param *CreateOtherOrderParams, code string) bool {
 	} else if param.DataType == "3" {
 		param.DataType = "自定义字段包"
 	}
-	log.Println(param.OrderMoney)
 	if param.OrderChannel == "d03" {
 		filter_map["source"] = ""
 		filter_map["canInvoice"] = false
@@ -352,7 +350,6 @@ func updateOtherOrder(param *CreateOtherOrderParams, code string, returnStatus i
 	price := 0
 	packNum := 0
 	if param.ProductType == "广告" {
-		log.Println("AdSourceMap[param.AdSource]", AdSourceMap[param.AdSource])
 		filterMap["adSource"] = AdSourceMap[param.AdSource]
 	} else if param.ProductType == "数据流量包" {
 		userData, ok := util.MQFW.FindOne("user", map[string]interface{}{"_id": mongodb.StringTOBsonId(param.UserId)})
@@ -744,7 +741,6 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 					"s_regsource": "qmx_admin",
 				}
 				_id := util.MQFW.Save("user", data)
-				log.Println("新增用户", _id)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -753,12 +749,8 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 						"password": "",
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
-						log.Println("addBaseUser start")
 						ck := &http.Cookie{}
 						usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-						log.Println("addBaseUser end")
-					} else {
-						log.Println("prefix with 9")
 					}
 				}
 			}
@@ -932,7 +924,6 @@ func createVipOrder(param *CreateOtherOrderParams, code string) (bool, string) {
 			if param.VipStartTime == "2099-01-01" || dateType == 2 {
 				isTrial = true
 			}
-			//log.Println(areaCount)
 			isOk := false
 			set := map[string]interface{}{
 				"o_vipjy.i_trial":      -1,                       //已激活试用
@@ -1047,12 +1038,10 @@ func updateVipOrder(param *CreateOtherOrderParams, code string, returnStatus int
 		d, _ := time.ParseDuration("-24h")
 		vipStartTime = vipStartTime.Add(d)
 	}
-	log.Println(vipStartTime)
 	if param.CycleUnit == 3 {
 		_endTime := vipStartTime.AddDate(0, 0, param.CycleCount)
 		t := _endTime.Format(qutil.Date_Short_Layout) + " 23:59:59"
 		endTime, _ = time.ParseInLocation(qutil.Date_Full_Layout, t, time.Local)
-		//log.Println("截止时间:", endTime)
 	} else {
 		endTime = GetDATE1(month, vipStartTime.Unix())
 	}
@@ -1235,8 +1224,6 @@ func updateVipOrder(param *CreateOtherOrderParams, code string, returnStatus int
 		}
 		insertData["buy_count"] = param.BuyCount
 
-		log.Println(insertData)
-
 		ok1 := util.JysqlDB.UpdateByTx(tx, "dataexport_order", map[string]interface{}{
 			"order_code": code,
 		}, insertData)
@@ -1433,11 +1420,9 @@ func MergeKws(userId string) {
 		o_vipjy, _ = (*data)["o_vipjy"].(map[string]interface{})
 		a_items, _ := o_vipjy["a_items"].([]interface{})
 		if a_items == nil { //首次
-			a := util.MQFW.UpdateById("user", userId, bson.M{
+			util.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()},
 			})
-			log.Println(a)
-
 		}
 	}
 }
@@ -1497,7 +1482,6 @@ func UpdateReturnInfo(param *UpdateReturnParams, orderData map[string]interface{
 			"operate_time":          qutil.NowFormat(qutil.Date_Full_Layout),
 			"state":                 1,
 		}
-		log.Println("发票状态", invoiceStatus, yishenqFlag, yikaijuFlag, weishenqFlag)
 		filterMap := qutil.ObjToMap(orderData["filter"])
 		if param.ReturnStatus == 1 {
 			(*filterMap)["isAll"] = 1
@@ -1724,8 +1708,6 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 
 	// 发票信息
 	//returninvoceRes := util.JysqlDB.SelectBySql("SELECT DISTINCT return_invoice_status from return_money_record WHERE order_code=? ", (*res)["order_code"])
-
-	//log.Println("===================",returninvoceRes)
 	(*res)["invoice"] = []map[string]interface{}{}
 	if applybill_status == 1 || applybill_status == 2 || applybill_status == 3 {
 		//2020-4-22电子发票
@@ -1807,7 +1789,6 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 		result["contractRes"] = map[string]interface{}{}
 	}
 	if returnRes != nil && len(*returnRes) != 0 {
-		log.Println(returnRes)
 		for _, d := range *returnRes {
 			if d["return_voucher_url"] != nil && len(d["return_voucher_url"].(string)) > 0 {
 				index_ := strings.LastIndex(d["return_voucher_url"].(string), "/")
@@ -1817,7 +1798,6 @@ func SupplementaryOrder(res *map[string]interface{}) map[string]interface{} {
 			}
 		}
 		result["returnRes"] = *returnRes
-		log.Println("回款信息", result)
 	} else {
 		result["returnRes"] = []map[string]interface{}{}
 	}

+ 2 - 9
src/order/smallShopTask.go

@@ -4,7 +4,6 @@ import (
 	"config"
 	"encoding/json"
 	"fmt"
-	"github.com/cron"
 	"io/ioutil"
 	"log"
 	"mongodb"
@@ -16,6 +15,8 @@ import (
 	"strings"
 	"time"
 	"util"
+
+	"github.com/cron"
 )
 
 type wxToken struct {
@@ -134,7 +135,6 @@ func OrderHandle() {
 		start_update_time = addTime.Format(qutil.Date_Full_Layout)
 	}
 	client := &http.Client{}
-	log.Println(start_update_time)
 	var jsonData = strings.NewReader(`{ "start_update_time": "` + start_update_time + `", "end_update_time": "` + time.Now().Format(qutil.Date_Full_Layout) + `", "status":"100", "page": 1, "page_size": 50, "source": 1 //选填,默认1 } `)
 	//var jsonData = strings.NewReader(`{ "start_update_time": "` + start_update_time + `", "end_update_time": "` + time.Now().Format(qutil.Date_Full_Layout) + `", "page": 1, "page_size": 50, "source": 1 //选填,默认1 } `)
 	req, err := http.NewRequest("POST", config.SysConfigs.WxxdHost+"/product/order/get_list?access_token="+token, jsonData)
@@ -156,7 +156,6 @@ func OrderHandle() {
 		log.Println(appid, "Parse access token error", err)
 	}
 	//循环处理一天数据
-	log.Println(res)
 	if res.Total_num > 0 {
 		for _, value := range res.Orders {
 			//先判断订单是否创建过
@@ -218,7 +217,6 @@ func OrderHandle() {
 							"s_regsource": "qmx_admin",
 						}
 						_id := util.MQFW.Save("user", data)
-						log.Println("新增用户", _id)
 						if _id != "" {
 							userId = _id
 							formdata := map[string]interface{}{
@@ -227,12 +225,8 @@ func OrderHandle() {
 								"password": "",
 							}
 							if !strings.HasPrefix(param.Phone, "9") {
-								log.Println("addBaseUser start")
 								ck := &http.Cookie{}
 								usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-								log.Println("addBaseUser end")
-							} else {
-								log.Println("prefix with 9")
 							}
 						}
 					}
@@ -357,7 +351,6 @@ func OrderHandle() {
 				if !InsertAudit(saveData) {
 					log.Println(value.Order_id, ":自动审核通过轨迹保存失败")
 				}
-				log.Println(value.Order_id, ":创建成功")
 			}
 		}
 	}

+ 0 - 8
src/order/suppleSalePerson.go

@@ -67,8 +67,6 @@ func SalePersonList(context *admin.Context) (interface{}, error) {
 		sqlF += " order by create_time ASC limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
 	}
 
-	log.Println(sqlC)
-	log.Println(sqlF)
 	count := util.JysqlDB.CountBySql(sqlC)
 	res := util.JysqlDB.SelectBySql(sqlF)
 	if res != nil && len(*res) > 0 {
@@ -155,7 +153,6 @@ func SalePersonAdd(context *admin.Context) (interface{}, error) {
 			"order_code":    param.OrderCode,
 			"audit_type":    1,
 		}
-		log.Println(insertData)
 		in2 := util.JysqlDB.InsertByTx(tx, "audit_records", insertData)
 		return in1 > 0 && in2 > 0
 	})
@@ -186,13 +183,11 @@ func SalePersonEdit(context *admin.Context) (interface{}, error) {
 	//先查询补录信息状态
 	data := util.JysqlDB.FindOne("supplement_sale_person", map[string]interface{}{"id": param.Id}, "state,order_code", "")
 	var state, newState int
-	log.Println(data)
 	if data != nil && len(*data) > 0 {
 		state = cm.IntAll((*data)["state"])
 	} else {
 		return nil, errors.New("参数有误,没有查到该记录")
 	}
-	log.Println("状态:", state)
 	if state == -2 {
 		newState = 1
 	} else if state == -3 {
@@ -480,7 +475,6 @@ func OrdersExamine(context *admin.Context) (interface{}, error) {
 
 			} else if productType == "大会员" {
 				filterMap := map[string]interface{}{}
-				log.Println("filter", cm.ObjToString((*order)["filter"]))
 				if err := json.Unmarshal([]byte(cm.ObjToString((*order)["filter"])), &filterMap); err != nil {
 					return nil, err
 				}
@@ -834,7 +828,6 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 
 	serverIds := cm.ObjToString(filterMap["serversId"])
 	payCycle := cm.IntAll(filterMap["cycle"])
-	log.Println(cm.ObjToString(filterMap["effective_date"]))
 	effectiveDate, _ := time.ParseInLocation("2006/01/02 15:04:05", cm.ObjToString(filterMap["effective_date"])+" 23:59:59", time.Local)
 	serverMap := GetServerPid()
 	setMap := map[string]interface{}{}
@@ -852,7 +845,6 @@ func BigMemberExtend(filterMap map[string]interface{}, userId, orderCode string,
 			return false, errors.New("更新订单信息出错")
 		}
 	}
-	log.Println("截至时间:", effectiveDate)
 	set := map[string]interface{}{
 		"$set": setMap,
 	}

+ 2 - 8
src/order/userService.go

@@ -2,14 +2,14 @@ package order
 
 import (
 	"config"
-	"go.mongodb.org/mongo-driver/bson"
-	"log"
 	"mongodb"
 	"net/http"
 	"qfw/util/usercenter"
 	"strings"
 	"time"
 	"util"
+
+	"go.mongodb.org/mongo-driver/bson"
 )
 
 // UpdateUserType 更新用户人群分类
@@ -68,7 +68,6 @@ func SaveUserInfo(phone string) (userId string) {
 		"s_regsource": "qmx_admin",
 	}
 	_id := util.MQFW.Save("user", data)
-	log.Println("新增用户", _id)
 	if _id != "" {
 		userId = _id
 		formdata := map[string]interface{}{
@@ -77,14 +76,9 @@ func SaveUserInfo(phone string) (userId string) {
 			"password": "",
 		}
 		if !strings.HasPrefix(phone, "9") {
-			log.Println("addBaseUser start")
 			ck := &http.Cookie{}
 			usercenter.AddBaseUser(*util.MQFW, config.SysConfigs.UserCenterUrl, _id, formdata, ck)
-			log.Println("addBaseUser end")
-		} else {
-			log.Println("prefix with 9")
 		}
-
 	}
 	return userId
 }

+ 0 - 2
src/public/message.go

@@ -85,10 +85,8 @@ func AllUserSendMsg(param *Message, loginUserId int, loginUserName string, msgLo
 
 	}
 	if currentCount > 0 {
-		//log.Println("最后一批用户开始发送消息:", len(userIds))
 		//调用中台接口
 		util.MultipleSaveMessage(msg, userIds, userNames)
-		log.Println("最后一批用户发送消息:完成")
 		userNames = ""
 		userIds = ""
 		currentCount = 0

+ 24 - 37
src/sales/jyPartnerController.go

@@ -5,11 +5,7 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"github.com/SKatiyar/qr"
-	"github.com/baiy/Cadmin-server-go/admin"
-	"github.com/baiy/Cadmin-server-go/system/utils"
 	"io/ioutil"
-	"log"
 	"net/http"
 	qutil "qfw/util"
 	"qfw/util/redis"
@@ -17,10 +13,13 @@ import (
 	"time"
 	"util"
 
+	"github.com/SKatiyar/qr"
+	"github.com/baiy/Cadmin-server-go/admin"
+	"github.com/baiy/Cadmin-server-go/system/utils"
 	//"github.com/baiy/Cadmin-server-go/system/utils"
 )
 
-//剑鱼伙伴列表
+// 剑鱼伙伴列表
 func PartnerList(context *admin.Context) (interface{}, error) {
 	//接收前端参数
 	data := make(map[string]interface{})
@@ -85,17 +84,15 @@ func PartnerList(context *admin.Context) (interface{}, error) {
 			sql_c += " and p.name like " + "'" + "%" + param.Keyword + "%" + "'"
 		}
 	}
-	log.Println(sql_c)
 	count := util.JysqlDB.CountBySql(sql_c)
 	sql += " order by p.createtime desc limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	data["total"] = count
 	return data, nil
 }
 
-//剑鱼伙伴详情
+// 剑鱼伙伴详情
 func PartnerInfo(context *admin.Context) (interface{}, error) {
 	//data := make(map[string]interface{})
 	param := new(struct {
@@ -126,7 +123,7 @@ func PartnerInfo(context *admin.Context) (interface{}, error) {
 
 }
 
-//概览 四大分类订单销售统计
+// 概览 四大分类订单销售统计
 func Overview(context *admin.Context) (interface{}, error) {
 	//不需要参数
 	param := new(struct {
@@ -145,7 +142,7 @@ func Overview(context *admin.Context) (interface{}, error) {
 	}
 }
 
-//佣金列表
+// 佣金列表
 func CommissionList(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	//接收参数
@@ -224,7 +221,6 @@ func CommissionList(context *admin.Context) (interface{}, error) {
 		sql += " order by s.createtime desc limit " + fmt.Sprint(param.Page.Offset) + "," + fmt.Sprint(param.Page.PageSize)
 
 	}
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 	data["total"] = count
 	if param.Export {
@@ -236,7 +232,7 @@ func CommissionList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//提现列表
+// 提现列表
 func WithdrawList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		utils.Page
@@ -275,7 +271,6 @@ 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)
-	log.Println(sql)
 	count := util.JysqlDB.CountBySql(str)
 	res := util.JysqlDB.SelectBySql(sql)
 	data := make(map[string]interface{})
@@ -285,7 +280,7 @@ func WithdrawList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//提现详情
+// 提现详情
 func WithdrawDetail(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Id   int    `form:"id"`
@@ -302,7 +297,6 @@ func WithdrawDetail(context *admin.Context) (interface{}, error) {
 		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 = ? "
-		log.Println("sql", sql)
 		res := util.JysqlDB.SelectBySql(sql, param.Id)
 		if len(*res) != 0 {
 			return (*res)[0], nil
@@ -311,7 +305,7 @@ func WithdrawDetail(context *admin.Context) (interface{}, error) {
 	return nil, nil
 }
 
-//结算列表
+// 结算列表
 func SettleList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		utils.Page
@@ -353,7 +347,6 @@ func SettleList(context *admin.Context) (interface{}, error) {
 	}
 
 	sql += " order by c.createtime desc limit " + fmt.Sprint(param.Page.Offset) + "," + fmt.Sprint(param.Page.PageSize)
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 	count := util.JysqlDB.CountBySql(str)
 	data := map[string]interface{}{}
@@ -365,7 +358,7 @@ func SettleList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//结算详情 // 接口文档没写
+// 结算详情 // 接口文档没写
 func SettleDetails(context *admin.Context) (interface{}, error) {
 
 	param := new(struct {
@@ -384,7 +377,7 @@ func SettleDetails(context *admin.Context) (interface{}, error) {
 	return nil, nil
 }
 
-//提现列表中--批量完成
+// 提现列表中--批量完成
 func BatchFinish(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Ids string `form:"ids"`
@@ -394,7 +387,6 @@ func BatchFinish(context *admin.Context) (interface{}, error) {
 		return nil, err
 	}
 	sql := "update " + DisCashout + " set cashout_status = 1 where id in (" + param.Ids + ")"
-	log.Println(sql)
 	i := util.JysqlDB.UpdateOrDeleteBySql(sql)
 	if i > -1 {
 		return true, nil
@@ -427,7 +419,6 @@ func Finished(context *admin.Context) (interface{}, error) {
 	if sqlW != "" {
 		sql += sqlW
 	}
-	log.Println(sql)
 	i := util.JysqlDB.UpdateOrDeleteBySql(sql)
 	if i > -1 {
 		return true, nil
@@ -435,7 +426,7 @@ func Finished(context *admin.Context) (interface{}, error) {
 	return false, nil
 }
 
-//提现列表 -- 导出结果
+// 提现列表 -- 导出结果
 func ExportResults(context *admin.Context) (interface{}, error) {
 
 	param := new(struct {
@@ -471,7 +462,6 @@ func ExportResults(context *admin.Context) (interface{}, error) {
 	}
 
 	sql += " order by c.createtime desc "
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 
 	if len(*res) > 0 {
@@ -481,7 +471,7 @@ func ExportResults(context *admin.Context) (interface{}, error) {
 	return nil, nil
 }
 
-//资金明细
+// 资金明细
 func CapitalDetails(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		Uid string `form:"uid"`
@@ -518,7 +508,7 @@ func CapitalDetails(context *admin.Context) (interface{}, error) {
 	return resArr, nil
 }
 
-//企业审核列表
+// 企业审核列表
 func ExamineList(context *admin.Context) (interface{}, error) {
 	//接收前端参数
 	data := make(map[string]interface{})
@@ -543,17 +533,15 @@ func ExamineList(context *admin.Context) (interface{}, error) {
 			sql_c += " and p.name like " + "'" + "%" + param.Search + "%" + "'"
 		}
 	}
-	log.Println(sql_c)
 	count := util.JysqlDB.CountBySql(sql_c)
 	sql += " order by p.createtime desc limit " + fmt.Sprint(param.Page.Offset) + " " + "," + " " + fmt.Sprint(param.Page.PageSize)
-	log.Println(sql)
 	res := util.JysqlDB.SelectBySql(sql)
 	data["lists"] = res
 	data["total"] = count
 	return data, nil
 }
 
-//审核操作
+// 审核操作
 func PartnerExamine(context *admin.Context) (interface{}, error) {
 	//前台参数
 	param := new(struct {
@@ -567,7 +555,7 @@ func PartnerExamine(context *admin.Context) (interface{}, error) {
 	}
 	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")})
-		if (param.Adopt == 1) {
+		if param.Adopt == 1 {
 			AddCommodity(param.Id)
 		}
 		if ok {
@@ -586,7 +574,7 @@ type Commodity struct {
 	}
 }
 
-//新增商品管理
+// 新增商品管理
 func AddCommodity(partnerId int) {
 	//获取所有商品
 	req, _ := http.NewRequest("GET", config.SysConfigs.Domain+"/jyMarketing/activity/findCommodityFirst", nil)
@@ -637,7 +625,7 @@ func AddCommodity(partnerId int) {
 	}
 }
 
-//企业列表
+// 企业列表
 func EnterpriseList(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	data["status"] = 0
@@ -648,7 +636,7 @@ func EnterpriseList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//商品列表
+// 商品列表
 func CommodityList(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	data["status"] = 0
@@ -663,7 +651,6 @@ func CommodityList(context *admin.Context) (interface{}, error) {
 	commodityList := util.JysqlDB.Find("dis_commodity", map[string]interface{}{"partnerId": param.PartnerId}, "commodity,link,commodityCode,id,disWord", "", -1, -1)
 	for key, val := range *commodityList {
 		disWord := qutil.ObjToString(val["disWord"])
-		log.Println(disWord)
 		if disWord[:1] == "A" {
 			(*commodityList)[key]["link"] = config.SysConfigs.Webdomain + "/weixin/frontPage/vipIntro/free/party?" + fmt.Sprint((*commodityList)[key]["disWord"]) + "_1"
 		} else if disWord[:1] == "E" {
@@ -678,7 +665,7 @@ func CommodityList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//商品详情
+// 商品详情
 func CommodityDetails(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	data["status"] = 0
@@ -712,14 +699,14 @@ func CommodityDetails(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//获取二维码图片
-func DownloadJyAppQrOther(url string) (string) {
+// 获取二维码图片
+func DownloadJyAppQrOther(url string) string {
 	r, _ := qr.Encode(url, qr.M)
 	pngdat := r.PNG()
 	return base64.StdEncoding.EncodeToString(pngdat)
 }
 
-//海报图片上传
+// 海报图片上传
 func ImgUpload(context *admin.Context) (interface{}, error) {
 	data := make(map[string]interface{})
 	data["status"] = 0

+ 4 - 8
src/sales/jyPartnerService.go

@@ -3,7 +3,6 @@ package sales
 import (
 	"config"
 	"fmt"
-	"github.com/xuri/excelize"
 	"log"
 	"os"
 	qutil "qfw/util"
@@ -12,6 +11,8 @@ import (
 	"time"
 	"util"
 
+	"github.com/xuri/excelize"
+
 	"github.com/tealeg/xlsx"
 )
 
@@ -35,8 +36,6 @@ func FindOnePartner(uid string, id int) (res map[string]interface{}) {
 	//查询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)
-	//log.Println("伙伴信息:", data)
-	//log.Println("头像:", head)
 	if len(*data) != 0 && head != nil {
 		res = (*data)[0]
 		if qutil.ObjToString((*head)["s_avatar"]) != "" {
@@ -207,7 +206,6 @@ func Excel(downloadType string, tp string, data *[]map[string]interface{}) strin
 		log.Println("xls error", fname)
 		return ""
 	}
-	//log.Println(config.SysConfigs.Domain+ dirs + fname)
 	return qutil.ObjToString(config.SysConfigs.Domain) + dirs + fname
 }
 
@@ -216,7 +214,6 @@ func PathExists(path string) bool {
 	if err == nil {
 		return true
 	}
-	log.Println("err", err)
 	if os.IsNotExist(err) {
 		return false
 	}
@@ -227,11 +224,10 @@ func StringTran(s string) string {
 	v, _ := strconv.ParseFloat(s, 64)
 	vs := v * 100
 	str := strconv.FormatFloat(vs, 'E', -1, 64)
-	log.Println("str", vs)
 	return str
 }
 
-//佣金导出
+// 佣金导出
 func ParentDownload(rdata *[]map[string]interface{}) string {
 	data := []map[int]interface{}{}
 	//序号
@@ -319,7 +315,7 @@ func Div(Num int) string {
 				temp = append(temp, k)
 			}
 			Num = (Num - k) / 26 //减去Num最后一位数的值,因为已经记录在temp中
-			if Num <= 26 { //小于等于26直接进行匹配,不需要进行数据拆分
+			if Num <= 26 {       //小于等于26直接进行匹配,不需要进行数据拆分
 				temp = append(temp, Num)
 				break
 			}

+ 0 - 17
src/task/task2.go

@@ -27,7 +27,6 @@ func InitTask() {
 	// 获取未执行的消息
 	tim := time.Now().Format(qutil.Date_Full_Layout)
 	msg := util.JysqlDB.SelectBySql("select * from message_send_log where send_status = 1 and send_time >= ? and isdel = 1", tim)
-	log.Println(msg)
 	if msg != nil {
 		for _, val := range *msg {
 			now := time.Now()
@@ -37,13 +36,11 @@ func InitTask() {
 			util.OnTimeSendMap.Store(key+sendTime, true)
 			sendTime2, _ := time.ParseInLocation(qutil.Date_Full_Layout, sendTime, now.Location())
 			execTime := sendTime2.Unix() - now.Unix()
-			log.Println(execTime, sendTime, now.Format(qutil.Date_Full_Layout), sendTime2.Unix(), now.Unix())
 			links := strings.Split(qutil.ObjToString(val["link"]), ",")
 			androidUrl := links[1]
 			iosUrl := links[2]
 			time.AfterFunc(time.Duration(execTime)*time.Second, func() {
 				// 执行任务
-				//log.Println(msgId, sendTime)
 				if qutil.IntAll(val["sign"]) == 1 {
 					CustomTask(msgId, sendTime, androidUrl, iosUrl)
 				} else {
@@ -103,7 +100,6 @@ func CustomTask(msgId int, sendTime, androidUrl, iosUrl string) {
 	}
 	// 更新消息为发送中
 	ok1 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": 2})
-	//log.Println("发送钱更新消息发送状态为发送中:", ok1)
 	if ok1 {
 		// 执行发送
 		code, err := CustomTaskSaveMsg(msgId, msg, androidUrl, iosUrl)
@@ -154,7 +150,6 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 		if err != nil {
 			log.Println("迭代数据出错", err)
 		}
-		//log.Println("单条数据:", user.UserId)
 		userId := user.UserId
 		if config.SysConfigs.UserIdMap[userId] != "" {
 			userId = config.SysConfigs.UserIdMap[userId]
@@ -212,24 +207,19 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 		if appVersion > "3.0.3" {
 			go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 		}
-		log.Println("用户数量:", i)
 		if i >= 100 {
 			//调用中台接口
-			log.Println("定时发送中100个用户开始发送消息")
 			util.MultipleSaveMessage(msg1, userIds, userNames)
 			userNames = ""
 			userIds = ""
 			i = 0
-			log.Println("定时发送中100个用户发送消息完成")
 		}
 	}
 	if i > 0 {
 		//调用中台接口
-		log.Println("定时发送中最后一批用户开始发送消息")
 		util.MultipleSaveMessage(msg1, userIds, userNames)
 		userNames = ""
 		userIds = ""
-		log.Println("定时发送中最后一批用户发送消息完成")
 	}
 	log.Println("定时任务,获取分组及分组下用户耗时:", time.Since(st))
 	sendStatus := 4
@@ -239,7 +229,6 @@ func TaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUrl stri
 	//更新消息发送状态
 	ok2 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": sendStatus})
 	if ok2 {
-		log.Println("消息id:", msg, "发送消息成功")
 		return 1, nil
 	} else {
 		log.Println("消息id:", msg, "发送消息失败")
@@ -335,24 +324,19 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUr
 			if appVersion > "3.0.3" {
 				go util.AppGrpcPush(dt, otherPushId, jgPushId, phoneType, appPushUrl)
 			}
-			log.Println("用户数量:", i)
 			if i >= 100 {
 				//调用中台接口
-				log.Println("定时发送中100个用户开始发送消息")
 				util.MultipleSaveMessage(msg1, userIds, userNames)
 				userNames = ""
 				userIds = ""
 				i = 0
-				log.Println("定时发送中100个用户发送消息完成")
 			}
 		}
 		if i > 0 {
 			//调用中台接口
-			log.Println("定时发送中最后一批用户开始发送消息")
 			util.MultipleSaveMessage(msg1, userIds, userNames)
 			userNames = ""
 			userIds = ""
-			log.Println("定时发送中最后一批用户发送消息完成")
 		}
 		log.Println("定时任务,获取分组及分组下用户耗时:", time.Since(st))
 	}
@@ -364,7 +348,6 @@ func CustomTaskSaveMsg(msgId int, msg *map[string]interface{}, androidUrl, iosUr
 	//更新消息发送状态
 	ok2 := util.JysqlDB.Update("message_send_log", map[string]interface{}{"id": msgId}, map[string]interface{}{"send_status": sendStatus})
 	if ok2 {
-		log.Println("消息id:", msg, "发送消息成功")
 		return 1, nil
 	} else {
 		log.Println("消息id:", msg, "发送消息失败")

+ 3 - 7
src/users/organizationAudit.go

@@ -5,13 +5,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/baiy/Cadmin-server-go/admin"
-	"github.com/baiy/Cadmin-server-go/system/utils"
 	"log"
 	"mongodb"
 	util2 "qfw/util"
 	"time"
 	"util"
+
+	"github.com/baiy/Cadmin-server-go/admin"
+	"github.com/baiy/Cadmin-server-go/system/utils"
 )
 
 var requests = util.Requests{}
@@ -68,7 +69,6 @@ func OrganizationList(context *admin.Context) (interface{}, error) {
 		"regPhone":      param.RegPhone,
 		"authPhone":     param.AuthPhone,
 	}
-	log.Println(sendParam)
 	// 序列化数据
 	marshalData, err := json.Marshal(sendParam)
 	if err != nil {
@@ -76,7 +76,6 @@ func OrganizationList(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("序列化失败")
 	}
 	resMap, err2 := requests.PostByJson(reqUrl, marshalData, nil)
-	log.Println(resMap)
 	if err2 != nil || util2.IntAll(resMap["error_code"]) != 0 {
 		log.Println("调用审核列表接口失败", resMap)
 		return nil, errors.New("调用审核列表接口失败")
@@ -134,7 +133,6 @@ func OrganizationAudit(context *admin.Context) (interface{}, error) {
 		return nil, errors.New("调用审核接口失败")
 	}
 	resMap, err2 := requests.PostByJson(reqUrl, marshalData, nil)
-	//log.Println(err2)
 	if err2 != nil || util2.IntAll(resMap["error_code"]) != 0 {
 		log.Println("调用机构审核-审核接口失败", resMap)
 		return nil, errors.New("调用审核接口失败")
@@ -386,9 +384,7 @@ func OrganizationEditFrozen(context *admin.Context) (interface{}, error) {
 		if err4 != nil {
 			return nil, err
 		}
-		log.Println("请求信息中台参数:", sendParam2)
 		resMap2, err3 := requests.PostByJson(reqUrl2, bytes, nil)
-		log.Println("调用信息中台接口结果", resMap2)
 		if err3 != nil || util2.IntAll(resMap2["error_code"]) != 0 {
 			log.Println("调用信息中台接口失败")
 			// 0 成功 1 失败

+ 3 - 12
src/users/userManage.go

@@ -26,7 +26,7 @@ import (
 
 var fields = `{"_id":1,"s_phone":1,"s_m_phone":1,"s_company":1,"s_nickname":1,"s_myemail":1,"l_registedate":1,"s_rsource":1,"s_province":1,"s_userId":1,"l_mergeData":1,"s_merged_id":1,"l_mergeDate":1,"s_save_userId":1,"i_user_type":1}`
 
-//用户列表
+// 用户列表
 func UserList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		utils.Page
@@ -223,11 +223,9 @@ func UserList(context *admin.Context) (interface{}, error) {
 			}
 		}
 		str += " limit " + fmt.Sprint(param.Offset) + "," + fmt.Sprint(param.PageSize)
-		log.Println("sql ", "select e.user_id"+str)
 		cstr = "select count(1) from (select e.user_id" + str + ") as a"
 		// cstr = strings.ReplaceAll(cstr, "group by e.user_id", "")
 		cstr = strings.ReplaceAll(cstr, " limit "+fmt.Sprint(param.Offset)+","+fmt.Sprint(param.PageSize), "")
-		log.Println("sqlc ", cstr)
 		userDataCounts := JysqlDB.CountBySql(cstr)
 		if userDataCounts > 0 {
 			str = "select e.user_id" + str
@@ -235,7 +233,6 @@ func UserList(context *admin.Context) (interface{}, error) {
 			userDataCount = userDataCounts
 		}
 	}
-	log.Println("userDataCount ", userDataCount)
 	userIdMap := map[string]bool{}
 	if res != nil && *res != nil {
 		for _, v := range *res {
@@ -290,7 +287,7 @@ func UserList(context *admin.Context) (interface{}, error) {
 	}, nil
 }
 
-//用户详情
+// 用户详情
 func UserDetail(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		UserId string `form:"userId"` //用户id
@@ -357,7 +354,6 @@ func GetOrderData(id string) map[string]interface{} {
 		if orders == "大会员-补充包" {
 			sql = `select product_type,order_money,pay_money,pay_time from dataexport_order where user_id = "` + id + `" and (product_type = "大会员-补充包" or product_type = "大会员-AI中标预测包" or product_type = "大会员-招标文件解读") and pay_money > 0 order by pay_time desc`
 		}
-		log.Println("sql", sql)
 		res := JysqlDB.SelectBySql(sql)
 		firstPayTime, lastPayTime, allMoney := "", "", 0
 		if len(*res) > 0 {
@@ -499,7 +495,6 @@ func SubAdd(context *admin.Context) (interface{}, error) {
 					},
 				}
 				_id := MQFW.Save("user", data)
-				log.Println("新增用户", _id)
 				if _id != "" {
 					userId = _id
 					formdata := map[string]interface{}{
@@ -508,12 +503,8 @@ func SubAdd(context *admin.Context) (interface{}, error) {
 						"password": "",
 					}
 					if !strings.HasPrefix(param.Phone, "9") {
-						log.Println("addBaseUser start")
 						ck := &http.Cookie{}
 						usercenter.AddBaseUser(*MQFW, SysConfigs.UserCenterUrl, _id, formdata, ck)
-						log.Println("addBaseUser end")
-					} else {
-						log.Println("prefix with 9")
 					}
 				}
 			}
@@ -737,7 +728,7 @@ func UserOrderList(context *admin.Context) (interface{}, error) {
 	return data, nil
 }
 
-//用户列表
+// 用户列表
 func MergeUserList(context *admin.Context) (interface{}, error) {
 	param := new(struct {
 		utils.Page

+ 0 - 4
src/util/common.go

@@ -177,13 +177,10 @@ func MultipleSaveMessage(msg map[string]interface{}, userIds, userNames string)
 		log.Println("调用批量保存消息接口出错:", err)
 		return
 	}
-	log.Println("调用中台api返回结果", res)
 	defer res.Body.Close()
 	body, err := ioutil.ReadAll(res.Body)
-	//log.Println("body", string(body))
 	var dat map[string]interface{}
 	err = json.Unmarshal(body, &dat)
-	log.Println("结果:", dat, msg)
 	if err != nil {
 		log.Println("结果:", err, msg)
 	}
@@ -271,7 +268,6 @@ func AppGrpcPush(pushData map[string]interface{}, otherPushId, jgPushId, phoneTy
 		"redDot":      "",                        //在哪个底部菜单显示小红点,空值则不显示小红点,search:搜索 subscribe:订阅 box:百宝箱 me:我的
 	}
 	b, _ := json.Marshal(push)
-	log.Println("推送用户信息:", push)
 	err = client.Call("Rpc.Push", b, &repl)
 	if err != nil {
 		log.Println(err.Error())

+ 3 - 4
src/util/random.go

@@ -43,7 +43,7 @@ func init() {
 	}
 }
 
-//获取随机字符串
+// 获取随机字符串
 func (this *LSCPool) GetRandom() string {
 	this.Lock.Lock()
 	defer this.Lock.Unlock()
@@ -58,13 +58,12 @@ func (this *LSCPool) GetRandom() string {
 		if ok {
 			continue
 		}
-		// log.Println("获取口令:", LSC)
 		return LSC
 	}
 	return ""
 }
 
-//字母随机串
+// 字母随机串
 func (this *LSCPool) LetterRandom(LL int) (LR string) {
 	bytes := make([]byte, LL)
 	for i := 0; i < LL; i++ {
@@ -75,7 +74,7 @@ func (this *LSCPool) LetterRandom(LL int) (LR string) {
 	return
 }
 
-//特殊字符随机串
+// 特殊字符随机串
 func (this *LSCPool) SpecialChar(LL int) (SC string) {
 	var str = "$#"
 	b := bytes.NewBufferString(str)

+ 0 - 5
src/util/requests.go

@@ -16,7 +16,6 @@ type Requests struct {
 // PostByJson  以json格式发送请求
 func (r *Requests) PostByJson(reqUrl string, data []byte, header map[string]string) (rs map[string]interface{}, err error) {
 	reqData := bytes.NewBuffer(data)
-	log.Println("请求参数", reqData)
 	method := "POST"
 	client := &http.Client{}
 	req, err2 := http.NewRequest(method, reqUrl, reqData)
@@ -30,13 +29,10 @@ func (r *Requests) PostByJson(reqUrl string, data []byte, header map[string]stri
 
 		}
 	}
-	log.Printf("请求url:%v", reqUrl)
-	log.Printf("请求header:%v", header)
 	res, err3 := client.Do(req)
 	if err3 != nil {
 		log.Println(err3)
 	}
-	log.Printf("err:%v,结果:%v", err3, res)
 	defer func(Body io.ReadCloser) {
 		err6 := Body.Close()
 		if err6 != nil {
@@ -58,6 +54,5 @@ func (r *Requests) PostByJson(reqUrl string, data []byte, header map[string]stri
 		log.Println("反序列化数据失败", err5)
 		return map[string]interface{}{}, errors.New("反序列化数据失败")
 	}
-	log.Println("结果:", rs)
 	return rs, nil
 }

+ 4 - 8
src/util/uploadfile.go

@@ -4,7 +4,6 @@ import (
 	"config"
 	"encoding/json"
 	"errors"
-	"github.com/tealeg/xlsx"
 	"io"
 	"log"
 	"net/http"
@@ -14,12 +13,14 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/tealeg/xlsx"
 )
 
 var FileType = strings.Split("gif,jpg,jpeg,png,pdf,docx,doc,zip,rar", ",")
 var FileSize = int64(10 * (1 << 20)) //10兆
 
-//对上传文件的处理,如果存在resize参数,刚剪裁图片
+// 对上传文件的处理,如果存在resize参数,刚剪裁图片
 func Upload(w http.ResponseWriter, r *http.Request) error {
 	fileTypeArray := FileType
 	res := map[string]interface{}{}
@@ -28,7 +29,6 @@ func Upload(w http.ResponseWriter, r *http.Request) error {
 	res["msg"] = "上传失败"
 	res["filename"] = ""
 	filetype := r.FormValue("type")
-	log.Println("-", filetype)
 
 	file, FileHeader, _ := r.FormFile(filetype)
 	str := strings.Split(FileHeader.Filename, ".")
@@ -61,9 +61,7 @@ func Upload(w http.ResponseWriter, r *http.Request) error {
 				res["error"] = 0
 				res["msg"] = "ssss"
 				// filePath := strings.Replace(temp, "./web/static", "", 1)
-				log.Println("temp", temp)
 				filePath := "/shareFile/" + strings.Replace(temp, config.SysConfigs.UploadPath, "", 1)
-				log.Println("filePath", filePath)
 				res["url"] = filePath
 				resize := r.FormValue("resize")
 				//查询图片是否可以需要压缩 width>1920 或 height>1080
@@ -107,7 +105,6 @@ func Upload(w http.ResponseWriter, r *http.Request) error {
 	w.Header().Set("content-type", "text/plain")
 	v, _ := json.Marshal(&res)
 	w.Write([]byte(string(v)))
-	log.Println("~~~~~~~~~", string(v))
 	return nil
 }
 
@@ -118,7 +115,7 @@ type Stat interface {
 	Stat() (os.FileInfo, error)
 }
 
-//获取文件路径、名称
+// 获取文件路径、名称
 func Getfilepath(str, filetype string) (s string) {
 	var strs = time.Now().Format("20060102150405001")
 	var name = strs + util.GetComplexRandom(8, 0, 0) + "." + str
@@ -177,7 +174,6 @@ func PathExists(path string) bool {
 	if err == nil {
 		return true
 	}
-	log.Println("err", err)
 	if os.IsNotExist(err) {
 		return false
 	}