#627 update collateralize query

plugin/dapp/collateralize/executor/collateralize.go

@@ -100,10 +100,11 @@ func (c *Collateralize) deleteCollateralizeStatus(status int32, index int64) (kv
 	return kvs
 }
 
-func (c *Collateralize) addCollateralizeAddr(addr string, collateralizeId string, index int64) (kvs []*types.KeyValue) {
+func (c *Collateralize) addCollateralizeAddr(addr string, collateralizeId string, status int32, index int64) (kvs []*types.KeyValue) {
 	key := calcCollateralizeAddrKey(addr, index)
 	record := &pty.CollateralizeRecord{
 		CollateralizeId:collateralizeId,
+		Status:status,
 		Index: index,
 	}
 	kv := &types.KeyValue{Key: key, Value: types.Encode(record)}

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -1159,7 +1159,7 @@ func queryCollateralizeByStatus(localdb dbm.Lister, status int32, index int64) (
 	return ids, nil
 }
 
-func queryCollateralizeByAddr(localdb dbm.Lister, addr string, index int64) ([]string, error) {
+func queryCollateralizeByAddr(localdb dbm.Lister, addr string, status int32, index int64) ([]string, error) {
 	var data [][]byte
 	var err error
 	if index != 0 {
@@ -1180,7 +1180,9 @@ func queryCollateralizeByAddr(localdb dbm.Lister, addr string, index int64) ([]s
 			clog.Debug("queryCollateralizesByAddr", "decode", err)
 			return nil, err
 		}
-		ids = append(ids, coll.CollateralizeId)
+		if  status ==0 || coll.Status == status {
+			ids = append(ids, coll.CollateralizeId)
+		}
 	}
 
 	return ids, nil

plugin/dapp/collateralize/executor/exec_del_local.go

@@ -34,35 +34,35 @@ func (c *Collateralize) execDelLocal(tx *types.Transaction, receiptData *types.R
 					set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
 						collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 					set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
-					set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
-						collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
-					set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
+					//set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
+					//	collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
+					//set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
 				}
 				break
 			case pty.TyLogCollateralizeRepay:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.PreStatus, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
-				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
-					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
+				//set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
+				//	collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				break
 			case pty.TyLogCollateralizeFeed:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,
 					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
 				set.KV = append(set.KV, c.deleteCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.Index)...)
-				set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
-					collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
-				// 如果没有被清算，需要把地址索引更新
-				if collateralizeLog.Status == pty.CollateralizeUserStatusWarning || collateralizeLog.Status == pty.CollateralizeUserStatusExpire {
-					set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
-				}
+				//set.KV = append(set.KV, c.addCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.CollateralizeId,
+				//	collateralizeLog.RecordId, collateralizeLog.PreIndex)...)
+				//// 如果没有被清算，需要把地址索引更新
+				//if collateralizeLog.Status == pty.CollateralizeUserStatusWarning || collateralizeLog.Status == pty.CollateralizeUserStatusExpire {
+				//	set.KV = append(set.KV, c.deleteCollateralizeRecordAddr(collateralizeLog.AccountAddr, collateralizeLog.Index)...)
+				//}
 				break
 			case pty.TyLogCollateralizeClose:
 				set.KV = append(set.KV, c.deleteCollateralizeStatus(collateralizeLog.Status, collateralizeLog.Index)...)
 				set.KV = append(set.KV, c.addCollateralizeStatus(pty.CollateralizeStatusCreated, collateralizeLog.CollateralizeId,
 					collateralizeLog.PreIndex)...)
-				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId,
-					collateralizeLog.PreIndex)...)
+				//set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId,
+				//	collateralizeLog.PreStatus, collateralizeLog.PreIndex)...)
 				break
 			}
 		}

plugin/dapp/collateralize/executor/exec_local.go

@@ -24,7 +24,7 @@ func (c *Collateralize) execLocal(tx *types.Transaction, receipt *types.ReceiptD
 			switch item.Ty {
 			case pty.TyLogCollateralizeCreate:
 				set.KV = append(set.KV, c.addCollateralizeStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
-				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.Index)...)
+				set.KV = append(set.KV, c.addCollateralizeAddr(collateralizeLog.CreateAddr, collateralizeLog.CollateralizeId, collateralizeLog.Status, collateralizeLog.Index)...)
 				break
 			case pty.TyLogCollateralizeBorrow:
 				set.KV = append(set.KV, c.addCollateralizeRecordStatus(collateralizeLog.Status, collateralizeLog.CollateralizeId,

plugin/dapp/collateralize/executor/query.go

@@ -70,7 +70,7 @@ func (c *Collateralize) Query_CollateralizeByStatus(req *pty.ReqCollateralizeByS
 
 func (c *Collateralize) Query_CollateralizeByAddr(req *pty.ReqCollateralizeByAddr) (types.Message, error) {
 	ids := &pty.RepCollateralizeIDs{}
-	collIDRecords, err := queryCollateralizeByAddr(c.GetLocalDB(), req.Addr, req.Index)
+	collIDRecords, err := queryCollateralizeByAddr(c.GetLocalDB(), req.Addr, req.Status, req.Index)
 	if err != nil {
 		clog.Error("Query_CollateralizeByAddr", "get collateralize record error", err)
 		return nil, err

plugin/dapp/collateralize/proto/collateralize.proto

@@ -127,7 +127,8 @@ message CollateralizeRecord {
     string collateralizeId = 1;
     string addr            = 2;
     string recordId        = 3;
-    int64  index           = 4;
+    int32  status          = 4;
+    int64  index           = 5;
 }
 
 // exec_local 放贷记录信息列表
@@ -173,7 +174,8 @@ message ReqCollateralizeByStatus {
 // 根据用户地址查询
 message ReqCollateralizeByAddr {
     string addr  = 1;
-    int64  index = 2;
+    int32 status = 2;
+    int64  index = 3;
 }
 
 // 返回放贷ID列表