处理ORDERID的长度问题

controllers/hsby/hsby.go

@@ -345,10 +345,10 @@ func QueryHsbyPreGoodses(c *gin.Context) {
 			return true
 		} else if preGoodses[i].Goodsstatus == 3 && preGoodses[j].Goodsstatus == 3 {
 			// 已开始商品按结束时间顺序排
-			return preGoodses[i].Endtime.After(preGoodses[j].Endtime)
-		} else if preGoodses[i].Goodsstatus == 3 && preGoodses[j].Goodsstatus == 3 {
+			return preGoodses[i].Endtime.Before(preGoodses[j].Endtime)
+		} else if preGoodses[i].Goodsstatus == 2 && preGoodses[j].Goodsstatus == 2 {
 			// 未开始商品按开始时间顺序排
-			return preGoodses[i].Starttime.After(preGoodses[j].Starttime)
+			return preGoodses[i].Starttime.Before(preGoodses[j].Starttime)
 		}
 
 		return false

models/hsby.go

@@ -207,7 +207,7 @@ func GetHsbyListingGoodsDetail(goodsID int) (*HsbyListingGoodsDetail, error) {
 
 // HsbyGoodsOrderDetail 二级市场挂牌商品当前可摘委托单信息
 type HsbyGoodsOrderDetail struct {
-	Orderid    int64     `json:"orderid"  xorm:"'ORDERID'" binding:"required"`     // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Orderid    string    `json:"orderid"  xorm:"'ORDERID'" binding:"required"`     // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	Buyorsell  int32     `json:"buyorsell"  xorm:"'BUYORSELL'" binding:"required"` // 买卖 - 0:买 1:卖
 	Ordertime  time.Time `json:"ordertime"  xorm:"'ORDERTIME'" binding:"required"` // 委托时间
 	Orderprice float64   `json:"orderprice"  xorm:"'ORDERPRICE'"`                  // 委托价格
@@ -231,7 +231,7 @@ func GetHsbyGoodsOrderDetails(goodsID, buyOrSell int, price float64) ([]HsbyGood
 	// 获取与目标商品相关的挂牌委托单信息（ListingSelectType = 1 or 3; OrderStatus =3 or 7）
 	hsbyGoodsOrderDetails := make([]HsbyGoodsOrderDetail, 0)
 	session := engine.Table("TRADE_ORDERDETAIL").
-		Select(`TRADE_ORDERDETAIL.ORDERID, TRADE_ORDERDETAIL.BUYORSELL, TRADE_ORDERDETAIL.ORDERTIME, TRADE_ORDERDETAIL.ORDERPRICE, (TRADE_ORDERDETAIL.ORDERQTY - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY) ENABLEQTY,
+		Select(`to_char(TRADE_ORDERDETAIL.ORDERID) ORDERID, TRADE_ORDERDETAIL.BUYORSELL, TRADE_ORDERDETAIL.ORDERTIME, TRADE_ORDERDETAIL.ORDERPRICE, (TRADE_ORDERDETAIL.ORDERQTY - TRADE_ORDERDETAIL.TRADEQTY - TRADE_ORDERDETAIL.CANCELQTY) ENABLEQTY,
 			substr(USERINFO.CUSTOMERNAME,0,1)||'****' as CUSTOMERNAME`).
 		Join("LEFT", "TAACCOUNT", "TAACCOUNT.ACCOUNTID = TRADE_ORDERDETAIL.ACCOUNTID").
 		Join("LEFT", "USERINFO", "USERINFO.USERID = TAACCOUNT.RELATEDUSERID").
@@ -286,7 +286,7 @@ func GetHsbyGoodsOrderDetails(goodsID, buyOrSell int, price float64) ([]HsbyGood
 
 // HybsMyBuyOrderDetail 我的订单（一二级市场的买方向委托单）
 type HybsMyBuyOrderDetail struct {
-	Orderid           int64     `json:"orderid"  xorm:"'ORDERID'" binding:"required"`     // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	Orderid           string    `json:"orderid"  xorm:"'ORDERID'" binding:"required"`     // 委托单号(100+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	Marketid          int32     `json:"marketid"  xorm:"'MARKETID'" binding:"required"`   // 市场ID
 	Goodsid           int32     `json:"goodsid"  xorm:"'GOODSID'" binding:"required"`     // 商品ID
 	Accountid         int64     `json:"accountid"  xorm:"'ACCOUNTID'" binding:"required"` // 账户ID[报价币种]
@@ -355,7 +355,7 @@ func GetHsbyBuyMyOrderDetails(accountIDs string, myBuyStatus int) ([]HybsMyBuyOr
 
 	hybsMyBuyOrderDetails := make([]HybsMyBuyOrderDetail, 0)
 	session := engine.Table("TRADE_ORDERDETAIL").
-		Select(`TRADE_ORDERDETAIL.*, 
+		Select(`to_char(TRADE_ORDERDETAIL.ORDERID) ORDERID, TRADE_ORDERDETAIL.*, 
 				GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE, 
 				HSBY_GOODSEX.PICURLS, 
 				MARKET.TRADEMODE,