liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tomap

Browse Source
This commit is contained in:
richboo111
2022-11-22 15:02:11 +08:00
parent e339d88d21
commit 2a4ad90394
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
business/model/dao/dao_order.go
View File

@@ -2,7 +2,6 @@ package dao
import ( import (
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals"
"regexp" "regexp"
"strconv" "strconv"
"time" "time"
@@ -940,7 +939,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
} else { } else {
sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")" sqlWhere += " AND IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) IN (" + GenQuestionMarks(len(storeIDs)) + ")"
sqlParams = append(sqlParams, storeIDs) sqlParams = append(sqlParams, storeIDs)
globals.SugarLogger.Debugf("sqlParams storeIDs========%d", storeIDs) //globals.SugarLogger.Debugf("sqlParams storeIDs========%d", storeIDs)
} }
} }
} }
@@ -952,7 +951,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if len(statuss) > 0 { if len(statuss) > 0 {
sqlWhere += " AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")" sqlWhere += " AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")"
sqlParams = append(sqlParams, statuss) sqlParams = append(sqlParams, statuss)
globals.SugarLogger.Debugf("sqlParams statuss===========%d", statuss) //globals.SugarLogger.Debugf("sqlParams statuss===========%d", statuss)
} }
} }
if params["lockStatuss"] != nil { if params["lockStatuss"] != nil {
@@ -1024,7 +1023,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if params["adjustCount"] != nil { if params["adjustCount"] != nil {
sqlWhere += " AND t1.adjust_count >= ?" sqlWhere += " AND t1.adjust_count >= ?"
sqlParams = append(sqlParams, params["adjustCount"]) sqlParams = append(sqlParams, params["adjustCount"])
globals.SugarLogger.Debugf("sqlParams params[adjustCount]=========%d", params["adjustCount"]) //globals.SugarLogger.Debugf("sqlParams params[adjustCount]=========%d", params["adjustCount"])
} }
if mustInvoice, ok := params["mustInvoice"].(bool); ok && mustInvoice { if mustInvoice, ok := params["mustInvoice"].(bool); ok && mustInvoice {
sqlWhere += " AND t1.invoice_taxer_id <> ''" sqlWhere += " AND t1.invoice_taxer_id <> ''"
@@ -1038,7 +1037,7 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
if len(vendorIDs) > 0 { if len(vendorIDs) > 0 {
sqlWhere += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")" sqlWhere += " AND t1.vendor_id IN (" + GenQuestionMarks(len(vendorIDs)) + ")"
sqlParams = append(sqlParams, vendorIDs) sqlParams = append(sqlParams, vendorIDs)
globals.SugarLogger.Debugf("sqlParams vendorIDs================%d", vendorIDs) //globals.SugarLogger.Debugf("sqlParams vendorIDs================%d", vendorIDs)
} }
} }
if userID != "" { if userID != "" {
@@ -1064,14 +1063,14 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat
) a WHERE 1 = 1` ) a WHERE 1 = 1`
if params["jxIncomeBegin"] != nil { if params["jxIncomeBegin"] != nil {
globals.SugarLogger.Debugf("test begin====%d", utils.MustInterface2Int64(params["jxIncomeBegin"])) //globals.SugarLogger.Debugf("test begin====%d", utils.MustInterface2Int64(params["jxIncomeBegin"]))
//if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 { //if utils.MustInterface2Int64(params["jxIncomeBegin"]) != 0 {
sql += " AND a.jx_income >= ?" sql += " AND a.jx_income >= ?"
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeBegin"])) sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeBegin"]))
//} //}
} }
if params["jxIncomeEnd"] != nil { if params["jxIncomeEnd"] != nil {
globals.SugarLogger.Debugf("test end=====%d", utils.MustInterface2Int64(params["jxIncomeEnd"])) //globals.SugarLogger.Debugf("test end=====%d", utils.MustInterface2Int64(params["jxIncomeEnd"]))
//if utils.MustInterface2Int64(params["jxIncomeEnd"]) != 0 { //if utils.MustInterface2Int64(params["jxIncomeEnd"]) != 0 {
sql += " AND a.jx_income <= ?" sql += " AND a.jx_income <= ?"
sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"])) sqlParams = append(sqlParams, utils.MustInterface2Int64(params["jxIncomeEnd"]))

1
controllers/cms_store.go
View File

@@ -1519,6 +1519,7 @@ func (c *StoreController) GetDDScope() {
// @router /CreateDDStoreFence [post] // @router /CreateDDStoreFence [post]
func (c *StoreController) CreateDDStoreFence() { func (c *StoreController) CreateDDStoreFence() {
c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (retVal interface{}, errCode string, err error) { c.callCreateDDStoreFence(func(params *tStoreCreateDDStoreFenceParams) (retVal interface{}, errCode string, err error) {
globals.SugarLogger.Debugf("进入callCreateDDStoreFence")
payload := make(map[string]map[string]string) payload := make(map[string]map[string]string)
info := make(map[string]map[string]string) info := make(map[string]map[string]string)
if result, err := utils.Unmarshal2Map([]byte(params.Payload), &payload); err == nil { if result, err := utils.Unmarshal2Map([]byte(params.Payload), &payload); err == nil {