commit

controllers/erms3/spotContract.go

@@ -94,9 +94,7 @@ type AddSpotContractApplyReq struct {
 	CustomerUserID     int32                `json:"customeruserid" binding:"required"`    // 客户ID
 	CustomerAccountID  int64                `json:"customeraccountid" binding:"required"` // 客户资金账户ID
 	SignDate           string               `json:"signdate" binding:"required"`          // 签订日期
-	LastDate           string               `json:"lastdate"`                             // 交货时间
 	ContractAttachment string               `json:"contractattachment"`                   // 合同附件
-	OriMarginPayer     int32                `json:"orimarginpayer" binding:"required"`    // 初始保证金支付方 -1:买方 2:卖方
 	OriMargin          float64              `json:"orimargin" binding:"required"`         // 初始保证金
 	Remark             string               `json:"remark"`                               // 备注
 	CreatorID          int32                `json:"creatorid"`                            // 申请人
@@ -162,9 +160,7 @@ func AddSpotContractApply(c *gin.Context) {
 		CustomerUserID:     req.CustomerUserID,
 		CustomerAccountID:  req.CustomerAccountID,
 		SignDate:           req.SignDate,
-		LastDate:           req.LastDate,
 		ContractAttachment: req.ContractAttachment,
-		OriMarginPayer:     req.OriMarginPayer,
 		OriMargin:          req.OriMargin,
 		Remark:             req.Remark,
 		DetailJSON:         detailjson,

docs/docs.go

@@ -4520,7 +4520,6 @@ var doc = `{
                 "customeruserid",
                 "details",
                 "orimargin",
-                "orimarginpayer",
                 "signdate"
             ],
             "properties": {
@@ -4563,18 +4562,10 @@ var doc = `{
                         "$ref": "#/definitions/erms3.SoptContractDetail"
                     }
                 },
-                "lastdate": {
-                    "description": "交货时间",
-                    "type": "string"
-                },
                 "orimargin": {
                     "description": "初始保证金",
                     "type": "number"
                 },
-                "orimarginpayer": {
-                    "description": "初始保证金支付方 -1:买方 2:卖方",
-                    "type": "integer"
-                },
                 "remark": {
                     "description": "备注",
                     "type": "string"

docs/swagger.json

@@ -4504,7 +4504,6 @@
                 "customeruserid",
                 "details",
                 "orimargin",
-                "orimarginpayer",
                 "signdate"
             ],
             "properties": {
@@ -4547,18 +4546,10 @@
                         "$ref": "#/definitions/erms3.SoptContractDetail"
                     }
                 },
-                "lastdate": {
-                    "description": "交货时间",
-                    "type": "string"
-                },
                 "orimargin": {
                     "description": "初始保证金",
                     "type": "number"
                 },
-                "orimarginpayer": {
-                    "description": "初始保证金支付方 -1:买方 2:卖方",
-                    "type": "integer"
-                },
                 "remark": {
                     "description": "备注",
                     "type": "string"

docs/swagger.yaml

@@ -1229,15 +1229,9 @@ definitions:
         items:
           $ref: '#/definitions/erms3.SoptContractDetail'
         type: array
-      lastdate:
-        description: 交货时间
-        type: string
       orimargin:
         description: 初始保证金
         type: number
-      orimarginpayer:
-        description: 初始保证金支付方 -1:买方 2:卖方
-        type: integer
       remark:
         description: 备注
         type: string
@@ -1253,7 +1247,6 @@ definitions:
     - customeruserid
     - details
     - orimargin
-    - orimarginpayer
     - signdate
     type: object
   erms3.AddSpotContractApplyRsp:

models/erms3.go

@@ -115,9 +115,7 @@ func AddSpotContractApply(spotContractApply Erms3SpotContractApply) error {
 			  CUSTOMERUSERID,
 			  CUSTOMERACCOUNTID,
 			  SIGNDATE,
-			  LASTDATE,
 			  CONTRACTATTACHMENT,
-			  ORIMARGINPAYER,
 			  ORIMARGIN,
 			  REMARK,
 			  DETAILJSON,
@@ -134,8 +132,6 @@ func AddSpotContractApply(spotContractApply Erms3SpotContractApply) error {
 				?,
 				?,
 				to_date(?, 'YYYY-MM-DD HH24:MI:SS'),
-				to_date(?, 'YYYY-MM-DD HH24:MI:SS'),
-				?,
 				?,
 				?,
 				?,
@@ -154,9 +150,7 @@ func AddSpotContractApply(spotContractApply Erms3SpotContractApply) error {
 		spotContractApply.CustomerUserID,
 		spotContractApply.CustomerAccountID,
 		spotContractApply.SignDate,
-		spotContractApply.LastDate,
 		spotContractApply.ContractAttachment,
-		spotContractApply.OriMarginPayer,
 		spotContractApply.OriMargin,
 		spotContractApply.Remark,
 		spotContractApply.DetailJSON,