diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 7273ffd02..3bdeacc26 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -4721,6 +4721,7 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku } return storeSkuAudits2, "", err } + // deletedDuplicateWaitAuditData(ctx, db) task := tasksch.NewParallelTask("StoreSkuPriceAudit", tasksch.NewParallelConfig().SetParallelCount(5).SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeAudit := batchItemList[0].(*model.StoreSkuAudit) @@ -4801,6 +4802,38 @@ func StoreSkuPriceAudit(ctx *jxcontext.Context, storeSkuAudits []*model.StoreSku return nil, hint, err } +func DeletedDuplicateWaitAuditData(ctx *jxcontext.Context, db *dao.DaoDB) { + var ( + duplicateDatas []*model.StoreSkuAudit + duplicateMaps = make(map[int]map[int][]*model.StoreSkuAudit) + ) + sql := ` + SELECT a.* + FROM store_sku_audit a , + ( + SELECT count(*), store_id ,name_id ,status, deleted_at + FROM store_sku_audit + WHERE status = 0 + AND deleted_at = ? + GROUP BY 2,3,4,5 + HAVING count(*) > 1 + ) b + WHERE a.store_id = b.store_id + AND a.name_id = b.name_id + AND a.status= b.status + AND a.deleted_at = b.deleted_at + ` + sqlParams := []interface{}{utils.DefaultTimeValue} + dao.GetRows(db, &duplicateDatas, sql, sqlParams) + for _, v := range duplicateDatas { + duplicateMaps[v.StoreID][v.NameID] = append(duplicateMaps[v.StoreID][v.NameID], v) + } + fmt.Println("test11111111111", utils.Format4Output(duplicateMaps, false)) + // for _, v := range duplicateMaps { + + // } +} + func GetSpecialtyStoreSkus(ctx *jxcontext.Context, storeIDs, vendorIDs []int) (err error) { type SpecialtyStoreSkus struct { StoreID int `json:"门店ID"` diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index d3fec4dc1..9c1b56a0c 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1583,14 +1583,7 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // fmt.Println("addList2", addList) // fmt.Println("updateList2", utils.Format4Output(updateList, false)) // fmt.Println("deleteList2", deleteList) - var skuNames []model.SkuName - sql := ` - SELECT * FROM sku_name WHERE img = 'https://image.jxc4.com/noGoodsImg.jpg' AND deleted_at = '1970-01-01 00:00:00' - ` - dao.GetRows(dao.GetDB(), &skuNames, sql, nil) - for _, v := range skuNames { - cms.DeleteSkuName(ctx, v.ID, ctx.GetUserName()) - } + cms.DeletedDuplicateWaitAuditData(ctx, dao.GetDB()) return err }