Merge branch 'dev1.0.0' of https://app.yhyue.com/moapp/jyInfo into dev1.0.0

rpc/consumer/internal/logic/infofileuploadlogic.go

@@ -42,8 +42,8 @@ func (l *InfoFileUploadLogic) InfoFileUpload(in *consumerclient.InfoFileUploadRe
 		var data consumerclient.InfoFileUploadData
 		data.Filename = in.FileName
 		data.Size = fileSize
-		data.Fid = key
-		data.Ossurl = IC.C.Oss.OssUrl
+		//data.Fid = key
+		//data.Ossurl = IC.C.Oss.OssUrl
 		ftypes := strings.Split(in.FileName, ".")
 		var ftype string
 		if len(ftypes) > 0 && len(ftypes) == 2 {

rpc/manager/internal/logic/infoexaminelogic.go

@@ -1,8 +1,6 @@
 package logic
 
 import (
-	jycommon "app.yhyue.com/moapp/jyInfo/rpc/manager/common"
-	IC "app.yhyue.com/moapp/jyInfo/rpc/manager/init"
 	md "app.yhyue.com/moapp/jyInfo/rpc/model"
 	model "app.yhyue.com/moapp/jyInfo/rpc/model/es"
 	"app.yhyue.com/moapp/jyInfo/rpc/util"
@@ -39,44 +37,28 @@ func NewInfoExamineLogic(ctx context.Context, svcCtx *svc.ServiceContext) *InfoE
 func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.InfoExamineResp, error) {
 	// todo: add your logic here and delete this line
 	var resp manager.InfoExamineResp
+	query := make(map[string]interface{})
+	upData := make(map[string]interface{})
+
 	msgId := se.SE.DecodeString(in.MsgId) //信息id解密
 	log.Println("信息审核参数：", in)
 	switch in.ReviewStatus {
 	case 3:
-		query := make(map[string]interface{})
 		query["id"] = msgId
 		query["app_id"] = in.AppId
-		upData := make(map[string]interface{})
 		upData["status"] = -2
 		upData["review_desc"] = in.ReviewDetail
 		upData["review_name"] = in.ReviewName
 		upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
 		if in.MsgType == 1 || in.MsgType == 2 {
-			var info jycommon.Information
-			db := IC.DB.Where(query).First(&info).Update(upData)
-			if db.Error != nil {
+			if !md.Mysql.Update("information", query, upData) {
 				resp.ErrCode = -1
 				resp.ErrMsg = "审核不通过，更新数据失败"
 			}
 		} else if in.MsgType == 3 {
-			var info jycommon.SupplyInfo
-			db := IC.DB.Where(query).First(&info)
-			if db.Error != nil {
-				log.Println(db.Error.Error())
+			if !md.Mysql.Update("supply_info", query, upData) {
 				resp.ErrCode = -1
-				resp.ErrMsg = "审核不通过，供应信息数据查询失败"
-			} else {
-				//TODO 释放供应信息点数
-				//if err := ResourcePowerRelease(md.ResourceCenterRpc, common.Int64All(info.EntId), common.Int64All(info.UserId), md.FuncCode, common.InterfaceToStr(info.AppId)); err != nil {
-				//	resp.ErrCode = -1
-				//	resp.ErrMsg = err.Error()
-				//	break
-				//}
-				if db.Update(upData).Error != nil {
-					log.Println(db.Error.Error())
-					resp.ErrCode = -1
-					resp.ErrMsg = "审核不通过，供应信息更新失败"
-				}
+				resp.ErrMsg = "审核不通过，更新数据失败"
 			}
 		} else {
 			resp.ErrCode = -1
@@ -84,65 +66,58 @@ func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.Inf
 		}
 
 	case 2:
-		query := make(map[string]interface{})
 		query["id"] = msgId
 		query["app_id"] = in.AppId
-
-		upData := make(map[string]interface{})
 		upData["review_name"] = in.ReviewName
 		upData["review_desc"] = in.ReviewDetail
 		upData["status"] = 4
 		upData["review_time"] = time.Now().Format("2006-01-02 15:04:05")
 		if in.MsgType == 1 || in.MsgType == 2 {
-			var info jycommon.Information
-			db := IC.DB.Where(query).First(&info)
-			if db.Error != nil {
-				log.Println(db.Error)
+			data := md.Mysql.FindOne("information", query, "", "")
+			if data == nil || len(*data) < 1 {
 				resp.ErrCode = -1
 				resp.ErrMsg = "人工审核通过，获取信息失败"
 				break
 			} else {
 				//nsq发布信息
-				appInfo := common.StructToMapMore(info)
-				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, msgId, "2", common.InterfaceToStr(info.Type), false, appInfo)
+				nsq, err := util.NewNsqInfo(md.NsqConfig.Ip, md.NsqConfig.Topic, msgId, "2", common.InterfaceToStr(in.MsgType), false, *data)
 				if err != nil || nsq.NsqPushInfo() != nil {
 					resp.ErrCode = -1
 					resp.ErrMsg = "人工审核通过，调用nsq失败"
 					break
 				}
-				if db.Update(upData).Error != nil {
+
+				if !md.Mysql.Update("information", query, upData) {
 					resp.ErrCode = -1
 					resp.ErrMsg = "人工审核通过，nsq发布成功，更新信息失败"
 				}
 			}
 		} else if in.MsgType == 3 {
-			var info jycommon.SupplyInfo
-			db := IC.DB.Where(query).First(&info)
-			if db.Error != nil {
-				log.Println(db.Error)
+			data := md.Mysql.FindOne("supply_info", query, "", "")
+			if data == nil || len(*data) < 1 {
 				resp.ErrCode = -1
-				resp.ErrMsg = "人工审核通过，获取供应信息数据失败"
+				resp.ErrMsg = "人工审核通过，获取信息失败"
+				break
 			} else {
 				// 供应信息生成索引
 				upData["publish_time"] = time.Now().Format("2006-01-02 15:04:05")
 				upData["published"] = 2
-				entNameKye := fmt.Sprintf("userEntName_%s_%s_%d", info.UserId, in.MsgId, in.MsgType)
+				entNameKye := fmt.Sprintf("userEntName_%s_%s_%d", common.InterfaceToStr((*data)["user_id"]), in.MsgId, in.MsgType)
 				entName := redis.GetStr("other", entNameKye)
 				supInfo := make(map[string]interface{})
-				supInfo["id"] = info.Id
-				supInfo["title"] = info.Title
-				supInfo["detail"] = info.Detail
-				supInfo["province"] = info.Province
-				supInfo["city"] = info.City
+				supInfo["id"] = (*data)["id"]
+				supInfo["title"] = (*data)["title"]
+				supInfo["detail"] = (*data)["detail"]
+				supInfo["province"] = (*data)["province"]
+				supInfo["city"] = (*data)["city"]
 				if !model.SaveSupplyInfo(entName, supInfo) {
 					resp.ErrCode = -1
 					resp.ErrMsg = "人工审核通过，信息发布调用失败"
 					break
 				}
-				if db.Update(upData).Error != nil {
-					log.Println(db.Error)
+				if !md.Mysql.Update("supply_info", query, upData) {
 					resp.ErrCode = -1
-					resp.ErrMsg = "人工审核通过，供应信息发布调用成功，更新信息状态失败"
+					resp.ErrMsg = "人工审核通过，nsq发布成功，更新信息失败"
 				}
 			}
 		} else {
@@ -153,5 +128,9 @@ func (l *InfoExamineLogic) InfoExamine(in *manager.InfoExamineReq) (*manager.Inf
 		resp.ErrCode = -1
 		resp.ErrMsg = "审批状态有误"
 	}
+	if resp.ErrCode == -1 {
+		log.Println("审核错误：ErrMsg=", resp.ErrMsg, query, upData)
+	}
+
 	return &resp, nil
 }