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

15
business/partner/purchase/jd/sku.go
View File

@@ -9,7 +9,6 @@ import (
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"git.rosy.net.cn/jx-callback/globals/gormdb"
)
const (
@@ -84,15 +83,15 @@ func (p *PurchaseHandler) DeleteCategory(cat *model.SkuCategory) error {
func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt, skuName string, shopCategories []int64, addParams map[string]interface{}) (string, error)) (err error) {
var otherInfo skuInfoExt
db := gormdb.GetDB()
err = db.Raw(`
db := dao.GetDB()
err = dao.GetRow(nil, &otherInfo, `
SELECT t2.*, t3.jd_id, t3.jd_category_id, t4.jd_id sku_cat_id
FROM sku t1
JOIN sku_name t2 ON t1.name_id = t2.id
JOIN sku_category t3 ON t2.category_id = t3.id
LEFT JOIN sku_category t4 ON t1.category_id = t4.id
WHERE t1.id = ?
`, sku.ID).Scan(&otherInfo).Error
`, sku.ID)
if err == nil {
shopCategories := []int64{otherInfo.JdID}
if otherInfo.SkuCatID != 0 {
@@ -107,7 +106,7 @@ func (p *PurchaseHandler) cuSku(sku *model.Sku, handler func(skuExt *skuInfoExt,
addParams := map[string]interface{}{}
if otherInfo.IsGlobal == 0 { //如果不是全国可售，要查可售区域
sellPlaces, err2 := dao.GetSellCities(otherInfo.ID, model.VendorIDJD, db)
sellPlaces, err2 := dao.GetSellCities(db, otherInfo.ID, model.VendorIDJD)
if err = err2; err == nil && len(sellPlaces) > 0 {
sellCites := make([]int, len(sellPlaces))
for k, v := range sellPlaces {
@@ -161,11 +160,11 @@ func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuName *model.SkuName, s
}
sku.ID = int(utils.Str2Int64(utils.Interface2String(mapData["outSkuId"])))
db := gormdb.GetDB()
db := dao.GetDB()
shopCategories := utils.Interface2Int64List(mapData["shopCategories"])
if len(shopCategories) > 0 {
skuCat := &model.SkuCategory{}
if db.Where("jd_id = ?", shopCategories[0]).Find(skuCat).Error == nil {
if dao.GetRow(db, skuCat, "SELECT * FROM sku_category WHERE jd_id = ?", shopCategories[0]) == nil {
skuName.CategoryID = skuCat.ID
}
}
@@ -174,7 +173,7 @@ func (p *PurchaseHandler) ReadSku(vendorSkuID string) (skuName *model.SkuName, s
skuName.IsGlobal = 1
} else {
sellPlaces = make([]*model.Place, 0)
err2 := db.Where("jd_code IN (?) AND level = 2", sellCities).Find(&sellPlaces).Error
err2 := dao.GetRows(db, &sellPlaces, "SELECT * FROM place WHERE jd_code IN (?) AND level = 2", sellCities)
globals.SugarLogger.Debug("err2:%v", err2)
}
return skuName, sellPlaces, sku, nil