diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index f4f79e797..17f14abfb 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -1840,54 +1840,54 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // tasksch.HandleTask(task, nil, true).Run() // task.GetID() //删京东会员价 - var ( - db = dao.GetDB() - vendorThingIDs []int64 - // result3 []int - ) - storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{103197, 666774}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406") - things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, nil, []string{"320406"}) - thingIDmap := make(map[int64]string) - - for _, v := range things { - if v.VendorThingID != "" { - vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) - thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) - } - } - - task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeMap := batchItemList[0].(*model.StoreMap) - // result1, _ := - FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { - api := jd.GetAPI("320406") - priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) - var list []*jdapi.SkuIdEntity - for _, vv := range priceInfo { - if vv.VipPrice != 0 { - list = append(list, &jdapi.SkuIdEntity{ - OutSkuId: thingIDmap[vv.SkuID], - }) - // result = []bool{true} - // return result, 0, err - } - } - if len(list) > 0 { - err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) - } - return result, 0, err - }, ctx, task, vendorThingIDs, 50, true) - // for _, v := range result1 { - // if v.(bool) { - // retVal = []int{storeMap.StoreID} - // return retVal, err - // } - // } - return retVal, err - }, storeMaps) - tasksch.HandleTask(task, nil, true).Run() - _, err = task.GetResult(0) + //var ( + // db = dao.GetDB() + // vendorThingIDs []int64 + // // result3 []int + //) + //storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{103197, 666774}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406") + //things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, nil, []string{"320406"}) + //thingIDmap := make(map[int64]string) + // + //for _, v := range things { + // if v.VendorThingID != "" { + // vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) + // thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) + // } + //} + // + //task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // storeMap := batchItemList[0].(*model.StoreMap) + // // result1, _ := + // FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { + // api := jd.GetAPI("320406") + // priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) + // var list []*jdapi.SkuIdEntity + // for _, vv := range priceInfo { + // if vv.VipPrice != 0 { + // list = append(list, &jdapi.SkuIdEntity{ + // OutSkuId: thingIDmap[vv.SkuID], + // }) + // // result = []bool{true} + // // return result, 0, err + // } + // } + // if len(list) > 0 { + // err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) + // } + // return result, 0, err + // }, ctx, task, vendorThingIDs, 50, true) + // // for _, v := range result1 { + // // if v.(bool) { + // // retVal = []int{storeMap.StoreID} + // // return retVal, err + // // } + // // } + // return retVal, err + // }, storeMaps) + //tasksch.HandleTask(task, nil, true).Run() + //_, err = task.GetResult(0) // for _, v := range result2 { // result3 = append(result3, v.(int)) // } @@ -1907,6 +1907,14 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // } // } + //京东会员数据 + //var ( + // db = dao.GetDB() + // pageSize = 50 + //) + //for page := 1; page < 3080; page++ { + // result, _ := api.JdAPI.QueryMemberTransListByCondition(page, pageSize) + //} return err } diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index d63a9f9e1..704caf858 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -417,7 +417,7 @@ func Pay4User(ctx *jxcontext.Context, thingID int, vendorOrderID string, payType //1 续费 //-1 不能购买 func checkMember(db *dao.DaoDB, userID string, discountCard *model.DiscountCard) (flag int, userMember *model.UserMember, err error) { - userMembers, err := dao.GetUserMember(db, userID, "", model.MemberTypeDiscountCard, model.YES) + userMembers, err := dao.GetUserMember(db, userID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES) if len(userMembers) > 0 { userMember = userMembers[0] if userMember.ID < discountCard.ID { @@ -555,7 +555,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) { } else { switch orderPay.PayType { case model.PayTypeTL_DiscountCard: - userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID, model.MemberTypeDiscountCard, model.NO) + userMembers, _ := dao.GetUserMember(dao.GetDB(), "", orderPay.VendorOrderID, "", model.VendorIDJX, model.MemberTypeDiscountCard, model.NO) if len(userMembers) > 0 { userMembers[0].IsPay = model.YES dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay") @@ -1015,7 +1015,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64 } } // 2.判断用户是否是会员 - userMembers, _ := dao.GetUserMember(db, tuserID, "", model.MemberTypeDiscountCard, model.YES) + userMembers, _ := dao.GetUserMember(db, tuserID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES) if len(userMembers) > 0 { if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil { jxutils.Strings2Objs(configList[0].Value, &dicountCards) diff --git a/business/partner/purchase/jx/localjx/user.go b/business/partner/purchase/jx/localjx/user.go index 7bde8d75a..98022c33d 100644 --- a/business/partner/purchase/jx/localjx/user.go +++ b/business/partner/purchase/jx/localjx/user.go @@ -67,7 +67,7 @@ func GetJxShopUsers(ctx *jxcontext.Context, keyword, fromTime, toTime string, ve // Data: requestList, } for _, v := range requestList { - userMembers, _ := dao.GetUserMember(db, v.UserID, "", model.MemberTypeDiscountCard, model.YES) + userMembers, _ := dao.GetUserMember(db, v.UserID, "", "", model.VendorIDJX, model.MemberTypeDiscountCard, model.YES) v.UserMembers = userMembers } pagedInfo.Data = requestList