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

- skuName place bind man.

Browse Source
This commit is contained in:
gazebo
2018-09-12 23:15:54 +08:00
parent ecd19c55b3
commit f14112c030
14 changed files with 173 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
business/model/dao/dao.go
View File

@@ -180,8 +180,18 @@ func CreateEntity(db *DaoDB, item interface{}) (err error) {
return err
}
// 如果logicDeletedBy不为空，表示逻辑删除，否则物理删除
func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}, logicDeletedBy string, kvs map[string]interface{}) (num int64, err error) {
func DeleteEntity(db *DaoDB, item interface{}, cols ...string) (num int64, err error) {
if db == nil {
db = GetDB()
}
err = utils.CallFuncLogError(func() error {
num, err = db.db.Delete(item, cols...)
return err
}, reflect.TypeOf(item).Name())
return num, err
}
func DeleteEntityLogically(db *DaoDB, item interface{}, conditions map[string]interface{}, logicDeletedBy string, kvs map[string]interface{}) (num int64, err error) {
if db == nil {
db = GetDB()
}
@@ -194,17 +204,13 @@ func DeleteEntity(db *DaoDB, item interface{}, conditions map[string]interface{}
qs = qs.Filter(k, v)
}
}
if logicDeletedBy != "" {
qs = qs.Filter(model.FieldDeletedAt, utils.DefaultTimeValue)
updateValues := map[string]interface{}{
model.FieldDeletedAt: time.Now(),
model.FieldUpdatedAt: time.Now(),
model.FieldLastOperator: logicDeletedBy,
}
num, err = qs.Update(utils.MergeMaps(updateValues, kvs))
} else {
num, err = qs.Delete()
qs = qs.Filter(model.FieldDeletedAt, utils.DefaultTimeValue)
updateValues := map[string]interface{}{
model.FieldDeletedAt: time.Now(),
model.FieldUpdatedAt: time.Now(),
model.FieldLastOperator: logicDeletedBy,
}
num, err = qs.Update(utils.MergeMaps(updateValues, kvs))
return err
}, reflect.TypeOf(item).Name())
return num, err

2
business/model/dao/dao_test.go
View File

@@ -27,7 +27,7 @@ func TestSelectEntities(t *testing.T) {
FROM sku_name_place_bind t1
JOIN place t2 ON t1.place_code = t2.code
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
WHERE t1.sku_name_id = ?
WHERE t1.name_id = ?
`, 40)
globals.SugarLogger.Debug(utils.Format4Output(places, false))

4
business/model/dao/place.go
View File

@@ -12,7 +12,7 @@ func GetPlaceByCode(db *DaoDB, code int) (place *model.Place, err error) {
place = &model.Place{
Code: code,
}
err = db.db.Read(place, "Code")
err = GetEntity(db, place, "Code")
return place, err
}
@@ -25,7 +25,7 @@ func GetPlaceByName(db *DaoDB, name string, level int, parentCode int) (place *m
Level: int8(level),
ParentCode: parentCode,
}
if err = db.db.Read(place, "Name", "Level", "ParentCode"); err == orm.ErrNoRows {
if err = GetEntity(db, place, "Name", "Level", "ParentCode"); err == orm.ErrNoRows {
err = db.db.Raw("SELECT * FROM place WHERE parent_code = ? AND level = ? AND name LIKE ?", parentCode, level, "%"+name+"%").QueryRow(place)
}
return place, err

6
business/model/dao/sku.go
View File

@@ -4,17 +4,17 @@ import (
"git.rosy.net.cn/jx-callback/business/model"
)
func GetSellCities(db *DaoDB, skuNameID int, vendorID int) (cities []*model.Place, err error) {
func GetSellCities(db *DaoDB, nameID int, vendorID int) (cities []*model.Place, err error) {
cities = []*model.Place{}
sql := `
SELECT DISTINCT t3.*
FROM sku_name_place_bind t1
JOIN place t2 ON t1.place_code = t2.code
JOIN place t3 ON (t2.level = 2 AND t2.code = t3.code) OR (t2.level = 1 AND t2.code = t3.parent_code)
WHERE t1.sku_name_id = ?
WHERE t1.name_id = ?
`
if vendorID == model.VendorIDJD {
sql += "AND t3.jd_code <> 0\n"
}
return cities, GetRows(db, &cities, sql, skuNameID)
return cities, GetRows(db, &cities, sql, nameID)
}