zhou.xiaoning 2 yıl önce
ebeveyn
işleme
07509157b7
2 değiştirilmiş dosya ile 75 ekleme ve 66 silme
  1. 4 4
      controllers/guangzuan/tradeService.go
  2. 71 62
      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]

+ 71 - 62
models/zhongrong.go

@@ -66,32 +66,42 @@ func (r *InTradepositiontransfer) buildSql() string {
 		vlogin.LOGINIDS || '/' || ui.customername as OUTUSERNAME,
 		en.enumdicname as APPLYSTATUS,
 		to_char(t.applyid) APPLYID,
-		t.outaccountid,
-		t.inaccountid,
-		t.marketid,
-		t.transferprice,
-		t.transferapplystatus,
-		t.freezedays,
-		t.applyremark,
-		t.retremark,
-		t.tradedate,
-		t.applicantid,
-		to_char(t.applytime, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME,
-		t.transfertype,
-		t.transferamount,
-		t.goodscuramount,
-		t.openfeealgorithm,
-		t.openmemberchargevalue,
-		t.openexchagechargevalue,
-		t.closefeealgorithm,
-		t.closememberchargevalue,
-		t.closeexchagechargevalue,
-		t.outcharge,
-		t.incharge,
-		t.confirmdate,
-		t.auditorid,
-		t.audittime,
-		t.auditremark
+		to_char(t.applytime, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME,    
+		t.OUTUSERID              ,
+		t.OUTLOGINID             ,
+		t.OUTACCOUNTID           ,
+		t.INUSERID               ,
+		t.INACCOUNTID            ,
+		t.INLOGINID              ,
+		t.GOODSID                ,
+		t.MARKETID               ,
+		t.BUYORSELL              ,
+		t.QTY                    ,
+		t.TRANSFERPRICE          ,
+		t.TRANSFERAPPLYSTATUS    ,
+		t.FREEZEDAYS             ,
+		t.APPLYREMARK            ,
+		t.RETREMARK              ,
+		t.RETCODE                ,
+		t.TRADEDATE              ,
+		t.APPLICANTID            ,
+		t.TRANSFERTYPE           ,
+		t.TRANSFERAMOUNT         ,
+		t.GOODSCURPRICE          ,
+		t.GOODSCURAMOUNT         ,
+		t.OPENFEEALGORITHM       ,
+		t.OPENMEMBERCHARGEVALUE  ,
+		t.OPENEXCHAGECHARGEVALUE ,
+		t.CLOSEFEEALGORITHM      ,
+		t.CLOSEMEMBERCHARGEVALUE ,
+		t.CLOSEEXCHAGECHARGEVALUE,
+		t.OUTCHARGE              ,
+		t.INCHARGE               ,
+		t.CONFIRMDATE            ,
+		t.AUDITORID              ,
+		t.AUDITTIME              ,
+		t.AUDITREMARK            ,
+		t.CLIENTTICKET           
 	from Trade_PositionTransfer t
 	left join goods g
 		on t.goodsid = g.goodsid
@@ -182,42 +192,41 @@ func (r *OutTradepositiontransfer) buildSql() string {
 		vlogin.LOGINIDS || '/' || ui.customername as INUSERNAME,
 		en.enumdicname as APPLYSTATUS,
 		to_char(t.applyid) APPLYID,
-		t.outuserid,
-		t.outloginid,
-		t.outaccountid,
-		t.inuserid,
-		t.inaccountid,
-		t.inloginid,
-		t.goodsid,
-		t.marketid,
-		t.buyorsell,
-		t.qty,
-		t.transferprice,
-		t.transferapplystatus,
-		t.freezedays,
-		t.applyremark,
-		t.retremark,
-		t.retcode,
-		t.tradedate,
-		t.applicantid,
-		to_char(t.applytime, 'yyyy-mm-dd hh24:mi:ss') APPLYTIME,
-		t.transfertype,
-		t.transferamount,
-		t.goodscurprice,
-		t.goodscuramount,
-		t.openfeealgorithm,
-		t.openmemberchargevalue,
-		t.openexchagechargevalue,
-		t.closefeealgorithm,
-		t.closememberchargevalue,
-		t.closeexchagechargevalue,
-		t.outcharge,
-		t.incharge,
-		t.confirmdate,
-		t.auditorid,
-		t.audittime,
-		t.auditremark,
-		t.clientticket
+		t.OUTUSERID              ,
+		t.OUTLOGINID             ,
+		t.OUTACCOUNTID           ,
+		t.INUSERID               ,
+		t.INACCOUNTID            ,
+		t.INLOGINID              ,
+		t.GOODSID                ,
+		t.MARKETID               ,
+		t.BUYORSELL              ,
+		t.QTY                    ,
+		t.TRANSFERPRICE          ,
+		t.TRANSFERAPPLYSTATUS    ,
+		t.FREEZEDAYS             ,
+		t.APPLYREMARK            ,
+		t.RETREMARK              ,
+		t.RETCODE                ,
+		t.TRADEDATE              ,
+		t.APPLICANTID            ,
+		t.TRANSFERTYPE           ,
+		t.TRANSFERAMOUNT         ,
+		t.GOODSCURPRICE          ,
+		t.GOODSCURAMOUNT         ,
+		t.OPENFEEALGORITHM       ,
+		t.OPENMEMBERCHARGEVALUE  ,
+		t.OPENEXCHAGECHARGEVALUE ,
+		t.CLOSEFEEALGORITHM      ,
+		t.CLOSEMEMBERCHARGEVALUE ,
+		t.CLOSEEXCHAGECHARGEVALUE,
+		t.OUTCHARGE              ,
+		t.INCHARGE               ,
+		t.CONFIRMDATE            ,
+		t.AUDITORID              ,
+		t.AUDITTIME              ,
+		t.AUDITREMARK            ,
+		t.CLIENTTICKET
 	from Trade_PositionTransfer t
 	left join goods g
 	on t.goodsid = g.goodsid