This commit is contained in:
suyl
2021-05-22 15:39:10 +08:00
parent fc7c2238b1
commit a83d409423
4 changed files with 84 additions and 24 deletions

View File

@@ -264,7 +264,7 @@ var (
}
)
func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct bool, keyword string, categoryID, status, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo, err error) {
func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct bool, keyword string, categoryID, status, offset, pageSize int) (skuNamesInfo *dao.StoreSkuNamesInfo2, err error) {
//权限
//if permission.IsRoled(ctx) {
// if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil {
@@ -276,7 +276,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
var (
sqlParams []interface{}
db = dao.GetDB()
SkuNames []*dao.StoreSkuNameExt
SkuNames []*dao.StoreSkuNameExt2
)
sql := `
SELECT SQL_CALC_FOUND_ROWS DISTINCT a.*, e.id store_id, c.unit_price
@@ -376,7 +376,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
txDB, _ := dao.Begin(db)
defer dao.Commit(db, txDB)
if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil {
skuNamesInfo = &dao.StoreSkuNamesInfo{
skuNamesInfo = &dao.StoreSkuNamesInfo2{
TotalCount: dao.GetLastTotalRowCount2(db, txDB),
}
// skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
@@ -442,16 +442,16 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
// }
// storeName.Skus = append(storeName.Skus, &v.StoreSkuExt)
//}
if err == nil {
if isFocus {
if err == nil {
storeIDs, skuIDs := GetStoreAndSkuIDsFromInfo(skuNamesInfo)
err = dao.UpdateActPrice4StoreSkuNameNew(db, storeIDs, skuIDs, skuNamesInfo, -1)
}
} else {
err = updateUnitPrice4StoreSkuNameNew(db, skuNamesInfo)
}
}
//if err == nil {
// if isFocus {
// if err == nil {
// storeIDs, skuIDs := GetStoreAndSkuIDsFromInfo(skuNamesInfo)
// err = dao.UpdateActPrice4StoreSkuNameNew(db, storeIDs, skuIDs, skuNamesInfo, -1)
// }
// } else {
// err = updateUnitPrice4StoreSkuNameNew(db, skuNamesInfo)
// }
//}
}
return skuNamesInfo, err
}