zhou.xiaoning преди 3 години
родител
ревизия
79bb8aedc3
променени са 2 файла, в които са добавени 56 реда и са изтрити 28 реда
  1. 28 28
      controllers/common/menu.go
  2. 28 0
      models/ermcp8.go

+ 28 - 28
controllers/common/menu.go

@@ -287,20 +287,20 @@ func createPCWebMenu(datas []interface{}, loginID int) []PCWebMenu {
 		if data["isshow"].(bool) {
 			// 判断权限
 			rulekey := ""
-			if data["rulekey"] != nil {
-				rulekey = data["rulekey"].(string)
-				requireAuth := rulekey != ""
-				if requireAuth {
-					// 判断是否有权限
-					funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekey)
-					if err != nil {
-						continue
-					}
-					if len(funcMenuList) == 0 {
-						continue
-					}
-				}
-			}
+			// if data["rulekey"] != nil {
+			// 	rulekey = data["rulekey"].(string)
+			// 	requireAuth := rulekey != ""
+			// 	if requireAuth {
+			// 		// 判断是否有权限
+			// 		funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekey)
+			// 		if err != nil {
+			// 			continue
+			// 		}
+			// 		if len(funcMenuList) == 0 {
+			// 			continue
+			// 		}
+			// 	}
+			// }
 
 			// 构建页面(按钮)权限
 			auths := make([]PCWebMenuAuth, 0)
@@ -311,20 +311,20 @@ func createPCWebMenu(datas []interface{}, loginID int) []PCWebMenu {
 					if am["isshow"].(bool) {
 						// 判断权限
 						rulekeySub := ""
-						if am["rulekey"] != nil {
-							rulekeySub = am["rulekey"].(string)
-							requireAuth := rulekeySub != ""
-							if requireAuth {
-								// 判断是否有权限
-								funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekeySub)
-								if err != nil {
-									continue
-								}
-								if len(funcMenuList) == 0 {
-									continue
-								}
-							}
-						}
+						// if am["rulekey"] != nil {
+						// 	rulekeySub = am["rulekey"].(string)
+						// 	requireAuth := rulekeySub != ""
+						// 	if requireAuth {
+						// 		// 判断是否有权限
+						// 		funcMenuList, err := models.GetErmcpRoleFuncMenuLists(loginID, rulekeySub)
+						// 		if err != nil {
+						// 			continue
+						// 		}
+						// 		if len(funcMenuList) == 0 {
+						// 			continue
+						// 		}
+						// 	}
+						// }
 
 						auth := PCWebMenuAuth{
 							Label:   am["label"].(string),

+ 28 - 0
models/ermcp8.go

@@ -249,3 +249,31 @@ func (r *Ermcp2himiddlegoods) GetDataEx() (interface{}, error) {
 	}
 	return sData, nil
 }
+
+// Ermcpjrlinkpos 项目期货关联头寸
+type Ermcpjrlinkpos struct {
+	SPOTCONTRACTID      string    `json:"spotcontractid"  xorm:"SPOTCONTRACTID"`           // 现货ID [套期项目ID - 金瑞:合同\虚拟合同ID
+	GOODSID             int32     `json:"goodsid"  xorm:"GOODSID"`                         // 期货合约
+	ORDERTYPE           int32     `json:"ordertype"  xorm:"ORDERTYPE"`                     // 单据类型 - 1:期货单 2:看涨期权单 3:看跌期权单
+	EXECUTEPRICE        int64     `json:"executeprice"  xorm:"EXECUTEPRICE"`               // 执行价 - 1:期货单 为 0
+	OPTIONCODE          string    `json:"optioncode"  xorm:"OPTIONCODE"`                   // 期权代码
+	AREAUSERID          int64     `json:"areauserid"  xorm:"AREAUSERID"`                   // 所属企业
+	TOTALBUYAMOUNT      float64   `json:"totalbuyamount"  xorm:"TOTALBUYAMOUNT"`           // 买金额 [期货]
+	TOTALBUYQTY         float64   `json:"totalbuyqty"  xorm:"TOTALBUYQTY"`                 // 买数量
+	TOTALSELLAMOUNT     float64   `json:"totalsellamount"  xorm:"TOTALSELLAMOUNT"`         // 卖金额 [期货]
+	TOTALSELLQTY        float64   `json:"totalsellqty"  xorm:"TOTALSELLQTY"`               // 卖数量
+	NETQTY              float64   `json:"netqty"  xorm:"NETQTY"`                           // 净头寸
+	TOTALCHARGE         float64   `json:"totalcharge"  xorm:"TOTALCHARGE"`                 // 手续费
+	TOTALPREMIUM        float64   `json:"totalpremium"  xorm:"TOTALPREMIUM"`               // 权利金 [期权]
+	CLOSEPL             float64   `json:"closepl"  xorm:"CLOSEPL"`                         // 总平仓盈亏
+	UPDATETIME          time.Time `json:"updatetime"  xorm:"UPDATETIME"`                   // 更新时间
+	TOTALBUYHOLDAMOUNT  float64   `json:"totalbuyholdamount"  xorm:"TOTALBUYHOLDAMOUNT"`   // 买持仓总金额[期货]
+	TOTALSELLHOLDAMOUNT float64   `json:"totalsellholdamount"  xorm:"TOTALSELLHOLDAMOUNT"` // 卖持仓总金额[期货]
+	TODAYFUTURECLOSEPL  float64   `json:"todayfutureclosepl"  xorm:"TODAYFUTURECLOSEPL"`   // 今日平仓盈亏
+	RECKONPL            float64   `json:"reckonpl"  xorm:"RECKONPL"`                       // 总盈亏(平仓盈亏 + 结算盈亏 - 手续费)
+}
+
+// TableName is ERMCP_JR_LINKPOS
+func (r *Ermcpjrlinkpos) TableName() string {
+	return "ERMCP_JR_LINKPOS"
+}