fix bug: #96790 #96737 #96739

docs/docs.go

@@ -30066,6 +30066,10 @@ var doc = `{
                     "description": "期货商品id",
                     "type": "integer"
                 },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
                 "haswr": {
                     "description": "是否有仓单-卖方 - 0:无仓单 1:有仓单",
                     "type": "integer"

docs/swagger.json

@@ -30050,6 +30050,10 @@
                     "description": "期货商品id",
                     "type": "integer"
                 },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
                 "haswr": {
                     "description": "是否有仓单-卖方 - 0:无仓单 1:有仓单",
                     "type": "integer"

docs/swagger.yaml

@@ -13685,6 +13685,9 @@ definitions:
       goodsid:
         description: 期货商品id
         type: integer
+      goodsname:
+        description: 商品名称
+        type: string
       haswr:
         description: 是否有仓单-卖方 - 0:无仓单 1:有仓单
         type: integer

models/wrTrade2.go

@@ -193,7 +193,7 @@ func (r *WrOrderQuote) buildSqlPriceMove() string {
 		"         k2.sellQty" +
 		"    from buyQuote k1" +
 		"    full join sellQuote k2" +
-		"      on k1.wrfactortypeid = k2.wrfactortypeid and k1.deliverymonth = k2.deliverymonth)" +
+		"      on k1.wrfactortypeid = k2.wrfactortypeid and nvl(k1.deliverymonth,0) = nvl(k2.deliverymonth,0))" +
 		"select k.*," +
 		"       w.wrfactortypename," +
 		"       w.deliverygoodsid," +
@@ -591,6 +591,7 @@ type WrOrderDetail struct {
 	WRTRADEORDERSTATUS int32   `json:"wrtradeorderstatus"  xorm:"WRTRADEORDERSTATUS"`      // 委托状态 - 1:委托请求 2:待冻结 3:委托成功 4:委托失败 5:配对成功 6:已撤 7:已成 8:成交失败 9:委托拒绝 10:挂牌部分成交 11:仓单生成失败 12:首付扣款失败 13:履约失败 14:撤单解冻贷款失败 15:部成部撤
 	GOODSID            int32   `json:"goodsid"  xorm:"'GOODSID'"`                          // 期货商品id
 	GOODSCODE          string  `json:"goodscode"  xorm:"'GOODSCODE'"`                      // 期货合约
+	GOODSNAME          string  `json:"goodsname"  xorm:"'GOODSNAME'"`                      // 商品名称
 	FUTUPRICEMOVE      float64 `json:"futupricemove"  xorm:"'FUTUPRICEMOVE'"`              // 期货升贴水
 	DELIVERYMONTH      string  `json:"deliverymonth"  xorm:"'DELIVERYMONTH'"`              // 交收月
 	Wr2FactorType      `xorm:"extends"`
@@ -603,7 +604,7 @@ func (r *WrOrderDetail) calc() {
 	if r.GOODSCODE == "" {
 		r.FUTUSHOW = "-"
 	} else {
-		r.FUTUSHOW = fmt.Sprintf("%v//%.2f", r.GOODSCODE, r.FUTUPRICEMOVE)
+		r.FUTUSHOW = fmt.Sprintf("%v/%.2f", r.GOODSNAME, r.PRICEMOVE)
 	}
 	r.Wr2FactorType.Calc()
 }
@@ -629,7 +630,9 @@ func (r *WrOrderDetail) buildSql() string {
 		"      on t.wrstandardid = w.wrstandardid" +
 		"    left join warehouseinfo h" +
 		"      on t.warehouseid = h.autoid" +
-		"    left join enumdicitem e on w.unitid = e.enumitemname and e.enumdiccode='goodsunit')" +
+		"    left join enumdicitem e" +
+		"      on w.unitid = e.enumitemname" +
+		"     and e.enumdiccode = 'goodsunit')" +
 		"select t.HASWR," +
 		"       to_char(t.WRTRADEORDERID) WRTRADEORDERID," +
 		"       t.TRADEDATE," +
@@ -645,18 +648,21 @@ func (r *WrOrderDetail) buildSql() string {
 		"       t.FIXEDPRICE," +
 		"       t.PRICEMOVE," +
 		"       t.TRADEPRICE," +
-		"       to_char(t.ORDERTIME,'yyyy-mm-dd hh24:mi:ss') ORDERTIME," +
+		"       to_char(t.ORDERTIME, 'yyyy-mm-dd hh24:mi:ss') ORDERTIME," +
 		"       t.WRTRADEORDERSTATUS," +
 		"       c.GOODSID," +
 		"       c.GOODSCODE," +
 		"       c.pricemove FUTUPRICEMOVE," +
+		"       g.goodsname," +
 		"       k.*" +
 		"  from wrtrade_orderdetail t" +
 		"  left join wrtrade_goodsconfig c" +
 		"    on t.wrtradeorderid = c.wrtradeorderid" +
+		"  left join goods g on c.goodsid=g.goodsid" +
 		"  left join tmp k" +
 		"    on t.wrfactortypeid = k.wrfactortypeid" +
-		"  where t.WRTRADETYPE = 1 and t.isspecified=0"
+		" where t.WRTRADETYPE = 1" +
+		"   and t.isspecified = 0"
 	sqlId.And("t.USERID", r.USERID)
 	sqlId.And("t.haswr", r.HASWR)
 	sqlId.AndEx("t.marketid", r.MARKETID, r.MARKETID > 0)
@@ -1028,7 +1034,7 @@ func (r *WrGoodsInfo) GetDataEx() (interface{}, error) {
 		if len(sType) > 0 {
 			a := sType[0]
 			v.LstItem = append(v.LstItem, WrTypeItem{NAME: "品种", VALUE: a.DELIVERYGOODSNAME})
-			v.LstItem = append(v.LstItem, WrTypeItem{NAME: "品类", VALUE: a.WRSTANDARDNAME})
+			v.LstItem = append(v.LstItem, WrTypeItem{NAME: "商品", VALUE: a.WRSTANDARDNAME})
 
 			for _, b := range sType {
 				v.LstItem = append(v.LstItem, WrTypeItem{NAME: b.ITEMTYPENAME, VALUE: b.DGFACTORYITEMVALUE})