增加接口：

/Guangzuan/QueryFworderoperate 查询保税服务单据操作
/Guangzuan/QueryGzcjjcorderoperate 查询出境检测单据操作

controllers/guangzuan/tradeService.go

@@ -62,7 +62,7 @@ func QueryGZCJJCOrderDetail(c *gin.Context) {
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
 // @Success  200      {array}  models.GzcjbsorderfileM
-// @Failure  500      {object} app.Response
+// @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJBSOrderFile [get]
 // @Tags     广钻
 func QueryGZCJBSOrderFile(c *gin.Context) {
@@ -83,7 +83,7 @@ func QueryGZCJBSOrderFile(c *gin.Context) {
 // @Param    page     query    int false "页码"
 // @Param    pagesize query    int false "每页条数"
 // @Success  200           {array}  models.GzbsfworderM
-// @Failure  500      {object} app.Response
+// @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZBSFWOrder [get]
 // @Tags     广钻
 func QueryGZBSFWOrder(c *gin.Context) {
@@ -140,3 +140,41 @@ func GZBSFWOrderOperate(c *gin.Context) {
 		a.Gin.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 	}
 }
+
+// QueryGzcjjcorderoperate
+// @Summary  查询出境检测单据操作
+// @Produce  json
+// @Security ApiKeyAuth
+// @Security LoginID
+// @Security Group
+// @Param    orderid query    string true "单据ID"
+// @Param    status  query    int    true "操作后单据状态"
+// @Success  200     {array}  models.Gzcjjcorderoperate
+// @Failure  500      {object} app.Response
+// @Router   /Guangzuan/QueryGzcjjcorderoperate [get]
+// @Tags     广钻
+func QueryGzcjjcorderoperate(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.Gzcjjcorderoperate{}
+	a.DoBindReq(&m)
+	a.DoGetDataEx(&m)
+}
+
+// QueryFworderoperate
+// @Summary  查询保税服务单据操作
+// @Produce  json
+// @Security ApiKeyAuth
+// @Security LoginID
+// @Security Group
+// @Param    orderid query    string true "单据ID"
+// @Param    status  query    int    true "操作后单据状态"
+// @Success  200     {array}  models.Fworderoperate
+// @Failure  500      {object} app.Response
+// @Router   /Guangzuan/QueryFworderoperate [get]
+// @Tags     广钻
+func QueryFworderoperate(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.Fworderoperate{}
+	a.DoBindReq(&m)
+	a.DoGetDataEx(&m)
+}

docs/docs.go

@@ -9039,6 +9039,61 @@ const docTemplate = `{
                 }
             }
         },
+        "/Guangzuan/QueryFworderoperate": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "LoginID": []
+                    },
+                    {
+                        "Group": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "广钻"
+                ],
+                "summary": "查询保税服务单据操作",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "单据ID",
+                        "name": "orderid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "操作后单据状态",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Fworderoperate"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Guangzuan/QueryGZBSFWOrder": {
             "get": {
                 "security": [
@@ -9363,6 +9418,61 @@ const docTemplate = `{
                 }
             }
         },
+        "/Guangzuan/QueryGzcjjcorderoperate": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "LoginID": []
+                    },
+                    {
+                        "Group": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "广钻"
+                ],
+                "summary": "查询出境检测单据操作",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "单据ID",
+                        "name": "orderid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "操作后单据状态",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Gzcjjcorderoperate"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Guangzuan/QueryMemberReport": {
             "get": {
                 "security": [
@@ -19404,11 +19514,7 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -20810,7 +20916,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "点价金额=(点价价格+升贴水)*点价数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "applyid": {
@@ -21394,7 +21500,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "退款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -21434,7 +21540,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "收付款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricemove": {
@@ -21601,11 +21707,7 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -22202,31 +22304,31 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "套利变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "变动量(套保敞口)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "套保变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "变动量(总敞口) 平安:净敞口今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -23841,11 +23943,7 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/erms3.CustomerInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -24180,11 +24278,7 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -25659,7 +25753,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期末均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -25671,7 +25765,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "参考市值(期末市值)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curqty": {
@@ -25695,7 +25789,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "参考市价(最新价)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -25727,7 +25821,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "浮动损益",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -25775,7 +25869,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "今日采购均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -25795,7 +25889,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "今日销售均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -28727,7 +28821,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -28751,11 +28845,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enddate": {
@@ -28763,7 +28857,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "matchname": {
@@ -28787,31 +28881,31 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "套保系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "已定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "已定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "已定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "reckondate": {
@@ -28819,11 +28913,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "已关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "已关联量(套保品种)(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -28831,39 +28925,39 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "今日定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "今日定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "今日定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "今日关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(套保品-期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -28875,7 +28969,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "增值税率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -29424,7 +29518,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "平仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -29492,7 +29586,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期末持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -29524,7 +29618,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "开仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -29532,7 +29626,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -29576,7 +29670,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "今平仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -29592,7 +29686,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "今开仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -31258,11 +31352,7 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpRoleMenu"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpRoleMenu"
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -31568,11 +31658,7 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpTaAccountM"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpTaAccountM"
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -32207,6 +32293,95 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Fworderoperate": {
+            "type": "object",
+            "required": [
+                "orderid",
+                "status"
+            ],
+            "properties": {
+                "advanceamount": {
+                    "description": "总预付款",
+                    "type": "number"
+                },
+                "advanceproofaddr": {
+                    "description": "预付款收款凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "bankfee": {
+                    "description": "汇款银行手续费",
+                    "type": "number"
+                },
+                "bankproofaddr": {
+                    "description": "广钻汇款银行手续费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "customsproofaddr": {
+                    "description": "海关税费保证金收据(确认结算费用时)",
+                    "type": "string"
+                },
+                "logisticsfee": {
+                    "description": "代缴物流保险费",
+                    "type": "number"
+                },
+                "logisticsproofaddr": {
+                    "description": "代缴物流保险费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "operatetime": {
+                    "description": "操作时间",
+                    "type": "string"
+                },
+                "operatoraccount": {
+                    "description": "操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorid": {
+                    "description": "操作人ID - systemmanager的autoid 或 loginaccount的loginid",
+                    "type": "integer"
+                },
+                "operatorname": {
+                    "description": "操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorsrc": {
+                    "description": "操作人来源 - 1:管理端 2:终端",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "单据ID(804+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
+                "otherfee": {
+                    "description": "其它费用",
+                    "type": "number"
+                },
+                "remark": {
+                    "description": "操作备注",
+                    "type": "string"
+                },
+                "servicefee": {
+                    "description": "综合服务费",
+                    "type": "number"
+                },
+                "settleamount": {
+                    "description": "总结算费用 - 实际扣除资金，不含税费保证金",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "操作后单据状态 -  枚举\"GZBSStatus\"",
+                    "type": "integer"
+                },
+                "taxmargin": {
+                    "description": "税费保证金",
+                    "type": "number"
+                },
+                "totalfee": {
+                    "description": "总费用 = 费用之和 (结算费用时不含税费保证金)",
+                    "type": "number"
+                }
+            }
+        },
         "models.GErmcpspotgoodsprice": {
             "type": "object",
             "properties": {
@@ -33734,6 +33909,111 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Gzcjjcorderoperate": {
+            "type": "object",
+            "required": [
+                "orderid",
+                "status"
+            ],
+            "properties": {
+                "advanceamount": {
+                    "description": "总预付款",
+                    "type": "number"
+                },
+                "advanceproofaddr": {
+                    "description": "预付检测费和海关税费银行凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "bankfee": {
+                    "description": "汇款银行手续费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "bankproofaddr": {
+                    "description": "广钻汇款银行手续费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "customsfee": {
+                    "description": "海关税费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "customsproofaddr": {
+                    "description": "海关税费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "exchangerate": {
+                    "description": "汇率 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "giaproofaddr": {
+                    "description": "GIA检测费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "giarmbfee": {
+                    "description": "GIA检测费(￥) [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "giausdfee": {
+                    "description": "GIA检测费(USD$) [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "logisticsfee": {
+                    "description": "代缴物流保险费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "logisticsproofaddr": {
+                    "description": "代缴物流保险费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "operatetime": {
+                    "description": "操作时间",
+                    "type": "string"
+                },
+                "operatoraccount": {
+                    "description": "操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorid": {
+                    "description": "操作人ID - systemmanager的autoid 或 loginaccount的loginid",
+                    "type": "integer"
+                },
+                "operatorname": {
+                    "description": "操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorsrc": {
+                    "description": "操作人来源 - 1:管理端 2:终端",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "单据ID(801+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
+                "otherfee": {
+                    "description": "其它费用",
+                    "type": "number"
+                },
+                "remark": {
+                    "description": "操作备注",
+                    "type": "string"
+                },
+                "servicefee": {
+                    "description": "综合服务费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "settleamount": {
+                    "description": "总结算费用",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "操作后单据状态 -  枚举\"GZCJStatus\"",
+                    "type": "integer"
+                },
+                "totalfee": {
+                    "description": "总费用 = GIA检测费(￥) + 海关税费 + 汇款银行手续费 + 代缴物流保险费 + 综合服务费  + 其它费用 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                }
+            }
+        },
         "models.Gzrapaportprice": {
             "type": "object",
             "properties": {
@@ -43810,11 +44090,7 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -43887,11 +44163,7 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
                 },
                 "history": {
                     "description": "历史价格走势（历史数据日线）",
@@ -44172,11 +44444,7 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -45414,11 +45682,7 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
-                        }
-                    ]
+                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -45446,7 +45710,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -45515,7 +45779,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "转让数量(数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeid": {
@@ -45576,7 +45840,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "冻结数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodscode": {
@@ -45612,7 +45876,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "持仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -45636,7 +45900,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "建仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "optiontype": {
@@ -46718,7 +46982,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "挂牌价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -46726,7 +46990,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "履约保证金比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -46908,7 +47172,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -47166,7 +47430,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "交割均价 = 交割金额 / 交割数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "begindate": {
@@ -47282,7 +47546,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -48162,7 +48426,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "步骤值",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "templateid": {
@@ -48473,7 +48737,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -48533,11 +48797,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "冻结手续费",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "冻结保证金(保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -48573,7 +48837,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "保证金设置值(履约保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -48815,7 +49079,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -49188,7 +49452,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "剩余款(待支付金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -49735,7 +49999,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -49872,11 +50136,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "日成交金额(当日单方向成交金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "日成交数量(当日单方向成交数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -50045,7 +50309,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "未结费用",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -50637,7 +50901,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -53709,11 +53973,7 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Loginaccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Loginaccount"
                 },
                 "markets": {
                     "description": "市场",
@@ -53731,19 +53991,11 @@ const docTemplate = `{
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Useraccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Useraccount"
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Userinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Userinfo"
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.json

@@ -9030,6 +9030,61 @@
                 }
             }
         },
+        "/Guangzuan/QueryFworderoperate": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "LoginID": []
+                    },
+                    {
+                        "Group": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "广钻"
+                ],
+                "summary": "查询保税服务单据操作",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "单据ID",
+                        "name": "orderid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "操作后单据状态",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Fworderoperate"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Guangzuan/QueryGZBSFWOrder": {
             "get": {
                 "security": [
@@ -9354,6 +9409,61 @@
                 }
             }
         },
+        "/Guangzuan/QueryGzcjjcorderoperate": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    },
+                    {
+                        "LoginID": []
+                    },
+                    {
+                        "Group": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "广钻"
+                ],
+                "summary": "查询出境检测单据操作",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "单据ID",
+                        "name": "orderid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "操作后单据状态",
+                        "name": "status",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Gzcjjcorderoperate"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
+        },
         "/Guangzuan/QueryMemberReport": {
             "get": {
                 "security": [
@@ -19395,11 +19505,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -20801,7 +20907,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "点价金额=(点价价格+升贴水)*点价数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "applyid": {
@@ -21385,7 +21491,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "退款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -21425,7 +21531,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "收付款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricemove": {
@@ -21592,11 +21698,7 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -22193,31 +22295,31 @@
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "套利变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "变动量(套保敞口)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "套保变动量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "变动量(总敞口) 平安:净敞口今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -23832,11 +23934,7 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/erms3.CustomerInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -24171,11 +24269,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -25650,7 +25744,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期末均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -25662,7 +25756,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "参考市值(期末市值)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curqty": {
@@ -25686,7 +25780,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "参考市价(最新价)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -25718,7 +25812,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "浮动损益",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -25766,7 +25860,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "今日采购均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -25786,7 +25880,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "今日销售均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -28718,7 +28812,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -28742,11 +28836,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enddate": {
@@ -28754,7 +28848,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "matchname": {
@@ -28778,31 +28872,31 @@
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "套保系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "已定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "已定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "已定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "reckondate": {
@@ -28810,11 +28904,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "已关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "已关联量(套保品种)(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -28822,39 +28916,39 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "今日定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "今日定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "今日定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "今日关联量(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "今日关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "今日关联量(套保品-期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -28866,7 +28960,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "增值税率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -29415,7 +29509,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "平仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -29483,7 +29577,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期末持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -29515,7 +29609,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "开仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -29523,7 +29617,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -29567,7 +29661,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "今平仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -29583,7 +29677,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "今开仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -31249,11 +31343,7 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpRoleMenu"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpRoleMenu"
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -31559,11 +31649,7 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpTaAccountM"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpTaAccountM"
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -32198,6 +32284,95 @@
                 }
             }
         },
+        "models.Fworderoperate": {
+            "type": "object",
+            "required": [
+                "orderid",
+                "status"
+            ],
+            "properties": {
+                "advanceamount": {
+                    "description": "总预付款",
+                    "type": "number"
+                },
+                "advanceproofaddr": {
+                    "description": "预付款收款凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "bankfee": {
+                    "description": "汇款银行手续费",
+                    "type": "number"
+                },
+                "bankproofaddr": {
+                    "description": "广钻汇款银行手续费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "customsproofaddr": {
+                    "description": "海关税费保证金收据(确认结算费用时)",
+                    "type": "string"
+                },
+                "logisticsfee": {
+                    "description": "代缴物流保险费",
+                    "type": "number"
+                },
+                "logisticsproofaddr": {
+                    "description": "代缴物流保险费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "operatetime": {
+                    "description": "操作时间",
+                    "type": "string"
+                },
+                "operatoraccount": {
+                    "description": "操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorid": {
+                    "description": "操作人ID - systemmanager的autoid 或 loginaccount的loginid",
+                    "type": "integer"
+                },
+                "operatorname": {
+                    "description": "操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorsrc": {
+                    "description": "操作人来源 - 1:管理端 2:终端",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "单据ID(804+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
+                "otherfee": {
+                    "description": "其它费用",
+                    "type": "number"
+                },
+                "remark": {
+                    "description": "操作备注",
+                    "type": "string"
+                },
+                "servicefee": {
+                    "description": "综合服务费",
+                    "type": "number"
+                },
+                "settleamount": {
+                    "description": "总结算费用 - 实际扣除资金，不含税费保证金",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "操作后单据状态 -  枚举\"GZBSStatus\"",
+                    "type": "integer"
+                },
+                "taxmargin": {
+                    "description": "税费保证金",
+                    "type": "number"
+                },
+                "totalfee": {
+                    "description": "总费用 = 费用之和 (结算费用时不含税费保证金)",
+                    "type": "number"
+                }
+            }
+        },
         "models.GErmcpspotgoodsprice": {
             "type": "object",
             "properties": {
@@ -33725,6 +33900,111 @@
                 }
             }
         },
+        "models.Gzcjjcorderoperate": {
+            "type": "object",
+            "required": [
+                "orderid",
+                "status"
+            ],
+            "properties": {
+                "advanceamount": {
+                    "description": "总预付款",
+                    "type": "number"
+                },
+                "advanceproofaddr": {
+                    "description": "预付检测费和海关税费银行凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "bankfee": {
+                    "description": "汇款银行手续费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "bankproofaddr": {
+                    "description": "广钻汇款银行手续费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "customsfee": {
+                    "description": "海关税费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "customsproofaddr": {
+                    "description": "海关税费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "exchangerate": {
+                    "description": "汇率 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "giaproofaddr": {
+                    "description": "GIA检测费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "giarmbfee": {
+                    "description": "GIA检测费(￥) [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "giausdfee": {
+                    "description": "GIA检测费(USD$) [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "logisticsfee": {
+                    "description": "代缴物流保险费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "logisticsproofaddr": {
+                    "description": "代缴物流保险费凭证(确认结算费用时)",
+                    "type": "string"
+                },
+                "operatetime": {
+                    "description": "操作时间",
+                    "type": "string"
+                },
+                "operatoraccount": {
+                    "description": "操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorid": {
+                    "description": "操作人ID - systemmanager的autoid 或 loginaccount的loginid",
+                    "type": "integer"
+                },
+                "operatorname": {
+                    "description": "操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid",
+                    "type": "string"
+                },
+                "operatorsrc": {
+                    "description": "操作人来源 - 1:管理端 2:终端",
+                    "type": "integer"
+                },
+                "orderid": {
+                    "description": "单据ID(801+Unix秒时间戳(10位)+xxxxxx)",
+                    "type": "string"
+                },
+                "otherfee": {
+                    "description": "其它费用",
+                    "type": "number"
+                },
+                "remark": {
+                    "description": "操作备注",
+                    "type": "string"
+                },
+                "servicefee": {
+                    "description": "综合服务费 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                },
+                "settleamount": {
+                    "description": "总结算费用",
+                    "type": "number"
+                },
+                "status": {
+                    "description": "操作后单据状态 -  枚举\"GZCJStatus\"",
+                    "type": "integer"
+                },
+                "totalfee": {
+                    "description": "总费用 = GIA检测费(￥) + 海关税费 + 汇款银行手续费 + 代缴物流保险费 + 综合服务费  + 其它费用 [GZCJStatus = 10.预付款确认中\\13.付款确认中] 时",
+                    "type": "number"
+                }
+            }
+        },
         "models.Gzrapaportprice": {
             "type": "object",
             "properties": {
@@ -43801,11 +44081,7 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -43878,11 +44154,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
                 },
                 "history": {
                     "description": "历史价格走势（历史数据日线）",
@@ -44163,11 +44435,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -45405,11 +45673,7 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
-                        }
-                    ]
+                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -45437,7 +45701,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -45506,7 +45770,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "转让数量(数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeid": {
@@ -45567,7 +45831,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "冻结数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodscode": {
@@ -45603,7 +45867,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "持仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -45627,7 +45891,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "建仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "optiontype": {
@@ -46709,7 +46973,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "挂牌价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -46717,7 +46981,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "履约保证金比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -46899,7 +47163,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -47157,7 +47421,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "交割均价 = 交割金额 / 交割数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "begindate": {
@@ -47273,7 +47537,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -48153,7 +48417,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "步骤值",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "templateid": {
@@ -48464,7 +48728,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -48524,11 +48788,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "冻结手续费",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "冻结保证金(保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -48564,7 +48828,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "保证金设置值(履约保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -48806,7 +49070,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -49179,7 +49443,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "剩余款(待支付金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -49726,7 +49990,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -49863,11 +50127,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "日成交金额(当日单方向成交金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "日成交数量(当日单方向成交数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -50036,7 +50300,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "未结费用",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -50628,7 +50892,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -53700,11 +53964,7 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Loginaccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Loginaccount"
                 },
                 "markets": {
                     "description": "市场",
@@ -53722,19 +53982,11 @@
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Useraccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Useraccount"
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Userinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Userinfo"
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.yaml

@@ -226,8 +226,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1275,7 +1274,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 点价金额=(点价价格+升贴水)*点价数量
+        description: 期初均价
         type: number
       applyid:
         description: 申请人
@@ -1710,7 +1709,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 退款(非必填)
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -1740,7 +1739,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 收付款(非必填)
+        description: 期初均价
         type: number
       pricemove:
         description: 升贴水
@@ -1862,8 +1861,7 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2308,25 +2306,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 套利变动量
+        description: 期初均价
         type: number
       diffExposoureQty:
-        description: 变动量(套保敞口)
+        description: 期初均价
         type: number
       diffFutuQty:
-        description: 变动量(期货总量) 平安：保值净持仓量今日变动
+        description: 期初均价
         type: number
       diffHedgeQty:
-        description: 套保变动量
+        description: 期初均价
         type: number
       diffQty:
-        description: 变动量(总敞口) 平安:净敞口今日变动
+        description: 期初均价
         type: number
       diffSpotHedgeQty:
-        description: 变动量(现货应套保总量) 平安:应套保量今日变动
+        description: 期初均价
         type: number
       diffSpotQty:
-        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动
+        description: 期初均价
         type: number
       enumdicname:
         description: 单位名称
@@ -3528,8 +3526,7 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        allOf:
-        - $ref: '#/definitions/erms3.CustomerInfo'
+        $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -3774,8 +3771,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -4868,7 +4864,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期末均价
+        description: 期初均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -4877,7 +4873,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 参考市值(期末市值)
+        description: 期初均价
         type: number
       curqty:
         description: 期末量
@@ -4895,7 +4891,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 参考市价(最新价)
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -4919,7 +4915,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 浮动损益
+        description: 期初均价
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -4955,7 +4951,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 今日采购均价
+        description: 期初均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -4970,7 +4966,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 今日销售均价
+        description: 期初均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -7150,7 +7146,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 折算系数
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -7168,16 +7164,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
+        description: 期初均价
         type: number
       diffqty:
-        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
+        description: 期初均价
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
+        description: 期初均价
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -7195,64 +7191,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
+        description: 期初均价
         type: number
       middlegoodspricedqty2:
-        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
+        description: 期初均价
         type: number
       middlegoodspricedqty3:
-        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
+        description: 期初均价
         type: number
       needhedgeratio:
-        description: 套保系数
+        description: 期初均价
         type: number
       pricedamount:
-        description: 已定价额(现货)
+        description: 期初均价
         type: number
       pricedamount2:
-        description: 已定价额(现货-基价额)
+        description: 期初均价
         type: number
       pricedqty:
-        description: 已定价量(现货)
+        description: 期初均价
         type: number
       reckondate:
         description: 日照时期(yyyyMMdd)
         type: string
       relatedmiddlegoodsamount:
-        description: 已关联额(期货)
+        description: 期初均价
         type: number
       relatedmiddlegoodsqty:
-        description: 已关联量(套保品种)(期货)
+        description: 期初均价
         type: number
       spotcontractid:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
       todayavgfutuprice:
-        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
+        description: 期初均价
         type: number
       todayavgprice:
-        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
+        description: 期初均价
         type: number
       todayavgprice2:
-        description: 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
+        description: 期初均价
         type: number
       todaypricedamount:
-        description: 今日定价额(现货)
+        description: 期初均价
         type: number
       todaypricedamount2:
-        description: 今日定价额(现货-基价额)
+        description: 期初均价
         type: number
       todaypricedqty:
-        description: 今日定价量(现货)
+        description: 期初均价
         type: number
       todayrelatedfutureqty:
-        description: 今日关联量(期货)
+        description: 期初均价
         type: number
       todayrelatedmiddlegoodsamount:
-        description: 今日关联额(期货)
+        description: 期初均价
         type: number
       todayrelatedmiddlegoodsqty:
-        description: 今日关联量(套保品-期货)
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -7261,7 +7257,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 增值税率
+        description: 期初均价
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -7669,7 +7665,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 平仓均价
+        description: 期初均价
         type: number
       closepl:
         description: 平仓损益
@@ -7720,7 +7716,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期末持仓量
+        description: 期初均价
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -7744,13 +7740,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 开仓均价
+        description: 期初均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初持仓量
+        description: 期初均价
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -7783,7 +7779,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 今平仓量
+        description: 期初均价
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -7795,7 +7791,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 今开仓量
+        description: 期初均价
         type: number
       userid:
         description: 账户所属用户ID
@@ -9027,8 +9023,7 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpRoleMenu'
+        $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -9255,8 +9250,7 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpTaAccountM'
+        $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -9726,6 +9720,72 @@ definitions:
     required:
     - resourcecode
     type: object
+  models.Fworderoperate:
+    properties:
+      advanceamount:
+        description: 总预付款
+        type: number
+      advanceproofaddr:
+        description: 预付款收款凭证(确认结算费用时)
+        type: string
+      bankfee:
+        description: 汇款银行手续费
+        type: number
+      bankproofaddr:
+        description: 广钻汇款银行手续费凭证(确认结算费用时)
+        type: string
+      customsproofaddr:
+        description: 海关税费保证金收据(确认结算费用时)
+        type: string
+      logisticsfee:
+        description: 代缴物流保险费
+        type: number
+      logisticsproofaddr:
+        description: 代缴物流保险费凭证(确认结算费用时)
+        type: string
+      operatetime:
+        description: 操作时间
+        type: string
+      operatoraccount:
+        description: 操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid
+        type: string
+      operatorid:
+        description: 操作人ID - systemmanager的autoid 或 loginaccount的loginid
+        type: integer
+      operatorname:
+        description: 操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid
+        type: string
+      operatorsrc:
+        description: 操作人来源 - 1:管理端 2:终端
+        type: integer
+      orderid:
+        description: 单据ID(804+Unix秒时间戳(10位)+xxxxxx)
+        type: string
+      otherfee:
+        description: 其它费用
+        type: number
+      remark:
+        description: 操作备注
+        type: string
+      servicefee:
+        description: 综合服务费
+        type: number
+      settleamount:
+        description: 总结算费用 - 实际扣除资金，不含税费保证金
+        type: number
+      status:
+        description: 操作后单据状态 -  枚举"GZBSStatus"
+        type: integer
+      taxmargin:
+        description: 税费保证金
+        type: number
+      totalfee:
+        description: 总费用 = 费用之和 (结算费用时不含税费保证金)
+        type: number
+    required:
+    - orderid
+    - status
+    type: object
   models.GErmcpspotgoodsprice:
     properties:
       chg:
@@ -10856,6 +10916,85 @@ definitions:
         description: 重量(CT)
         type: number
     type: object
+  models.Gzcjjcorderoperate:
+    properties:
+      advanceamount:
+        description: 总预付款
+        type: number
+      advanceproofaddr:
+        description: 预付检测费和海关税费银行凭证(确认结算费用时)
+        type: string
+      bankfee:
+        description: 汇款银行手续费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      bankproofaddr:
+        description: 广钻汇款银行手续费凭证(确认结算费用时)
+        type: string
+      customsfee:
+        description: 海关税费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      customsproofaddr:
+        description: 海关税费凭证(确认结算费用时)
+        type: string
+      exchangerate:
+        description: 汇率 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      giaproofaddr:
+        description: GIA检测费凭证(确认结算费用时)
+        type: string
+      giarmbfee:
+        description: GIA检测费(￥) [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      giausdfee:
+        description: GIA检测费(USD$) [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      logisticsfee:
+        description: 代缴物流保险费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      logisticsproofaddr:
+        description: 代缴物流保险费凭证(确认结算费用时)
+        type: string
+      operatetime:
+        description: 操作时间
+        type: string
+      operatoraccount:
+        description: 操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid
+        type: string
+      operatorid:
+        description: 操作人ID - systemmanager的autoid 或 loginaccount的loginid
+        type: integer
+      operatorname:
+        description: 操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid
+        type: string
+      operatorsrc:
+        description: 操作人来源 - 1:管理端 2:终端
+        type: integer
+      orderid:
+        description: 单据ID(801+Unix秒时间戳(10位)+xxxxxx)
+        type: string
+      otherfee:
+        description: 其它费用
+        type: number
+      remark:
+        description: 操作备注
+        type: string
+      servicefee:
+        description: 综合服务费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+        type: number
+      settleamount:
+        description: 总结算费用
+        type: number
+      status:
+        description: 操作后单据状态 -  枚举"GZCJStatus"
+        type: integer
+      totalfee:
+        description: 总费用 = GIA检测费(￥) + 海关税费 + 汇款银行手续费 + 代缴物流保险费 + 综合服务费  + 其它费用 [GZCJStatus
+          = 10.预付款确认中\13.付款确认中] 时
+        type: number
+    required:
+    - orderid
+    - status
+    type: object
   models.Gzrapaportprice:
     properties:
       dollar:
@@ -18341,8 +18480,7 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -18442,8 +18580,7 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       history:
         description: 历史价格走势（历史数据日线）
@@ -18622,8 +18759,7 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -19523,8 +19659,7 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        allOf:
-        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -19545,7 +19680,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -19596,7 +19731,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 转让数量(数量)
+        description: 期初均价
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -19641,7 +19776,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 冻结数量
+        description: 期初均价
         type: number
       goodscode:
         description: 商品代码
@@ -19668,7 +19803,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 持仓数量
+        description: 期初均价
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -19686,7 +19821,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 建仓数量
+        description: 期初均价
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -20493,13 +20628,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 挂牌价格
+        description: 期初均价
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 履约保证金比例
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -20634,7 +20769,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 成交均价
+        description: 期初均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -20822,7 +20957,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 交割均价 = 交割金额 / 交割数量
+        description: 期初均价
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -20909,7 +21044,7 @@ definitions:
         description: 合约数量
         type: number
       xgoodsamount:
-        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+        description: 期初均价
         type: number
       xgoodscode:
         description: 商品代码
@@ -21562,7 +21697,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 步骤值
+        description: 期初均价
         type: number
       templateid:
         description: 履约计划模板ID
@@ -21797,7 +21932,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 挂牌金额 = 委托数量 * 固定价或升贴水
+        description: 期初均价
         type: number
       bannerpicurl:
         description: Banner图
@@ -21842,10 +21977,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 冻结手续费
+        description: 期初均价
         type: number
       freezemargin:
-        description: 冻结保证金(保证金)
+        description: 期初均价
         type: number
       futupricemove:
         description: 期货升贴水
@@ -21872,7 +22007,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 保证金设置值(履约保证金)
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -22053,7 +22188,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverymonth:
         description: 交收月
@@ -22333,7 +22468,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 剩余款(待支付金额)
+        description: 期初均价
         type: number
       userid:
         description: 用户id
@@ -22745,7 +22880,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -22847,10 +22982,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 日成交金额(当日单方向成交金额)
+        description: 期初均价
         type: number
       tradeqty:
-        description: 日成交数量(当日单方向成交数量)
+        description: 期初均价
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -22977,7 +23112,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 未结费用
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -23413,7 +23548,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -25740,8 +25875,7 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        allOf:
-        - $ref: '#/definitions/models.Loginaccount'
+        $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -25754,12 +25888,10 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        allOf:
-        - $ref: '#/definitions/models.Useraccount'
+        $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        allOf:
-        - $ref: '#/definitions/models.Userinfo'
+        $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名
@@ -31469,6 +31601,39 @@ paths:
       summary: 钻石搜索
       tags:
       - 广钻
+  /Guangzuan/QueryFworderoperate:
+    get:
+      parameters:
+      - description: 单据ID
+        in: query
+        name: orderid
+        required: true
+        type: string
+      - description: 操作后单据状态
+        in: query
+        name: status
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.Fworderoperate'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      - LoginID: []
+      - Group: []
+      summary: 查询保税服务单据操作
+      tags:
+      - 广钻
   /Guangzuan/QueryGZBSFWOrder:
     get:
       parameters:
@@ -31665,6 +31830,39 @@ paths:
       summary: 查询出境检测单据明细（批次信息）
       tags:
       - 广钻
+  /Guangzuan/QueryGzcjjcorderoperate:
+    get:
+      parameters:
+      - description: 单据ID
+        in: query
+        name: orderid
+        required: true
+        type: string
+      - description: 操作后单据状态
+        in: query
+        name: status
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.Gzcjjcorderoperate'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      - LoginID: []
+      - Group: []
+      summary: 查询出境检测单据操作
+      tags:
+      - 广钻
   /Guangzuan/QueryMemberReport:
     get:
       parameters:

models/guangzuan.go

@@ -3318,3 +3318,159 @@ func (r *Reckongzmemtradesum) GetDataByPage() (interface{}, error, int, int, int
 	}
 	return sData, err, r.Page, r.PageSize, total
 }
+
+type Gzcjjcorderoperate struct {
+	ORDERID            string    `json:"orderid" xorm:"ORDERID" form:"orderid" binding:"required"`  // 单据ID(801+Unix秒时间戳(10位)+xxxxxx)
+	GZCJSTATUS         int32     `json:"status" xorm:"GZCJSTATUS" form:"status" binding:"required"` // 操作后单据状态 -  枚举"GZCJStatus"
+	OPERATORSRC        int32     `json:"operatorsrc" xorm:"OPERATORSRC"`                            // 操作人来源 - 1:管理端 2:终端
+	OPERATORID         int64     `json:"operatorid" xorm:"OPERATORID"`                              // 操作人ID - systemmanager的autoid 或 loginaccount的loginid
+	OPERATORACCOUNT    string    `json:"operatoraccount" xorm:"OPERATORACCOUNT"`                    // 操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid
+	OPERATORNAME       string    `json:"operatorname" xorm:"OPERATORNAME"`                          // 操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid
+	OPERATETIME        time.Time `json:"operatetime" xorm:"OPERATETIME"`                            // 操作时间
+	REMARK             string    `json:"remark" xorm:"REMARK"`                                      // 操作备注
+	GIAUSDFEE          float64   `json:"giausdfee" xorm:"GIAUSDFEE"`                                // GIA检测费(USD$) [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	EXCHANGERATE       float64   `json:"exchangerate" xorm:"EXCHANGERATE"`                          // 汇率 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	GIARMBFEE          float64   `json:"giarmbfee" xorm:"GIARMBFEE"`                                // GIA检测费(￥) [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	CUSTOMSFEE         float64   `json:"customsfee" xorm:"CUSTOMSFEE"`                              // 海关税费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	BANKFEE            float64   `json:"bankfee" xorm:"BANKFEE"`                                    // 汇款银行手续费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	LOGISTICSFEE       float64   `json:"logisticsfee" xorm:"LOGISTICSFEE"`                          // 代缴物流保险费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	SERVICEFEE         float64   `json:"servicefee" xorm:"SERVICEFEE"`                              // 综合服务费 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	OTHERFEE           float64   `json:"otherfee" xorm:"OTHERFEE"`                                  // 其它费用
+	TOTALFEE           float64   `json:"totalfee" xorm:"TOTALFEE"`                                  // 总费用 = GIA检测费(￥) + 海关税费 + 汇款银行手续费 + 代缴物流保险费 + 综合服务费  + 其它费用 [GZCJStatus = 10.预付款确认中\13.付款确认中] 时
+	LOGISTICSPROOFADDR string    `json:"logisticsproofaddr" xorm:"LOGISTICSPROOFADDR"`              // 代缴物流保险费凭证(确认结算费用时)
+	GIAPROOFADDR       string    `json:"giaproofaddr" xorm:"GIAPROOFADDR"`                          // GIA检测费凭证(确认结算费用时)
+	CUSTOMSPROOFADDR   string    `json:"customsproofaddr" xorm:"CUSTOMSPROOFADDR"`                  // 海关税费凭证(确认结算费用时)
+	BANKPROOFADDR      string    `json:"bankproofaddr" xorm:"BANKPROOFADDR"`                        // 广钻汇款银行手续费凭证(确认结算费用时)
+	ADVANCEPROOFADDR   string    `json:"advanceproofaddr" xorm:"ADVANCEPROOFADDR"`                  // 预付检测费和海关税费银行凭证(确认结算费用时)
+
+	SETTLEAMOUNT  float64 `json:"settleamount" xorm:"SETTLEAMOUNT"`   // 总结算费用
+	ADVANCEAMOUNT float64 `json:"advanceamount" xorm:"ADVANCEAMOUNT"` // 总预付款
+}
+
+func (r *Gzcjjcorderoperate) calc() {
+
+}
+
+func (r *Gzcjjcorderoperate) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT
+		to_char(t.ORDERID) ORDERID,
+		t.GZCJSTATUS,
+		t.OPERATORSRC,
+		t.OPERATORID,
+		t.OPERATORACCOUNT,
+		t.OPERATORNAME,
+		to_char(t.OPERATETIME, 'yyyy-mm-dd hh24:mi:ss') OPERATETIME,
+		t.REMARK,
+		t.GIAUSDFEE,
+		t.EXCHANGERATE,
+		t.GIARMBFEE,
+		t.CUSTOMSFEE,
+		t.BANKFEE,
+		t.LOGISTICSFEE,
+		t.SERVICEFEE,
+		t.OTHERFEE,
+		t.TOTALFEE,
+		t.LOGISTICSPROOFADDR,
+		t.GIAPROOFADDR,
+		t.CUSTOMSPROOFADDR,
+		t.BANKPROOFADDR,
+		t.ADVANCEPROOFADDR,
+		c.SETTLEAMOUNT,
+  		c.ADVANCEAMOUNT
+	FROM GZ_CJJCOrderOperate t
+	LEFT JOIN GZ_CJJCOrder c ON c.orderid = t.orderid
+	WHERE t.gzcjstatus = %v AND t.orderid = %v
+	`
+	sqlId.FormatParam(r.GZCJSTATUS, r.ORDERID)
+
+	return sqlId.String()
+}
+
+// GetDataEx 从数据库中查询数据
+func (r *Gzcjjcorderoperate) GetDataEx() (interface{}, error) {
+	e := db.GetEngine()
+	s := e.SQL(r.buildSql())
+	sData := make([]Gzcjjcorderoperate, 0)
+	if err := s.Find(&sData); err != nil {
+		return nil, err
+	}
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, nil
+}
+
+type Fworderoperate struct {
+	ORDERID            string  `json:"orderid" xorm:"ORDERID" form:"orderid" binding:"required"`  // 单据ID(804+Unix秒时间戳(10位)+xxxxxx)
+	GZBSSTATUS         int32   `json:"status" xorm:"GZBSSTATUS" form:"status" binding:"required"` // 操作后单据状态 -  枚举"GZBSStatus"
+	OPERATORSRC        int32   `json:"operatorsrc" xorm:"OPERATORSRC"`                            // 操作人来源 - 1:管理端 2:终端
+	OPERATORID         int64   `json:"operatorid" xorm:"OPERATORID"`                              // 操作人ID - systemmanager的autoid 或 loginaccount的loginid
+	OPERATORACCOUNT    string  `json:"operatoraccount" xorm:"OPERATORACCOUNT"`                    // 操作人账号 - systemmanager的logincode 或 loginaccount的logincode,无则用loginid
+	OPERATORNAME       string  `json:"operatorname" xorm:"OPERATORNAME"`                          // 操作人名称 - systemmanager的username 或 loginaccount的logincode,无则用loginid
+	OPERATETIME        string  `json:"operatetime" xorm:"OPERATETIME"`                            // 操作时间
+	REMARK             string  `json:"remark" xorm:"REMARK"`                                      // 操作备注
+	TAXMARGIN          float64 `json:"taxmargin" xorm:"TAXMARGIN"`                                // 税费保证金
+	BANKFEE            float64 `json:"bankfee" xorm:"BANKFEE"`                                    // 汇款银行手续费
+	LOGISTICSFEE       float64 `json:"logisticsfee" xorm:"LOGISTICSFEE"`                          // 代缴物流保险费
+	SERVICEFEE         float64 `json:"servicefee" xorm:"SERVICEFEE"`                              // 综合服务费
+	OTHERFEE           float64 `json:"otherfee" xorm:"OTHERFEE"`                                  // 其它费用
+	TOTALFEE           float64 `json:"totalfee" xorm:"TOTALFEE"`                                  // 总费用 = 费用之和 (结算费用时不含税费保证金)
+	LOGISTICSPROOFADDR string  `json:"logisticsproofaddr" xorm:"LOGISTICSPROOFADDR"`              // 代缴物流保险费凭证(确认结算费用时)
+	BANKPROOFADDR      string  `json:"bankproofaddr" xorm:"BANKPROOFADDR"`                        // 广钻汇款银行手续费凭证(确认结算费用时)
+	CUSTOMSPROOFADDR   string  `json:"customsproofaddr" xorm:"CUSTOMSPROOFADDR"`                  // 海关税费保证金收据(确认结算费用时)
+	ADVANCEPROOFADDR   string  `json:"advanceproofaddr" xorm:"ADVANCEPROOFADDR"`                  // 预付款收款凭证(确认结算费用时)
+
+	ADVANCEAMOUNT float64 `json:"advanceamount" xorm:"ADVANCEAMOUNT"` // 总预付款
+	SETTLEAMOUNT  float64 `json:"settleamount" xorm:"SETTLEAMOUNT"`   // 总结算费用 - 实际扣除资金，不含税费保证金
+}
+
+func (r *Fworderoperate) calc() {
+
+}
+
+func (r *Fworderoperate) buildSql() string {
+	var sqlId utils.SQLVal = `
+	SELECT
+		to_char(t.ORDERID) ORDERID,
+		t.GZBSSTATUS,
+		t.OPERATORSRC,
+		t.OPERATORID,
+		t.OPERATORACCOUNT,
+		t.OPERATORNAME,
+		to_char(t.OPERATETIME, 'yyyy-mm-dd hh24:mi:ss') OPERATETIME,
+		t.REMARK,
+		t.TAXMARGIN,
+		t.BANKFEE,
+		t.LOGISTICSFEE,
+		t.SERVICEFEE,
+		t.OTHERFEE,
+		t.TOTALFEE,
+		t.LOGISTICSPROOFADDR,
+		t.BANKPROOFADDR,
+		t.CUSTOMSPROOFADDR,
+		t.ADVANCEPROOFADDR,
+		c.ADVANCEAMOUNT,
+		c.SETTLEAMOUNT
+	FROM GZ_BSFWORDEROPERATE t
+	LEFT JOIN GZ_BSFWOrder c ON c.orderid = t.orderid
+	WHERE t.GZBSSTATUS = %v AND t.orderid = %v
+	`
+	sqlId.FormatParam(r.GZBSSTATUS, r.ORDERID)
+
+	return sqlId.String()
+}
+
+// GetDataEx 从数据库中查询数据
+func (r *Fworderoperate) GetDataEx() (interface{}, error) {
+	e := db.GetEngine()
+	s := e.SQL(r.buildSql())
+	sData := make([]Fworderoperate, 0)
+	if err := s.Find(&sData); err != nil {
+		return nil, err
+	}
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, nil
+}

routers/router.go

@@ -684,6 +684,8 @@ func InitRouter() *gin.Engine {
 		guangzuanR.GET("QueryMemberReport", guangzuan.QueryMemberReport)
 		guangzuanR.GET("QueryWRPositionReport", guangzuan.QueryWRPositionReport)
 		guangzuanR.GET("QueryTradeReport", guangzuan.QueryTradeReport)
+		guangzuanR.GET("QueryGzcjjcorderoperate", guangzuan.QueryGzcjjcorderoperate)
+		guangzuanR.GET("QueryFworderoperate", guangzuan.QueryFworderoperate)
 	}
 
 	// **************************上海铁合金*************************