This commit is contained in:
suyl
2021-05-22 11:45:59 +08:00
parent 1026f491f4
commit 0084921d13

View File

@@ -378,7 +378,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
TotalCount: dao.GetLastTotalRowCount2(db, txDB), TotalCount: dao.GetLastTotalRowCount2(db, txDB),
} }
// skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB) // skuNamesInfo.TotalCount = dao.GetLastTotalRowCount2(db, txDB)
for _, v := range tmpList { //for _, v := range tmpList {
//var skus []*dao.StoreSkuExt //var skus []*dao.StoreSkuExt
//sql2 := ` //sql2 := `
// SELECT a.id sku_id, a.spec_quality sku_spec_quality, a.spec_unit sku_spec_unit, a.status sku_status, // SELECT a.id sku_id, a.spec_quality sku_spec_quality, a.spec_unit sku_spec_unit, a.status sku_status,
@@ -408,7 +408,12 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
//if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil { //if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil {
// v.Skus = skus // v.Skus = skus
//} //}
//}
storeNameMap := make(map[int64]*dao.StoreSkuNameExt)
for _, v := range tmpList {
var storeName *dao.StoreSkuNameExt var storeName *dao.StoreSkuNameExt
index := jxutils.Combine2Int(v.StoreID, v.ID)
if storeNameMap[index] == nil {
storeName = &dao.StoreSkuNameExt{ storeName = &dao.StoreSkuNameExt{
StoreID: v.StoreID, StoreID: v.StoreID,
StoreName: v.StoreName, StoreName: v.StoreName,
@@ -419,7 +424,11 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b
YbSkuName: v.YbSkuName, YbSkuName: v.YbSkuName,
AuditUnitPrice: v.AuditUnitPrice, AuditUnitPrice: v.AuditUnitPrice,
} }
storeNameMap[index] = storeName
skuNamesInfo.SkuNames = append(skuNamesInfo.SkuNames, storeName) skuNamesInfo.SkuNames = append(skuNamesInfo.SkuNames, storeName)
} else {
storeName = storeNameMap[index]
}
storeName.Skus = append(storeName.Skus, &v.StoreSkuExt) storeName.Skus = append(storeName.Skus, &v.StoreSkuExt)
} }
//skuNamesInfo.SkuNames = SkuNames //skuNamesInfo.SkuNames = SkuNames