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

aa

Browse Source
This commit is contained in:
suyl
2021-05-13 14:58:53 +08:00
parent b43d885436
commit 1652f1c5b1
3 changed files with 60 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
business/jxstore/tempop/tempop.go
View File

@@ -1840,54 +1840,54 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) {
// tasksch.HandleTask(task, nil, true).Run() // tasksch.HandleTask(task, nil, true).Run()
// task.GetID() // task.GetID()
//删京东会员价 //删京东会员价
var ( //var (
db = dao.GetDB() // db = dao.GetDB()
vendorThingIDs []int64 // vendorThingIDs []int64
// result3 []int // // result3 []int
) //)
storeMaps, _ := dao.GetStoresMapList(db, []int{model.VendorIDJD}, []int{103197, 666774}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "320406") //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"}) //things, _ := dao.GetThingMapList(db, model.ThingTypeSku, []int{model.VendorIDJD}, nil, []string{"320406"})
thingIDmap := make(map[int64]string) //thingIDmap := make(map[int64]string)
//
for _, v := range things { //for _, v := range things {
if v.VendorThingID != "" { // if v.VendorThingID != "" {
vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID)) // vendorThingIDs = append(vendorThingIDs, utils.Str2Int64(v.VendorThingID))
thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID) // thingIDmap[utils.Str2Int64(v.VendorThingID)] = utils.Int64ToStr(v.ThingID)
} // }
} //}
//
task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, //task := tasksch.NewParallelTask("uuuuu", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeMap := batchItemList[0].(*model.StoreMap) // storeMap := batchItemList[0].(*model.StoreMap)
// result1, _ := // // result1, _ :=
FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) { // FreeBatchInfo("uuuuu2", func(task tasksch.ITask, batchedStoreSkuList []int64) (result interface{}, successCount int, err error) {
api := jd.GetAPI("320406") // api := jd.GetAPI("320406")
priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList) // priceInfo, _ := api.GetStationInfoList(storeMap.VendorStoreID, batchedStoreSkuList)
var list []*jdapi.SkuIdEntity // var list []*jdapi.SkuIdEntity
for _, vv := range priceInfo { // for _, vv := range priceInfo {
if vv.VipPrice != 0 { // if vv.VipPrice != 0 {
list = append(list, &jdapi.SkuIdEntity{ // list = append(list, &jdapi.SkuIdEntity{
OutSkuId: thingIDmap[vv.SkuID], // OutSkuId: thingIDmap[vv.SkuID],
}) // })
// result = []bool{true} // // result = []bool{true}
// return result, 0, err // // return result, 0, err
} // }
} // }
if len(list) > 0 { // if len(list) > 0 {
err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list) // err = api.DelVipPrice(utils.Int2Str(storeMap.StoreID), list)
} // }
return result, 0, err // return result, 0, err
}, ctx, task, vendorThingIDs, 50, true) // }, ctx, task, vendorThingIDs, 50, true)
// for _, v := range result1 { // // for _, v := range result1 {
// if v.(bool) { // // if v.(bool) {
// retVal = []int{storeMap.StoreID} // // retVal = []int{storeMap.StoreID}
// return retVal, err // // return retVal, err
// } // // }
// } // // }
return retVal, err // return retVal, err
}, storeMaps) // }, storeMaps)
tasksch.HandleTask(task, nil, true).Run() //tasksch.HandleTask(task, nil, true).Run()
_, err = task.GetResult(0) //_, err = task.GetResult(0)
// for _, v := range result2 { // for _, v := range result2 {
// result3 = append(result3, v.(int)) // 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 return err
} }

6
business/partner/purchase/jx/localjx/order.go
View File

@@ -417,7 +417,7 @@ func Pay4User(ctx *jxcontext.Context, thingID int, vendorOrderID string, payType
//1 续费 //1 续费
//-1 不能购买 //-1 不能购买
func checkMember(db *dao.DaoDB, userID string, discountCard *model.DiscountCard) (flag int, userMember *model.UserMember, err error) { 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 { if len(userMembers) > 0 {
userMember = userMembers[0] userMember = userMembers[0]
if userMember.ID < discountCard.ID { if userMember.ID < discountCard.ID {
@@ -555,7 +555,7 @@ func OnPayFinished(orderPay *model.OrderPay) (err error) {
} else { } else {
switch orderPay.PayType { switch orderPay.PayType {
case model.PayTypeTL_DiscountCard: 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 { if len(userMembers) > 0 {
userMembers[0].IsPay = model.YES userMembers[0].IsPay = model.YES
dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay") dao.UpdateEntity(dao.GetDB(), userMembers[0], "IsPay")
@@ -1015,7 +1015,7 @@ func generateOrder(ctx *jxcontext.Context, jxOrder *JxOrderInfo, addressID int64
} }
} }
// 2.判断用户是否是会员 // 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 len(userMembers) > 0 {
if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil { if configList, err := dao.QueryConfigs(db, "会员折扣卡", model.ConfigTypeDiscountCard, ""); err == nil {
jxutils.Strings2Objs(configList[0].Value, &dicountCards) jxutils.Strings2Objs(configList[0].Value, &dicountCards)

2
business/partner/purchase/jx/localjx/user.go
View File

@@ -67,7 +67,7 @@ func GetJxShopUsers(ctx *jxcontext.Context, keyword, fromTime, toTime string, ve
// Data: requestList, // Data: requestList,
} }
for _, v := range 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 v.UserMembers = userMembers
} }
pagedInfo.Data = requestList pagedInfo.Data = requestList