|
|
@@ -133,7 +133,7 @@ type QueryAmountLogRsp struct {
|
|
|
// @Param pagesize query int false "每页条数"
|
|
|
// @Param pageflag query int false "分页标志 0-page从0开始 1-page从1开始"
|
|
|
// @Param accountID query string true "资金账户 - 格式：1,2,3"
|
|
|
-// @Param OperateType query string false "资金操作类型 - 格式：1,2,3"
|
|
|
+// @Param OperateType query string false "资金操作类型 - 格式：1,2,3" --改为使用accountBusinesscode
|
|
|
// @Success 200 {object} QueryAmountLogRsp
|
|
|
// @Failure 500 {object} app.Response
|
|
|
// @Router /TaAccount/QueryAmountLog [get]
|
|
|
@@ -154,7 +154,7 @@ func QueryAmountLog(c *gin.Context) {
|
|
|
datas := make([]QueryAmountLogRsp, 0)
|
|
|
engine := db.GetEngine()
|
|
|
s := engine.Table("TAACCOUNTLOG").
|
|
|
- Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = TAACCOUNTLOG.OPERATETYPE").
|
|
|
+ Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 67 and ENUMDICITEM.ENUMITEMNAME = TAACCOUNTLOG.ACCOUNTBUSINESSCODE").
|
|
|
Join("LEFT", "MARKET", "MARKET.MARKETID = TAACCOUNTLOG.MARKETID").
|
|
|
Join("LEFT", "GOODS", "GOODS.GOODSID = TAACCOUNTLOG.GOODSID").
|
|
|
Join("LEFT", "AUCTION_ORDERINFO", "AUCTION_ORDERINFO.GOODSID = TAACCOUNTLOG.GOODSID").
|
|
|
@@ -167,7 +167,7 @@ func QueryAmountLog(c *gin.Context) {
|
|
|
ENUMDICITEM.ENUMDICNAME AS OPERATETYPENAME`).
|
|
|
Where(fmt.Sprintf("TAACCOUNTLOG.AMOUNT <> 0 and TAACCOUNTLOG.ACCOUNTID in (%s)", req.AccountID)).Desc("TAACCOUNTLOG.AUTOID")
|
|
|
if len(req.OperateType) > 0 {
|
|
|
- s = s.And(fmt.Sprintf("TAACCOUNTLOG.OPERATETYPE in (%s)", req.OperateType))
|
|
|
+ s = s.And(fmt.Sprintf("TAACCOUNTLOG.ACCOUNTBUSINESSCODE in (%s)", req.OperateType))
|
|
|
}
|
|
|
if err := s.Find(&datas); err != nil {
|
|
|
// 查询失败
|
|
|
@@ -267,7 +267,7 @@ func QueryHisAmountLog(c *gin.Context) {
|
|
|
datas := make([]QueryHisAmountLogRsp, 0)
|
|
|
engine := db.GetEngine()
|
|
|
s := engine.Table("HIS_TAACCOUNTLOG").
|
|
|
- Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 39 and ENUMDICITEM.ENUMITEMNAME = HIS_TAACCOUNTLOG.OPERATETYPE").
|
|
|
+ Join("INNER", "ENUMDICITEM", "ENUMDICITEM.ENUMITEMSTATUS = 1 and ENUMDICITEM.ENUMDICID = 67 and ENUMDICITEM.ENUMITEMNAME = HIS_TAACCOUNTLOG.ACCOUNTBUSINESSCODE").
|
|
|
Join("LEFT", "MARKET", "MARKET.MARKETID = HIS_TAACCOUNTLOG.MARKETID").
|
|
|
Join("LEFT", "GOODS", "GOODS.GOODSID = HIS_TAACCOUNTLOG.GOODSID").
|
|
|
Join("LEFT", "HIS_AUCTION_ORDERINFO", "HIS_AUCTION_ORDERINFO.GOODSID = HIS_TAACCOUNTLOG.GOODSID and HIS_AUCTION_ORDERINFO.ISVALIDDATA = 1").
|
|
|
@@ -280,7 +280,7 @@ func QueryHisAmountLog(c *gin.Context) {
|
|
|
ENUMDICITEM.ENUMDICNAME AS OPERATETYPENAME`).
|
|
|
Where(fmt.Sprintf(`HIS_TAACCOUNTLOG.ISVALIDDATA = 1 and HIS_TAACCOUNTLOG.AMOUNT <> 0 and HIS_TAACCOUNTLOG.ACCOUNTID in (%s)`, req.AccountID)).Desc("HIS_TAACCOUNTLOG.AUTOID")
|
|
|
if len(req.OperateType) > 0 {
|
|
|
- s = s.And(fmt.Sprintf("HIS_TAACCOUNTLOG.OPERATETYPE in (%s)", req.OperateType))
|
|
|
+ s = s.And(fmt.Sprintf("HIS_TAACCOUNTLOG.ACCOUNTBUSINESSCODE in (%s)", req.OperateType))
|
|
|
}
|
|
|
if len(req.StartDate) > 0 {
|
|
|
s = s.And(fmt.Sprintf("to_date(HIS_TAACCOUNTLOG.HISTRADEDATE,'yyyyMMdd') >= to_date('%s','yyyy-MM-dd')", req.StartDate))
|
