“我的商品”增加可用数量字段

docs/docs.go

@@ -3895,6 +3895,10 @@ var doc = `{
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "enableqty": {
+                    "description": "可用数量",
+                    "type": "integer"
+                },
                 "goodscode": {
                     "description": "商品代码(内部)",
                     "type": "string"

docs/swagger.json

@@ -3879,6 +3879,10 @@
                     "description": "报价小数位",
                     "type": "integer"
                 },
+                "enableqty": {
+                    "description": "可用数量",
+                    "type": "integer"
+                },
                 "goodscode": {
                     "description": "商品代码(内部)",
                     "type": "string"

docs/swagger.yaml

@@ -1369,6 +1369,9 @@ definitions:
       decimalplace:
         description: 报价小数位
         type: integer
+      enableqty:
+        description: 可用数量
+        type: integer
       goodscode:
         description: 商品代码(内部)
         type: string

models/hsby.go

@@ -438,6 +438,7 @@ type HsbyMyGoods struct {
 	Goodsid            int32   `json:"goodsid"  xorm:"'GOODSID'" binding:"required"`     // 商品Id
 	Buycurpositionqty  int64   `json:"buycurpositionqty"  xorm:"'BUYCURPOSITIONQTY'"`    // 买当前持仓总数量
 	Buycurholderamount float64 `json:"buycurholderamount"  xorm:"'BUYCURHOLDERAMOUNT'"`  // 买当前持仓总金额[商品币种]
+	EnableQty          int64   `json:"enableqty" xorm:"'ENABLEQTY'"`                     // 可用数量
 
 	Goodscode    string  `json:"goodscode"  xorm:"'GOODSCODE'" binding:"required"` // 商品代码(内部)
 	Goodsname    string  `json:"goodsname"  xorm:"'GOODSNAME'" binding:"required"` // 商品名称
@@ -461,7 +462,7 @@ func GetHsbyMyGoods(accountIDs string) ([]HsbyMyGoods, error) {
 	hsbyMyGoodses := make([]HsbyMyGoods, 0)
 	// 此定制版本，只查询出当前手数（期末）大于0的数据 （TRADEPOSITION.BUYCURPOSITIONQTY > 0）
 	if err := engine.Table("TRADEPOSITION").
-		Select(`TRADEPOSITION.*, 
+		Select(`TRADEPOSITION.*, (TRADEPOSITION.BUYCURPOSITIONQTY - TRADEPOSITION.BUYFROZENQTY - TRADEPOSITION.BUYOTHERFROZENQTY) ENABLEQTY, 
 				GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE, GOODS.AGREEUNIT, 
 				HSBY_GOODSEX.PICURLS, 
 				ENUMDICITEM.PARAM2 CURRENCYSIGN`).
@@ -472,10 +473,10 @@ func GetHsbyMyGoods(accountIDs string) ([]HsbyMyGoods, error) {
 		return nil, err
 	}
 
-	// 计算持仓均价
 	for i := range hsbyMyGoodses {
 		myGoods := &hsbyMyGoodses[i]
 
+		// 持仓均价
 		averagePrice := myGoods.Buycurholderamount / float64(myGoods.Buycurpositionqty) / myGoods.Agreeunit
 		myGoods.Buyaverageprice, _ = strconv.ParseFloat(utils.FormatFloat(averagePrice, int(myGoods.Decimalplace)), 64)
 	}

models/order.go

@@ -346,6 +346,7 @@ type Tradegoodspickup struct {
 	Tradedate       string    `json:"tradedate"  xorm:"'TRADEDATE'"`                        // 交易日(yyyyMMdd)
 	Marketid        int32     `json:"marketid"  xorm:"'MARKETID'"`                          // 市场ID
 	Handlestatus    int32     `json:"handlestatus"  xorm:"'HANDLESTATUS'"`                  // 处理状态
+	Amount          float64   `json:"amount"  xorm:"'AMOUNT'"`                              // 提货金额
 }
 
 // TableName is TRADE_GOODSPICKUP