预算金额修改

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -51,8 +51,8 @@ message subscribeInfo {
   int64 ca_isvisit = 10;
   int64  ca_type = 11;
   repeated string  matchKeys = 12;
-  int64 budget = 13;
-  int64 bidAmount = 14;
+  string budget = 13;
+  string bidAmount = 14;
   int64 collection = 15;
   string  buyer = 16;
   string  projectName = 17;

jyBXSubscribe/rpc/model/push.go

@@ -202,6 +202,8 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}) *bxs
 	if _id == "" {
 		_id = common.ObjToString((*info)["_id"])
 	}
+	log.Println(info)
+	log.Println()
 	return &bxsubscribe.SubscribeInfo{
 		XId:          encrypt.EncodeArticleId2ByCheck(_id),
 		Title:        common.InterfaceToStr((*info)["title"]),
@@ -216,8 +218,8 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}) *bxs
 		CaIsvip:      int64(p.Isvip),
 		CaType:       int64(p.Type),
 		MatchKeys:    p.Keys,
-		Budget:       common.Int64All((*info)["budget"]),
-		BidAmount:    common.Int64All((*info)["bidamount"]),
+		Budget:       common.InterfaceToStr((*info)["budget"]),
+		BidAmount:    common.InterfaceToStr((*info)["bidamount"]),
 		Buyer:        common.InterfaceToStr((*info)["buyer"]),
 		ProjectName:  common.InterfaceToStr((*info)["projectname"]),
 		Winner:       common.InterfaceToStr((*info)["s_winner"]),
@@ -493,7 +495,7 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 
 			}
 			if len(find_in_set) > 0 {
-				leftJoinStr = fmt.Sprintf(" STRAIGHT_JOIN %s t on t.infoid = b.infoid and t.labelcode=2   ORDER BY a.id desc", BidTags)
+				leftJoinStr = fmt.Sprintf(" STRAIGHT_JOIN %s t on t.infoid = b.infoid and t.labelcode=2 ", BidTags)
 				querys = append(querys, fmt.Sprintf(" t.labelvalues in (%s)", strings.Join(find_in_set, ",")))
 			}
 		}

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe.pb.go

@@ -362,8 +362,8 @@ type SubscribeInfo struct {
 	CaIsvisit    int64    `protobuf:"varint,10,opt,name=ca_isvisit,json=caIsvisit,proto3" json:"ca_isvisit,omitempty"`
 	CaType       int64    `protobuf:"varint,11,opt,name=ca_type,json=caType,proto3" json:"ca_type,omitempty"`
 	MatchKeys    []string `protobuf:"bytes,12,rep,name=matchKeys,proto3" json:"matchKeys,omitempty"`
-	Budget       int64    `protobuf:"varint,13,opt,name=budget,proto3" json:"budget,omitempty"`
-	BidAmount    int64    `protobuf:"varint,14,opt,name=bidAmount,proto3" json:"bidAmount,omitempty"`
+	Budget       string   `protobuf:"bytes,13,opt,name=budget,proto3" json:"budget,omitempty"`
+	BidAmount    string   `protobuf:"bytes,14,opt,name=bidAmount,proto3" json:"bidAmount,omitempty"`
 	Collection   int64    `protobuf:"varint,15,opt,name=collection,proto3" json:"collection,omitempty"`
 	Buyer        string   `protobuf:"bytes,16,opt,name=buyer,proto3" json:"buyer,omitempty"`
 	ProjectName  string   `protobuf:"bytes,17,opt,name=projectName,proto3" json:"projectName,omitempty"`
@@ -491,18 +491,18 @@ func (x *SubscribeInfo) GetMatchKeys() []string {
 	return nil
 }
 
-func (x *SubscribeInfo) GetBudget() int64 {
+func (x *SubscribeInfo) GetBudget() string {
 	if x != nil {
 		return x.Budget
 	}
-	return 0
+	return ""
 }
 
-func (x *SubscribeInfo) GetBidAmount() int64 {
+func (x *SubscribeInfo) GetBidAmount() string {
 	if x != nil {
 		return x.BidAmount
 	}
-	return 0
+	return ""
 }
 
 func (x *SubscribeInfo) GetCollection() int64 {
@@ -1796,9 +1796,9 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x52, 0x06, 0x63, 0x61, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x6d, 0x61, 0x74, 0x63,
 	0x68, 0x4b, 0x65, 0x79, 0x73, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x61, 0x74,
 	0x63, 0x68, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1c,
+	0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x1c,
 	0x0a, 0x09, 0x62, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x62, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a,
+	0x09, 0x52, 0x09, 0x62, 0x69, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1e, 0x0a, 0x0a,
 	0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05,
 	0x62, 0x75, 0x79, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79,