按需求修改“获取PC交易端菜单”接口

controllers/common/table.go

@@ -63,18 +63,31 @@ func QueryTraderMenu(c *gin.Context) {
 	appG.Response(http.StatusOK, e.SUCCESS, queryTraderMenuRsp)
 }
 
+// GetPCMenusReq 获取PC交易端菜单请求参数
+type GetPCMenusReq struct {
+	ResourceCode string `form:"resourceCode"`
+	ParentCode   string `form:"parentCode"`
+}
+
 // GetPCMenus 获取PC交易端菜单
 // @Summary 获取PC交易端菜单
 // @Produce json
-// @Success 200 {array} models.OperationPrimaryMenu
+// @Param resourceCode query string false "资源代码"
+// @Param parentCode query string false "上级资源代码"
+// @Success 200 {array} models.Funcmenulist
 // @Failure 500 {object} app.Response
 // @Router /Common/GetPCMenus [get]
 // @Tags 通用服务
 func GetPCMenus(c *gin.Context) {
 	appG := app.Gin{C: c}
 
+	// 获取请求参数
+	var req GetPCMenusReq
+	appG.C.ShouldBindQuery(&req)
+
 	// 获取功能菜单
-	datas, err := models.GetOperationMenu()
+	var f models.Funcmenulist
+	datas, err := f.GetPCMenuList(req.ResourceCode, req.ParentCode)
 	if err != nil {
 		logger.GetLogger().Errorf("GetPCMenus failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_OPERATIONMENU_FAIL, nil)

models/common.go

@@ -27,6 +27,23 @@ func (Funcmenulist) TableName() string {
 	return "FUNCMENULIST"
 }
 
+// GetPCMenuList 获取PC版本功能菜单表
+func (t *Funcmenulist) GetPCMenuList(resourceCode, parentCode string) ([]Funcmenulist, error) {
+	funcMenuLists := make([]Funcmenulist, 0)
+	session := db.GetEngine().Table("FUNCMENULIST T").Where("T.MENUTYPE = 2")
+	if len(resourceCode) != 0 {
+		session = session.And("T.RESOURCECODE = ?", resourceCode)
+	}
+	if len(parentCode) != 0 {
+		session = session.And("T.PARENTCODE = ?", parentCode)
+	}
+	if err := session.Find(&funcMenuLists); err != nil {
+		return nil, err
+	}
+
+	return funcMenuLists, nil
+}
+
 // Rolefuncmenu 角色菜单表
 type Rolefuncmenu struct {
 	Roleid       uint32 `json:"roleid"  xorm:"'ROLEID'" binding:"required"`             // 角色权限ID

models/ermcpOrder.go

@@ -422,7 +422,7 @@ func GetHedgeInnerOrderDetails(accountID int) ([]QueryHedgeOrderDetailRsp, error
 			Orderprice:              v.Orderprice,
 			Orderqty:                orderQty,
 			Tradeqty:                tradeQty,
-			Openfreezemargin:        v.Openfreezemargin - v.Openunfreezecharge, // 错误 #94473
+			Openfreezemargin:        v.Openfreezemargin - v.Openunfreezemargin, // 错误 #94473
 			Channeloperatetype:      v.Channeloperatetype,
 			Ordertime:               v.Ordertime,
 			Channelinnerorderstatus: v.Channelinnerorderstatus,
@@ -550,7 +550,7 @@ func GetHisHedgeInnerOrderDetails(accountID int, startDate, endDate string) ([]Q
 			Orderprice:              v.Orderprice,
 			Orderqty:                orderQty,
 			Tradeqty:                tradeQty,
-			Openfreezemargin:        v.Openfreezemargin - v.Openunfreezecharge,
+			Openfreezemargin:        v.Openfreezemargin - v.Openunfreezemargin,
 			Channeloperatetype:      v.Channeloperatetype,
 			Ordertime:               v.Ordertime,
 			Channelinnerorderstatus: v.Channelinnerorderstatus,