#627 fix query error

plugin/dapp/collateralize/commands/cmd.go

@@ -305,7 +305,7 @@ func CollateralizeManage(cmd *cobra.Command, args []string) {
 	params := &rpctypes.CreateTxIn{
 		Execer:     cfg.ExecName(pkt.CollateralizeX),
 		ActionName: "CollateralizeManage",
-		Payload:    []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%d, \"totalBalance\":%d,}",
+		Payload:    []byte(fmt.Sprintf("{\"debtCeiling\":%d, \"liquidationRatio\":%f, \"stabilityFeeRatio\":%f, \"period\":%d, \"totalBalance\":%d}",
 			debtCeiling, liquidationRatio, stabilityFeeRatio, period, totalBalance)),
 	}
 

plugin/dapp/collateralize/executor/collateralizedb.go

@@ -266,7 +266,6 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
 		return nil, pty.ErrRiskParam
 	}
 
-	var collConfig *pty.CollateralizeManage
 	manConfig, _ := getCollateralizeConfig(action.db)
 	if manConfig == nil {
 		manConfig = &pty.CollateralizeManage{
@@ -275,9 +274,11 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
 			StabilityFeeRatio: DefaultStabilityFeeRation,
 			Period:            DefaultPeriod,
 			CollTotalBalance:  DefaultCollTotalBalance,
+			CurrentTime:       action.blocktime,
 		}
 	}
 
+	collConfig := &pty.CollateralizeManage{}
 	if manage.StabilityFeeRatio != 0 {
 		collConfig.StabilityFeeRatio = manage.StabilityFeeRatio
 	} else  {
@@ -308,6 +309,12 @@ func (action *Action) CollateralizeManage(manage *pty.CollateralizeManage) (*typ
 		collConfig.CollTotalBalance = manConfig.CollTotalBalance
 	}
 
+	if manage.CurrentTime != 0 {
+		collConfig.CollTotalBalance = manage.CollTotalBalance
+	} else {
+		collConfig.CollTotalBalance = manConfig.CollTotalBalance
+	}
+
 	value := types.Encode(collConfig)
 	action.db.Set(ConfigKey(), value)
 	kv = append(kv, &types.KeyValue{Key: ConfigKey(), Value: value})

plugin/dapp/collateralize/executor/query.go

@@ -123,8 +123,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor
 
 	collIDRecords, err := queryCollateralizeByStatus(c.GetLocalDB(), pty.CollateralizeStatusCreated, 0)
 	if err != nil {
-		clog.Error("Query_CollateralizeByStatus", "get collateralize record error", err)
-		return nil, err
+		clog.Debug("Query_CollateralizeByStatus", "get collateralize record error", err)
 	}
 
 	collBalance := config.CollTotalBalance
@@ -144,6 +143,7 @@ func (c *Collateralize) Query_CollateralizeConfig(req *pty.ReqCollateralizeRecor
 		StabilityFeeRatio: config.StabilityFeeRatio,
 		Period: config.Period,
 		CollBalance: collBalance,
+		CurrentTime: config.CurrentTime,
 	}
 
 	return ret, nil

plugin/dapp/collateralize/proto/collateralize.proto

@@ -67,6 +67,7 @@ message CollateralizeManage {
     float stabilityFeeRatio  = 3; //稳定费
     int64 period             = 4; //合约期限
     int64 collTotalBalance   = 5; //放贷总量
+    int64 currentTime        = 6; //设置时间
 }
 
 message CollateralizeAddr {
@@ -216,4 +217,5 @@ message RepCollateralizeConfig {
     int64 period             = 4; //合约期限
     int64 collTotalBalance   = 5; //放贷总量
     int64 collBalance        = 6; //剩余放贷额度
+    int64 currentTime        = 7; //设置时间
 }
\ No newline at end of file

plugin/dapp/collateralize/types/collateralize.go

@@ -331,7 +331,7 @@ func CreateRawCollateralizeManageTx(cfg *types.Chain33Config, parm *Collateraliz
 		LiquidationRatio:     parm.LiquidationRatio,
 		StabilityFeeRatio:    parm.StabilityFeeRatio,
 		Period:               parm.Period,
-		CollTotalBalance:     parm.TotalBalance,
+		CollTotalBalance:     parm.CollTotalBalance,
 	}
 
 	manage := &CollateralizeAction{

plugin/dapp/collateralize/types/tx.go

@@ -51,6 +51,6 @@ type CollateralizeManageTx struct {
 	LiquidationRatio    float32 `json:"liquidationRatio"`
 	StabilityFeeRatio   float32 `json:"stabilityFeeRatio"`
 	Period              int64 `json:"period"`
-	TotalBalance        int64 `json:"totalBalance"`
+	CollTotalBalance    int64 `json:"collTotalBalance"`
 	Fee                 int64  `json:"fee"`
 }