Prechádzať zdrojové kódy

解决海商待支付单trademode=16时优惠金额为null引起的问题

zhou.xiaoning 4 rokov pred
rodič
commit
e5b179c20e
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  1. 1 1
      models/hsby.go

+ 1 - 1
models/hsby.go

@@ -1413,7 +1413,7 @@ func GetHsbyBuyMyPayOrders(accountIDs string, buyOrderID, sellOrderID int) ([]Hs
 
 	orders := make([]HsbyBuyMyPayOrder, 0)
 	session := engine.Table("TRADE_PAYORDER TP").
-		Select(`to_char(TP.TRADEID) TRADEIDSTR, to_char(TP.BUYORDERID) BUYORDERIDSTR, to_char(TP.SELLORDERID) SELLORDERIDSTR, TP.*, (TP.TRADEAMOUNT + TP.TRADECHARGE + TP.OFFAMOUNT) ORIGINALAMOUNT,
+		Select(`to_char(TP.TRADEID) TRADEIDSTR, to_char(TP.BUYORDERID) BUYORDERIDSTR, to_char(TP.SELLORDERID) SELLORDERIDSTR, TP.*, (TP.TRADEAMOUNT + NVL(TP.TRADECHARGE,0) + NVL(TP.OFFAMOUNT,0)) ORIGINALAMOUNT,
 				GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE, GOODS.AGREEUNIT, 
 				HG1.PICURLS PICURLS1, HG2.PICURLS PICURLS2, 
 				MARKET.TRADEMODE,