海商待付款单增加原金额字段

config/config.xml

@@ -13,11 +13,11 @@
     <DbAddress value="192.168.31.117"/>
     <DbName value="orcl"/>
     <DbPort value="1521"/>
-    <DbUser value="mtp2_test114"/>
+    <DbUser value="mtp2_test171"/>
     <DbPwd value="muchinfo"/>
   </DbSetting>
   <RedisSetting>
-    <Address value="192.168.31.114"/>
+    <Address value="192.168.31.171"/>
     <Port value="5007"/>
     <Timeout value="3"/>
     <ConnNum value="1"/>
@@ -25,11 +25,11 @@
     <Pwd value=""/>
   </RedisSetting>
   <MqSetting>
-    <Url value="amqp://guest:guest@192.168.31.114:5020/test"/>
+    <Url value="amqp://guest:guest@192.168.31.171:5020/test"/>
     <Exchange value="entry"/>
   </MqSetting>
   <MongoDBSetting>
-    <HostName value="192.168.31.114"/>
+    <HostName value="192.168.31.171"/>
     <Port value="5025"/>
     <DBName value="HistoryQuote"/>
     <Username value="quote_test01"/>
@@ -38,8 +38,8 @@
   <MySQLSetting>
     <Host value="192.168.30.140"/>
     <Port value="3306"/>
-    <DBName value="historyquote_test114"/>
-    <Username value="quote_test114"/>
+    <DBName value="historyquote_test171"/>
+    <Username value="root"/>
     <Password value="123456"/>
   </MySQLSetting>
 </Configuration>

docs/docs.go

@@ -12852,8 +12852,12 @@ var doc = `{
                     "description": "优惠金额",
                     "type": "number"
                 },
+                "originalamount": {
+                    "description": "原金额 = TradeAmount + TradeCharge + OffAmount",
+                    "type": "number"
+                },
                 "payamount": {
-                    "description": "支付金额 = TradeAmount + TradeCharge - OffAmount",
+                    "description": "支付金额 = TradeAmount + TradeCharge",
                     "type": "number"
                 },
                 "payflag": {

docs/swagger.json

@@ -12836,8 +12836,12 @@
                     "description": "优惠金额",
                     "type": "number"
                 },
+                "originalamount": {
+                    "description": "原金额 = TradeAmount + TradeCharge + OffAmount",
+                    "type": "number"
+                },
                 "payamount": {
-                    "description": "支付金额 = TradeAmount + TradeCharge - OffAmount",
+                    "description": "支付金额 = TradeAmount + TradeCharge",
                     "type": "number"
                 },
                 "payflag": {

docs/swagger.yaml

@@ -4781,8 +4781,11 @@ definitions:
       offamount:
         description: 优惠金额
         type: number
+      originalamount:
+        description: 原金额 = TradeAmount + TradeCharge + OffAmount
+        type: number
       payamount:
-        description: 支付金额 = TradeAmount + TradeCharge - OffAmount
+        description: 支付金额 = TradeAmount + TradeCharge
         type: number
       payflag:
         description: 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止

models/hsby.go

@@ -1370,7 +1370,9 @@ type HsbyBuyMyPayOrder struct {
 	Offamount      float64   `json:"offamount"  xorm:"'OFFAMOUNT'"`                   // 优惠金额
 	Tradeprice     float64   `json:"tradeprice"  xorm:"'TRADEPRICE'"`                 // 成交价格
 	Tradeqty       int64     `json:"tradeqty"  xorm:"'TRADEQTY'"`                     // 成交数量
-	Payamount      float64   `json:"payamount"  xorm:"'PAYAMOUNT'"`                   // 支付金额 = TradeAmount + TradeCharge - OffAmount
+	Payamount      float64   `json:"payamount"  xorm:"'PAYAMOUNT'"`                   // 支付金额 = TradeAmount + TradeCharge
+
+	OriginalAmount float64 `json:"originalamount" xorm:"ORIGINALAMOUNT"` // 原金额 = TradeAmount + TradeCharge + OffAmount
 
 	Goodscode    string  `json:"goodscode"  xorm:"'GOODSCODE'" binding:"required"` // 商品代码(内部)
 	Goodsname    string  `json:"goodsname"  xorm:"'GOODSNAME'" binding:"required"` // 商品名称
@@ -1411,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.*,
+		Select(`to_char(TP.TRADEID) TRADEIDSTR, to_char(TP.BUYORDERID) BUYORDERIDSTR, to_char(TP.SELLORDERID) SELLORDERIDSTR, TP.*, (TP.TRADEAMOUNT + TP.TRADECHARGE + TP.OFFAMOUNT) ORIGINALAMOUNT,
 				GOODS.GOODSCODE, GOODS.GOODSNAME, GOODS.DECIMALPLACE, GOODS.AGREEUNIT, 
 				HG1.PICURLS PICURLS1, HG2.PICURLS PICURLS2, 
 				MARKET.TRADEMODE,