fix:回退

rpc/consumer/consumer.proto

@@ -7,7 +7,7 @@ option go_package = "./consumer";
 //信息发布Req
 message PublishInfoReq {
 	string title = 1;//信息标题最长50
-	string msgType = 2;//信息类型1:招标信息 2:采购信息 3:供应信息
+	int64 msgType = 2;//信息类型1:招标信息 2:采购信息 3:供应信息
 	string relatedId =3;//关联公告id
 	string code = 4;//项目编码
 	string province = 5;//省份
@@ -23,6 +23,7 @@ message PublishInfoReq {
 	string userId = 14;//用户id
 	string appId = 15;//剑鱼标识 默认10000
 	string entId = 16;//剑鱼标识 默认10000
+
 	Contact contact = 17;
 	string deadline = 18;//信息有效期
 	string phone = 19;//信息有效期
@@ -37,7 +38,7 @@ message Contact {//联系方式
 
 //信息发布Resp
 message PublishInfoResp {
-  	int64 err_code = 1;
+	int64 err_code = 1;
 	string err_msg = 2;
 	PublishId PublishId = 3;
 }
@@ -51,7 +52,7 @@ message UserIdReq{
 	string userId = 1;//用户id
 	string appId = 2;//剑鱼标识 默认10000
 	string match  = 3;
-	int64 msqType  = 4;
+	int64 msgType  = 4;
 }
 //用户已发布信息数量Resp
 message InfoByUserIdResp{
@@ -67,7 +68,7 @@ message InfoByUserIdData {
 
 //关联公告Resp
 message InfoRelatedResp{
-  	int64 err_code = 1;
+	int64 err_code = 1;
 	string err_msg = 2;
 	repeated InfoData data = 3; 
 }
@@ -82,7 +83,7 @@ message InfoData {
 message MyPublishListReq{
 	string userId = 1;//用户id
 	string match = 2;//检索内容
-	string msgType = 3;//信息类型 1:招标信息 2:采购信息 3:供应信息
+	int64 msgType = 3;//信息类型 1:招标信息 2:采购信息 3:供应信息
 	int64 reviewStatus = 4;//审核状态 1:待审核｜2:审核通过｜3:审核不通过
 	int64 pageSize = 5;//每页数据量，默认10
 	int64 pageIndex = 6;//页码；默认第一页
@@ -91,9 +92,9 @@ message MyPublishListReq{
 
 //我的发布列表Resp
 message MyPublishListResp{
-  	int64 err_code = 1;
+	int64 err_code = 1;
 	string err_msg = 2;
-		MyPublishListData results = 3;
+	MyPublishListData results = 3;
 }
 
 message MyPublishListData{
@@ -109,7 +110,7 @@ message ListResp{
 	string title = 1;//标题
 	string id = 2;//信息id
 	int64 reviewStatus = 3;//审核状态 1:待审核｜2:审核通过｜3:审核不通过
-	string msgType = 4;//信息类型 1:招标信息 2:采购信息 3:供应信息
+	int64 msgType = 4;//信息类型 1:招标信息 2:采购信息 3:供应信息
 	string createTime =5;//审核时间
 }
 
@@ -119,7 +120,7 @@ message InfoDetailReq{
 	string msgId = 2;//信息id
 	int64 type = 3;//处理信息类型:0:获取发布信息详情（默认）；1：删除发布的信息；2：更新发布信息
 	string appId = 4;//剑鱼标识 默认10000
-	string msgType = 5;//信息类型 1:招标信息 2:采购信息 3:供应信息
+	int64 msgType = 5;//信息类型 1:招标信息 2:采购信息 3:供应信息
 }
 
 //发布的信息详情Resp
@@ -130,7 +131,7 @@ message InfoDetailResp{
 }
 
 message InfoDetailData {
-	string msgType = 1;//信息类型
+	int64 msgType = 1;//信息类型
 	string code = 2;//项目代码
 	string province = 3;//省份
 	string city = 4;//城市
@@ -184,7 +185,7 @@ message InfoChangeData {
 //信息发布Req
 message PublishInfoData {
 	string title = 1;//信息标题最长50
-	string msgType = 2;//信息类型1:招标信息 2:采购信息 3:供应信息
+	int64 msgType = 2;//信息类型1:招标信息 2:采购信息 3:供应信息
 	string relatedId =3;//关联公告id
 	string code = 4;//项目编码
 	string province = 5;//省份

rpc/consumer/internal/logic/infochangelogic.go

@@ -48,7 +48,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 
 		data := make(map[string]interface{})
 
-		if in.MsgType == "1" || in.MsgType == "2" {
+		if in.MsgType == 1 || in.MsgType == 2 {
 			if _d := model.Mysql.SelectBySql(`SELECT a.*,b.title as relatedTitle FROM information a
 				LEFT JOIN information b on (a.related_id =b.id) where a.id = ? and a.app_id = `+util.StrFormat(in.AppId), mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
 				data = (*_d)[0]
@@ -74,7 +74,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 				break
 			}
 
-		} else if in.MsgType == "3" {
+		} else if in.MsgType == 3 {
 			if _d := model.Mysql.SelectBySql(`SELECT * FROM supply_info where id = ? and app_id = `+util.StrFormat(in.AppId), mc.IntAll(msgId)); _d != nil && len(*_d) > 0 {
 				data = (*_d)[0]
 				Results.ValidityTime = mc.InterfaceToStr(data["validity_time"])
@@ -88,7 +88,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 		Results.City = mc.InterfaceToStr(data["city"])
 		Results.AppId = mc.InterfaceToStr(data["app_id"])
 		Results.Title = mc.InterfaceToStr(data["title"])
-		Results.MsgType = mc.InterfaceToStr(data["type"])
+		Results.MsgType = mc.Int64All(data["type"])
 
 		Results.Detail = mc.InterfaceToStr(data["detail"])
 		Results.Attach = mc.InterfaceToStr(data["attach"])
@@ -114,7 +114,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 	case 1:
 		query["id"] = mc.IntAll(msgId)
 		query["app_id"] = in.AppId
-		if in.MsgType == "1" || in.MsgType == "2" {
+		if in.MsgType == 1 || in.MsgType == 2 {
 
 			if data := model.Mysql.FindOne("information", query, "", ""); data != nil && len(*data) > 0 {
 				upQuery["is_del"] = -1
@@ -134,7 +134,7 @@ func (l *InfoChangeLogic) InfoChange(in *consumer.InfoDetailReq) (*consumer.Info
 				dataRes.ErrCode = -1
 				dataRes.ErrMsg = "查询数据失败"
 			}
-		} else if in.MsgType == "3" {
+		} else if in.MsgType == 3 {
 			if data := model.Mysql.FindOne("supply_info", query, "", ""); data != nil && len(*data) > 0 {
 				upQuery["is_del"] = -1
 				if !model.Mysql.Update("supply_info", query, upQuery) {

rpc/consumer/internal/logic/inforelatedlogic.go

@@ -34,7 +34,7 @@ func (l *InfoRelatedLogic) InfoRelated(in *consumer.UserIdReq) (*consumer.InfoRe
 		queryName string
 		resp      consumer.InfoRelatedResp
 	)
-	queryName = ` and type=` + mc.InterfaceToStr(in.MsqType)
+	queryName = ` and type=` + mc.InterfaceToStr(in.MsgType)
 	if in.Match != "" {
 		queryName = ` and title LIKE '%` + in.Match + `%' `
 	}

rpc/consumer/internal/logic/mypublishlistlogic.go

@@ -38,8 +38,8 @@ func (l *MyPublishListLogic) MyPublishList(in *consumer.MyPublishListReq) (*cons
 	if in.Match != "" {
 		queryName = ` and title LIKE '%` + in.Match + `%' `
 	}
-	if in.MsgType != "" {
-		queryName = queryName + ` and type=` + in.MsgType
+	if in.MsgType != 0 {
+		queryName = queryName + ` and type=` + mc.InterfaceToStr(in.MsgType)
 	}
 	if in.AppId != "" {
 		queryName = queryName + ` and app_id = ` + util.StrFormat(in.AppId)
@@ -105,7 +105,7 @@ func (l *MyPublishListLogic) MyPublishList(in *consumer.MyPublishListReq) (*cons
 				vs.ReviewStatus = 3
 			}
 			ListData.Total = total
-			vs.MsgType = mc.InterfaceToStr(v["type"])
+			vs.MsgType = mc.Int64All(v["type"])
 			vs.CreateTime = mc.InterfaceToStr(v["create_time"])
 			vs.Title = mc.InterfaceToStr(v["title"])
 			ListData.List = append(ListData.List, &vs)

rpc/consumer/internal/logic/publishinfologic.go

@@ -60,7 +60,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumer.PublishInfoReq) (*consumer.P
 	publishData["status"] = 1
 	log.Println(in.MsgType, "-------------------")
 	switch in.MsgType {
-	case "1", "2":
+	case 1, 2:
 		publishData["related_id"] = mc.IntAll(in.RelatedId)      //关联公告id
 		publishData["project_code"] = in.Code                    //项目编号
 		publishData["industry"] = strings.Join(in.Industry, ",") //项目行业,多个逗号分隔
@@ -70,7 +70,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumer.PublishInfoReq) (*consumer.P
 		publishData["amount"] = in.Amount                        //中标金额
 
 		id = model.Mysql.Insert("information", publishData)
-	case "3":
+	case 3:
 		publishData["validity_time"] = in.Deadline //信息有效期
 		id = model.Mysql.Insert("supply_info", publishData)
 	default:
@@ -98,7 +98,7 @@ func (l *PublishInfoLogic) PublishInfo(in *consumer.PublishInfoReq) (*consumer.P
 	if in.Attach != "" {
 		appendInfo["attach"] = mc.StringToMap(in.Attach)
 	}
-	nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, mc.InterfaceToStr(id), "1", in.MsgType, false, appendInfo)
+	nsq, err := util.NewNsqInfo(model.NsqConfig.Ip, model.NsqConfig.Topic, mc.InterfaceToStr(id), "1", mc.InterfaceToStr(in.MsgType), false, appendInfo)
 	if err != nil || nsq.NsqPushInfo() != nil {
 		res.ErrCode = -1
 		res.ErrMsg = fmt.Sprintf("添加nsq失败；%s", err.Error())

rpc/consumer/type/consumer/consumer.pb.go

@@ -27,7 +27,7 @@ type PublishInfoReq struct {
 	unknownFields protoimpl.UnknownFields
 
 	Title     string   `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`         //信息标题最长50
-	MsgType   string   `protobuf:"bytes,2,opt,name=msgType,proto3" json:"msgType,omitempty"`     //信息类型1:招标信息 2:采购信息 3:供应信息
+	MsgType   int64    `protobuf:"varint,2,opt,name=msgType,proto3" json:"msgType,omitempty"`    //信息类型1:招标信息 2:采购信息 3:供应信息
 	RelatedId string   `protobuf:"bytes,3,opt,name=relatedId,proto3" json:"relatedId,omitempty"` //关联公告id
 	Code      string   `protobuf:"bytes,4,opt,name=code,proto3" json:"code,omitempty"`           //项目编码
 	Province  string   `protobuf:"bytes,5,opt,name=province,proto3" json:"province,omitempty"`   //省份
@@ -87,11 +87,11 @@ func (x *PublishInfoReq) GetTitle() string {
 	return ""
 }
 
-func (x *PublishInfoReq) GetMsgType() string {
+func (x *PublishInfoReq) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 func (x *PublishInfoReq) GetRelatedId() string {
@@ -403,7 +403,7 @@ type UserIdReq struct {
 	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //用户id
 	AppId   string `protobuf:"bytes,2,opt,name=appId,proto3" json:"appId,omitempty"`   //剑鱼标识 默认10000
 	Match   string `protobuf:"bytes,3,opt,name=match,proto3" json:"match,omitempty"`
-	MsqType int64  `protobuf:"varint,4,opt,name=msqType,proto3" json:"msqType,omitempty"`
+	MsgType int64  `protobuf:"varint,4,opt,name=msgType,proto3" json:"msgType,omitempty"`
 }
 
 func (x *UserIdReq) Reset() {
@@ -459,9 +459,9 @@ func (x *UserIdReq) GetMatch() string {
 	return ""
 }
 
-func (x *UserIdReq) GetMsqType() int64 {
+func (x *UserIdReq) GetMsgType() int64 {
 	if x != nil {
-		return x.MsqType
+		return x.MsgType
 	}
 	return 0
 }
@@ -713,7 +713,7 @@ type MyPublishListReq struct {
 
 	UserId       string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`              //用户id
 	Match        string `protobuf:"bytes,2,opt,name=match,proto3" json:"match,omitempty"`                //检索内容
-	MsgType      string `protobuf:"bytes,3,opt,name=msgType,proto3" json:"msgType,omitempty"`            //信息类型 1:招标信息 2:采购信息 3:供应信息
+	MsgType      int64  `protobuf:"varint,3,opt,name=msgType,proto3" json:"msgType,omitempty"`           //信息类型 1:招标信息 2:采购信息 3:供应信息
 	ReviewStatus int64  `protobuf:"varint,4,opt,name=reviewStatus,proto3" json:"reviewStatus,omitempty"` //审核状态 1:待审核｜2:审核通过｜3:审核不通过
 	PageSize     int64  `protobuf:"varint,5,opt,name=pageSize,proto3" json:"pageSize,omitempty"`         //每页数据量，默认10
 	PageIndex    int64  `protobuf:"varint,6,opt,name=pageIndex,proto3" json:"pageIndex,omitempty"`       //页码；默认第一页
@@ -766,11 +766,11 @@ func (x *MyPublishListReq) GetMatch() string {
 	return ""
 }
 
-func (x *MyPublishListReq) GetMsgType() string {
+func (x *MyPublishListReq) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 func (x *MyPublishListReq) GetReviewStatus() int64 {
@@ -961,7 +961,7 @@ type ListResp struct {
 	Title        string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`                //标题
 	Id           string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`                      //信息id
 	ReviewStatus int64  `protobuf:"varint,3,opt,name=reviewStatus,proto3" json:"reviewStatus,omitempty"` //审核状态 1:待审核｜2:审核通过｜3:审核不通过
-	MsgType      string `protobuf:"bytes,4,opt,name=msgType,proto3" json:"msgType,omitempty"`            //信息类型 1:招标信息 2:采购信息 3:供应信息
+	MsgType      int64  `protobuf:"varint,4,opt,name=msgType,proto3" json:"msgType,omitempty"`           //信息类型 1:招标信息 2:采购信息 3:供应信息
 	CreateTime   string `protobuf:"bytes,5,opt,name=createTime,proto3" json:"createTime,omitempty"`      //审核时间
 }
 
@@ -1018,11 +1018,11 @@ func (x *ListResp) GetReviewStatus() int64 {
 	return 0
 }
 
-func (x *ListResp) GetMsgType() string {
+func (x *ListResp) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 func (x *ListResp) GetCreateTime() string {
@@ -1038,11 +1038,11 @@ type InfoDetailReq struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`   //用户id
-	MsgId   string `protobuf:"bytes,2,opt,name=msgId,proto3" json:"msgId,omitempty"`     //信息id
-	Type    int64  `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`      //处理信息类型:0:获取发布信息详情（默认）；1：删除发布的信息；2：更新发布信息
-	AppId   string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"`     //剑鱼标识 默认10000
-	MsgType string `protobuf:"bytes,5,opt,name=msgType,proto3" json:"msgType,omitempty"` //信息类型 1:招标信息 2:采购信息 3:供应信息
+	UserId  string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"`    //用户id
+	MsgId   string `protobuf:"bytes,2,opt,name=msgId,proto3" json:"msgId,omitempty"`      //信息id
+	Type    int64  `protobuf:"varint,3,opt,name=type,proto3" json:"type,omitempty"`       //处理信息类型:0:获取发布信息详情（默认）；1：删除发布的信息；2：更新发布信息
+	AppId   string `protobuf:"bytes,4,opt,name=appId,proto3" json:"appId,omitempty"`      //剑鱼标识 默认10000
+	MsgType int64  `protobuf:"varint,5,opt,name=msgType,proto3" json:"msgType,omitempty"` //信息类型 1:招标信息 2:采购信息 3:供应信息
 }
 
 func (x *InfoDetailReq) Reset() {
@@ -1105,11 +1105,11 @@ func (x *InfoDetailReq) GetAppId() string {
 	return ""
 }
 
-func (x *InfoDetailReq) GetMsgType() string {
+func (x *InfoDetailReq) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 //发布的信息详情Resp
@@ -1181,7 +1181,7 @@ type InfoDetailData struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	MsgType           string             `protobuf:"bytes,1,opt,name=msgType,proto3" json:"msgType,omitempty"`                      //信息类型
+	MsgType           int64              `protobuf:"varint,1,opt,name=msgType,proto3" json:"msgType,omitempty"`                     //信息类型
 	Code              string             `protobuf:"bytes,2,opt,name=code,proto3" json:"code,omitempty"`                            //项目代码
 	Province          string             `protobuf:"bytes,3,opt,name=province,proto3" json:"province,omitempty"`                    //省份
 	City              string             `protobuf:"bytes,4,opt,name=city,proto3" json:"city,omitempty"`                            //城市
@@ -1234,11 +1234,11 @@ func (*InfoDetailData) Descriptor() ([]byte, []int) {
 	return file_consumer_proto_rawDescGZIP(), []int{15}
 }
 
-func (x *InfoDetailData) GetMsgType() string {
+func (x *InfoDetailData) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 func (x *InfoDetailData) GetCode() string {
@@ -1674,7 +1674,7 @@ type PublishInfoData struct {
 	unknownFields protoimpl.UnknownFields
 
 	Title     string   `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"`         //信息标题最长50
-	MsgType   string   `protobuf:"bytes,2,opt,name=msgType,proto3" json:"msgType,omitempty"`     //信息类型1:招标信息 2:采购信息 3:供应信息
+	MsgType   int64    `protobuf:"varint,2,opt,name=msgType,proto3" json:"msgType,omitempty"`    //信息类型1:招标信息 2:采购信息 3:供应信息
 	RelatedId string   `protobuf:"bytes,3,opt,name=relatedId,proto3" json:"relatedId,omitempty"` //关联公告id
 	Code      string   `protobuf:"bytes,4,opt,name=code,proto3" json:"code,omitempty"`           //项目编码
 	Province  string   `protobuf:"bytes,5,opt,name=province,proto3" json:"province,omitempty"`   //省份
@@ -1729,11 +1729,11 @@ func (x *PublishInfoData) GetTitle() string {
 	return ""
 }
 
-func (x *PublishInfoData) GetMsgType() string {
+func (x *PublishInfoData) GetMsgType() int64 {
 	if x != nil {
 		return x.MsgType
 	}
-	return ""
+	return 0
 }
 
 func (x *PublishInfoData) GetRelatedId() string {
@@ -2822,7 +2822,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
 	0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x69,
 	0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a,
 	0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63,
 	0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12,
@@ -2872,8 +2872,8 @@ var file_consumer_proto_rawDesc = []byte{
 	0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49,
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x14,
 	0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x71, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x71, 0x54, 0x79, 0x70, 0x65, 0x22, 0x7c,
+	0x61, 0x74, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x7c,
 	0x0a, 0x10, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x49, 0x64, 0x52, 0x65,
 	0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a,
@@ -2901,7 +2901,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x14,
 	0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d,
 	0x61, 0x74, 0x63, 0x68, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22,
+	0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x22,
 	0x0a, 0x0c, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x53, 0x74, 0x61, 0x74,
 	0x75, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x05,
@@ -2935,7 +2935,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x72,
 	0x65, 0x76, 0x69, 0x65, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x0c, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
-	0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x63, 0x72, 0x65,
 	0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63,
 	0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x81, 0x01, 0x0a, 0x0d, 0x49, 0x6e,
@@ -2946,7 +2946,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a,
 	0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70,
 	0x70, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x78, 0x0a,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79, 0x70, 0x65, 0x22, 0x78, 0x0a,
 	0x0e, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x73, 0x70, 0x12,
 	0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07, 0x65, 0x72,
@@ -2956,7 +2956,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x49, 0x6e, 0x66, 0x6f, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x07,
 	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x22, 0xf4, 0x04, 0x0a, 0x0e, 0x49, 0x6e, 0x66, 0x6f,
 	0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73,
-	0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67,
+	0x67, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67,
 	0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x72, 0x6f, 0x76,
 	0x69, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x72, 0x6f, 0x76,
@@ -3024,7 +3024,7 @@ var file_consumer_proto_rawDesc = []byte{
 	0x03, 0x0a, 0x0f, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x49, 0x6e, 0x66, 0x6f, 0x44, 0x61,
 	0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x09, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x54,
-	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79,
+	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x54, 0x79,
 	0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x49, 0x64, 0x18,
 	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x65, 0x64, 0x49, 0x64,
 	0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,

rpc/manager/internal/logic/infolistlogic.go

@@ -90,9 +90,9 @@ func (l *InfoListLogic) InfoList(in *manager.InfoListReq) (*manager.InfoListResp
 	} else {
 		offset = common.IntAll((in.PageIndex - 1) * in.PageSize)
 	}
-	allData := model.Mysql.SelectBySql(`SELECT a.id,a.type,a.status,a.phone,a.contact_person,a.contact_person,a.contact_phone,a.title,a.create_time  from (SELECT id,type,status,phone,contact_person,contact_phone,title,create_time  from information `+queryInfo+`
+	allData := model.Mysql.SelectBySql(`SELECT * from (SELECT id,type,status,phone,contact_person,contact_phone,title,create_time,is_del  from information `+queryInfo+`
 			union all
-			SELECT id,type,status,phone,contact_person,contact_phone,title,create_time  from supply_info `+queryInfo+` ) a  order by a.create_time limit ?,? `, offset, in.PageSize)
+			SELECT id,type,status,phone,contact_person,contact_phone,title,create_time,is_del  from supply_info `+queryInfo+` ) a  order by a.create_time limit ?,? `, offset, in.PageSize)
 	if allData != nil && len(*allData) > 0 {
 		for _, v := range *allData {
 			res := manager.InfoList{}
@@ -108,7 +108,7 @@ func (l *InfoListLogic) InfoList(in *manager.InfoListReq) (*manager.InfoListResp
 			res.Phone = common.InterfaceToStr(v["phone"])
 			res.ReviewStatus = common.Int64All(v["status"])
 			res.Published = common.Int64All(v["published"])
-			res.IsDel = common.Int64All(v["published"])
+			res.IsDel = common.Int64All(v["is_del"])
 			res.ApplyTime = common.InterfaceToStr(v["create_time"])
 			contact.Name = common.InterfaceToStr(v["contact_person"])
 			contact.Phone = common.InterfaceToStr(v["contact_phone"])