diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index a9a687cdf..d63468aa5 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -425,9 +425,9 @@ func Init() { }, dailyWorkTimeList) ScheduleTimerFunc("doDailyWork2-1", func() { // 刷新商品,换个时间节点,房子请求超时 - //cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, dao.GetDB(), []int{1, 3}, nil, false, nil, nil, model.SyncFlagSaleMask, true, true) + cms.CurVendorSync.SyncStoresSkus2(jxcontext.AdminCtx, nil, 0, dao.GetDB(), []int{1, 3}, nil, false, nil, nil, model.SyncFlagSaleMask, true, true) // 刷新门店平台商品 - syncStoreSku() + //syncStoreSku() }, []string{"02:00:00"}) ScheduleTimerFunc("doDailyWork3", func() { diff --git a/business/partner/purchase/jx/localjx/lakala_pay_mini.go b/business/partner/purchase/jx/localjx/lakala_pay_mini.go index 58e46490d..4b61aa53d 100644 --- a/business/partner/purchase/jx/localjx/lakala_pay_mini.go +++ b/business/partner/purchase/jx/localjx/lakala_pay_mini.go @@ -21,7 +21,7 @@ import ( "github.com/astaxie/beego/client/orm" ) -func pay4OrderByLaKaLa(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, vendorPayType, subAppID, code, source, ip string) (orderPay *model.OrderPay, err error) { +func pay4OrderByLaKaLa(ctx *jxcontext.Context, order *model.GoodsOrder, payType int, vendorPayType, subAppID, code, source string) (orderPay *model.OrderPay, err error) { merchantObj, err := dao.GetStoreInfoByMerchantID(dao.GetDB(), "", order.JxStoreID, "", "") if err != nil { return nil, err @@ -33,7 +33,7 @@ func pay4OrderByLaKaLa(ctx *jxcontext.Context, order *model.GoodsOrder, payType OutTradeNo: order.VendorOrderID, TotalAmount: utils.Int64ToStr(order.ActualPayPrice), LocationInfo: lakala.LocationInfoObj{ - RequestIp: ip, + RequestIp: ctx.GetRealRemoteIP(), }, NotifyUrl: lakala.PayStatusCallback, Subject: fmt.Sprintf("感谢您在本店%s消费,欢迎下次再来", order.StoreName),