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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
邹宗楠
2023-05-11 10:58:55 +08:00
parent 476f8c0943 6d314dbacc
commit 816b200db7
21 changed files with 471 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
business/jxstore/cms/cms.go
View File

@@ -8,6 +8,8 @@ import (
"strings"
"time"
"git.rosy.net.cn/baseapi/platformapi/baidunavi"
"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
"git.rosy.net.cn/baseapi/utils/errlist"
@@ -583,3 +585,23 @@ func GetCityBankBranches(ctx *jxcontext.Context, cityCode int, bankCode string)
}
return info, err
}
// GetSToUWalkingDistance 获取商家与用户间步行距离
func GetSToURidingDistance(sLng, sLat, uLng, uLat float64) (stepInfo interface{}, err error) {
var coords []*baidunavi.Coordinate
coords = append(coords, &baidunavi.Coordinate{
Lng: sLng,
Lat: sLat,
}, &baidunavi.Coordinate{
Lat: uLat,
Lng: uLng,
})
if coords, err = api.BaiDuNaviAPI.BatchCoordinateConvert(coords, baidunavi.CoordSysGCJ02, baidunavi.CoordSysBaiDu); err == nil {
if len(coords) > 0 {
if stepInfo, err = api.BaiDuNaviAPI.DirectionLiteRide(coords); err == nil && stepInfo.(string) != "" {
return stepInfo, nil
}
}
}
return 0, err
}

25
business/jxstore/cms/sku.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
"io"
"math"
"mime/multipart"
@@ -14,6 +13,8 @@ import (
"strings"
"time"
"git.rosy.net.cn/jx-callback/globals/api/apimanager"
beego "github.com/astaxie/beego/server/web"
"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
@@ -1323,7 +1324,27 @@ func updateOrCreateSkuVendorCategoryMap(db *dao.DaoDB, ctx *jxcontext.Context, n
ddCategoryID = value
}
} else {
ddCategoryID = getCategoryByImg(payload["descImg"].(string), payload["img"].(string), payload["img2"].(string), payload["img3"].(string), payload["img4"].(string), payload["img5"].(string))
imgs := make([]string, 0)
if payload["descImg"] != nil {
imgs = append(imgs, payload["descImg"].(string))
}
if payload["img"] != "" {
imgs = append(imgs, payload["descImg"].(string))
}
if payload["img2"] != "" {
imgs = append(imgs, payload["img2"].(string))
}
if payload["img3"] != "" {
imgs = append(imgs, payload["img3"].(string))
}
if payload["img4"] != "" {
imgs = append(imgs, payload["img4"].(string))
}
if payload["img5"] != "" {
imgs = append(imgs, payload["img5"].(string))
}
ddCategoryID = getCategoryByImg(imgs...)
//ddCategoryID = getCategoryByImg(payload["descImg"].(string), payload["img"].(string), payload["img2"].(string), payload["img3"].(string), payload["img4"].(string), payload["img5"].(string))
}
}

21
business/jxstore/cms/store_sku.go
View File

@@ -4,8 +4,6 @@ import (
"bytes"
"errors"
"fmt"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"io"
"math"
"mime/multipart"
@@ -16,6 +14,9 @@ import (
"time"
"unicode"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/jx-callback/business/auth2"
@@ -394,7 +395,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
sqlParams = append(sqlParams, pageSize, offset)
txDB, _ := dao.Begin(db)
defer dao.Commit(db, txDB)
//globals.SugarLogger.Debugf("store_sku 检查：sql:%s sqlParams:%s", sql, sqlParams)
if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil {
//globals.SugarLogger.Debugf(" 检查参数：SkuNames:%s", utils.Format4Output(SkuNames, false))
skuNamesInfo = &dao.StoreSkuNamesInfo2{
TotalCount: dao.GetLastTotalRowCount2(db, txDB),
}
@@ -403,13 +408,21 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
v := batchItemList[0].(*dao.StoreSkuNameExt2)
var skus []*dao.StoreSkuExt
// sql2 := `
// SELECT a.id sku_id, a.spec_quality sku_spec_quality, a.spec_unit sku_spec_unit, a.status sku_status, a.comment,
// b.stock, b.price bind_price, b.unit_price,
// b.status store_sku_status
// FROM sku a
// JOIN sku_name c ON a.name_id = c.id AND c.deleted_at = ? AND c.status = ?
//`
sql2 := `
SELECT a.id sku_id, a.spec_quality sku_spec_quality, a.spec_unit sku_spec_unit, a.status sku_status, a.comment,
b.stock, b.price bind_price, b.unit_price,
b.stock, b.price bind_price, b.unit_price,b.jd_sync_status,b.mtwm_id,b.mtwm_sync_status,b.ebai_id,b.ebai_sync_status,
b.status store_sku_status
FROM sku a
JOIN sku_name c ON a.name_id = c.id AND c.deleted_at = ? AND c.status = ?
`
sqlParams2 := []interface{}{
utils.DefaultTimeValue, model.SkuStatusNormal,
}
@@ -428,7 +441,9 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
sql2 += " AND b.status = ?"
sqlParams2 = append(sqlParams2, status)
}
//globals.SugarLogger.Debugf("store_sku 检查：sql2:%s sqlParams2:%s", sql2, sqlParams2)
if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil {
//globals.SugarLogger.Debugf(" 检查参数：skus:%s", utils.Format4Output(skus, false))
v.Skus = skus
}
return retVal, err