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

- all db orm use beego orm, don't use gorm anymore.

Browse Source
This commit is contained in:
gazebo
2018-09-08 12:55:39 +08:00
parent 711013fab4
commit 8c130a15a4
28 changed files with 780 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
business/jxstore/cms/store.go
View File

@@ -10,11 +10,11 @@ import (
"git.rosy.net.cn/jx-callback/business/jxutils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals/gormdb"
"git.rosy.net.cn/jx-callback/globals"
)
type StoreExt struct {
*model.Store
model.Store
CityName string `json:"cityName"`
DistrictName string `json:"districtName"`
}
@@ -30,36 +30,37 @@ var (
)
func GetPlaces(parentCode int, vendorID int, includeDisabled bool) ([]*model.Place, error) {
db := gormdb.GetDB()
db := dao.GetDB()
places := []*model.Place{}
sql := "enabled = 1 "
sql := "SELECT * FROM place WHERE enabled = 1 "
if includeDisabled {
sql = "1 = 1 "
}
if vendorID >= 0 {
if vendorID == model.VendorIDJD {
return places, db.Where(sql + "AND jd_code <> 0 AND level >= 2").Find(&places).Error
return places, dao.GetRows(db, &places, sql+"AND jd_code <> 0 AND level >= 2")
}
return nil, ErrHaveNotImplementedYet
}
return places, db.Where(sql+"AND parent_code = ?", parentCode).Find(&places).Error
return places, dao.GetRows(db, &places, sql+"AND parent_code = ?", parentCode)
}
func UpdatePlaces(places []*model.Place, userName string) (err error) {
func UpdatePlaces(places []map[string]interface{}, userName string) (err error) {
if len(places) == 0 {
return ErrMissingInput
}
db := gormdb.GetDB()
for _, place := range places {
params := map[string]interface{}{"enabled": place.Enabled, "updated_at": time.Now()}
if place.JdCode != 0 {
params["jd_code"] = place.JdCode
if place["code"] == nil {
return ErrMissingInput
}
if place.MtpsPrice != 0 {
params["mtps_price"] = place.MtpsPrice
}
if err = db.Table("place").Where("code = ?", place.Code).Updates(params).Error; err != nil {
break
placeid := &model.Place{}
globals.SugarLogger.Debug(utils.Format4Output(place, false))
valid, _ := jxutils.FilterMapByFieldList(place, []string{"jdCode", "enabled", "mtpsPrice"})
valid["updatedAt"] = time.Now()
valid["lastOperator"] = userName
globals.SugarLogger.Debug(valid)
if err = dao.UpdateEntityByKV(nil, placeid, valid, utils.Params2Map("Code", place["code"])); err != nil {
return err
}
}
return err
@@ -130,7 +131,8 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i
Ct int
}
countInfo := []tcount{}
if err = dao.GetRows(nil, &countInfo, sqlCount, params2...); err == nil {
db := dao.GetDB()
if err = dao.GetRows(db, &countInfo, sqlCount, params2...); err == nil {
sqlData := "SELECT t1.*, city.name city_name, district.name district_name\n" + sql + `
ORDER BY id
LIMIT ? OFFSET ?`
@@ -144,7 +146,7 @@ func GetStores(keyword string, params map[string]interface{}, offset, pageSize i
retVal := &StoresInfo{
TotalCount: countInfo[0].Ct,
}
err = dao.GetRows(nil, &retVal.Stores, sqlData, params2...)
err = dao.GetRows(db, &retVal.Stores, sqlData, params2...)
return retVal, err
}
return nil, err
@@ -156,9 +158,9 @@ func GetVendorStore(vendorStoreID string, vendorID int) (retVal *StoreExt, err e
result, err2 := handler.ReadStore(vendorStoreID)
if err = err2; err == nil {
retVal = &StoreExt{
Store: result,
Store: *result,
}
db := gormdb.GetDB()
db := dao.GetDB()
if city, err2 := dao.GetPlaceByCode(db, result.CityCode); err2 == nil {
retVal.CityName = city.Name
}
@@ -181,8 +183,8 @@ func UpdateStore(params map[string]interface{}, userName string) (err error) {
params["updatedAt"] = time.Now()
store.ID = int(utils.MustInterface2Int64(params["id"]))
valid, _ := jxutils.FilterMapByStructObject(params, &model.Store{})
err = dao.UpdateEntity(nil, store, valid)
valid, _ := jxutils.NormalFilterMapByStructObject(params, &model.Store{})
err = dao.UpdateEntityByKV(nil, store, valid, nil)
return err
}