浏览代码

处理单号失真问题

zhou.xiaoning 2 年之前
父节点
当前提交
e27f44ea59
共有 5 个文件被更改,包括 14 次插入14 次删除
  1. 4 4
      controllers/guangzuan/tradeService.go
  2. 2 2
      docs/docs.go
  3. 2 2
      docs/swagger.json
  4. 2 2
      docs/swagger.yaml
  5. 4 4
      models/zhongrong.go

+ 4 - 4
controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

+ 2 - 2
docs/docs.go

@@ -40364,7 +40364,7 @@ const docTemplate = `{
                 },
                 "applyid": {
                     "description": "申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "applyremark": {
                     "description": "申请备注",
@@ -44736,7 +44736,7 @@ const docTemplate = `{
                 },
                 "applyid": {
                     "description": "申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "applyremark": {
                     "description": "申请备注",

+ 2 - 2
docs/swagger.json

@@ -40355,7 +40355,7 @@
                 },
                 "applyid": {
                     "description": "申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "applyremark": {
                     "description": "申请备注",
@@ -44727,7 +44727,7 @@
                 },
                 "applyid": {
                     "description": "申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "applyremark": {
                     "description": "申请备注",

+ 2 - 2
docs/swagger.yaml

@@ -13330,7 +13330,7 @@ definitions:
         type: integer
       applyid:
         description: 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
+        type: string
       applyremark:
         description: 申请备注
         type: string
@@ -16560,7 +16560,7 @@ definitions:
         type: integer
       applyid:
         description: 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
+        type: string
       applyremark:
         description: 申请备注
         type: string

+ 4 - 4
models/zhongrong.go

@@ -10,7 +10,7 @@ import (
 
 // Tradepositiontransfer 持仓过户申请表 - 16所有权(中融需求)
 type InTradepositiontransfer struct {
-	APPLYID                 int64     `json:"applyid" xorm:"APPLYID"`                                    // 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	APPLYID                 string    `json:"applyid" xorm:"APPLYID"`                                    // 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	OUTUSERID               int64     `json:"outuserid" xorm:"OUTUSERID"`                                // 转出方用户ID(申请方)
 	OUTLOGINID              int64     `json:"outloginid" xorm:"OUTLOGINID"`                              // 转出方登录账号
 	OUTACCOUNTID            int64     `json:"outaccountid" xorm:"OUTACCOUNTID"`                          // 转出方资金ID(申请方)
@@ -65,7 +65,7 @@ func (r *InTradepositiontransfer) buildSql() string {
 		g.goodscode || '/' || g.goodsname as GOODSDISPLAY,
 		vlogin.LOGINIDS || '/' || ui.customername as OUTUSERNAME,
 		en.enumdicname as APPLYSTATUS,
-		t.applyid,
+		to_char(t.applyid) APPLYID,
 		t.outaccountid,
 		t.inaccountid,
 		t.marketid,
@@ -126,7 +126,7 @@ func (r *InTradepositiontransfer) GetDataByPage() (interface{}, error, int, int,
 
 // OutTradepositiontransfer 持仓过户申请表 - 16所有权(中融需求)
 type OutTradepositiontransfer struct {
-	APPLYID                 int64     `json:"applyid" xorm:"APPLYID"`                                      // 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	APPLYID                 string    `json:"applyid" xorm:"APPLYID"`                                      // 申请ID(185+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
 	OUTUSERID               int64     `json:"outuserid" xorm:"OUTUSERID" form:"userid" binding:"required"` // 转出方用户ID(申请方)
 	OUTLOGINID              int64     `json:"outloginid" xorm:"OUTLOGINID"`                                // 转出方登录账号
 	OUTACCOUNTID            int64     `json:"outaccountid" xorm:"OUTACCOUNTID"`                            // 转出方资金ID(申请方)
@@ -181,7 +181,7 @@ func (r *OutTradepositiontransfer) buildSql() string {
 		g.goodscode || '/' || g.goodsname as GOODSDISPLAY,
 		vlogin.LOGINIDS || '/' || ui.customername as INUSERNAME,
 		en.enumdicname as APPLYSTATUS,
-		t.applyid,
+		to_char(t.applyid) APPLYID,
 		t.outuserid,
 		t.outloginid,
 		t.outaccountid,