fix bug: #97245 #97346 #97343

models/ermcp3.go

@@ -216,7 +216,7 @@ type ErmcpDeliveryGoodsDetail struct {
 
 func (r *ErmcpDeliveryGoodsDetail) addGmList(lst []Ermcp3Wrstandard) {
 	for i := range lst {
-		if lst[i].DELIVERYGOODSID == r.Data.DELIVERYGOODSID {
+		if lst[i].DELIVERYGOODSID == r.Data.DELIVERYGOODSID && lst[i].ISVALID == 1 {
 			r.GmList = append(r.GmList, lst[i])
 		}
 	}

models/wrTrade2.go

@@ -2213,6 +2213,7 @@ func (r *WrScfContract) buildSql() string {
 		"     and e.enumdiccode = 'goodsunit')" +
 		"select to_char(t.scfcontractid) scfcontractid," +
 		"       t.scfcontracttype," +
+		"       t.marketid," +
 		"       t.lenderuserid," +
 		"       t.lenderamount," +
 		"       s.remainamount," +
@@ -2221,6 +2222,7 @@ func (r *WrScfContract) buildSql() string {
 		"       s.buybackwrpositionqty," +
 		"       s.remainwrpositionqty," +
 		"       s.closeinterest," +
+		"       s.totalinterest," +
 		"       s.interestdebt," +
 		"       s.startinterestday," +
 		"       s.lastcloseinterestday," +