diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 523455b84..8266e7fc9 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -182,18 +182,18 @@ func Init() { delivery.GetOrderRiderInfoToPlatform("", 0) }, 10*time.Second, 4*time.Minute) - //每天晚上23:00更新抖店 审核状态(收费注释) - //ScheduleTimerFunc("UpdateStorePoiStatus", func() { - // cms.UpdateStorePoiStatus(jxcontext.AdminCtx) - //}, []string{ - // "22:00:00", - //}) - //每天晚上23:00获取门店 电子围栏、仓库、限售模板、运费模板ID同步进数据库(收费注释) - //ScheduleTimerFunc("UpdateStoreRelInformation", func() { - // cms.UpdateStoreRelInformation(jxcontext.AdminCtx) - //}, []string{ - // "22:00:00", - //}) + //每天晚上23:00更新抖店 审核状态 + ScheduleTimerFunc("UpdateStorePoiStatus", func() { + cms.UpdateStorePoiStatus(jxcontext.AdminCtx) + }, []string{ + "22:00:00", + }) + //每天晚上23:00获取门店 电子围栏、仓库、限售模板、运费模板ID同步进数据库 + ScheduleTimerFunc("UpdateStoreRelInformation", func() { + cms.UpdateStoreRelInformation(jxcontext.AdminCtx) + }, []string{ + "22:00:00", + }) // 更新抖店订单的结算信息 ScheduleTimerFunc("UpdateTiktokShopTotalMoney", func() { orderman.UpdateTiktokShopTotalMoney() @@ -255,16 +255,16 @@ func Init() { // 抖音更新门店商品 ,接口收费暂不使用 if beego.BConfig.RunMode != "jxgy" { - //ScheduleTimerFunc("RefreshSyncSkuList", func() { - // syncStoreSkuTiktok() - //}, []string{"13:00:00"}) + ScheduleTimerFunc("RefreshSyncSkuList", func() { + syncStoreSkuTiktok() + }, []string{"13:00:00"}) } //刷新抖音门店token if beego.BConfig.RunMode != "jxgy" { ScheduleTimerFuncByInterval(func() { cms.RefreshTiktokShopToken(jxcontext.AdminCtx) - }, 60*time.Second, 60*time.Minute) + }, 60*time.Second, 30*time.Minute) } // 定时任务刷新当前订单的物流信息 diff --git a/controllers/jx_order.go b/controllers/jx_order.go index faf94ec9f..f5fad4a41 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -864,23 +864,27 @@ func (c *OrderController) PartRefundOrder() { // @router /ApplyRefundOrder [post] func (c *OrderController) ApplyRefundOrder() { c.callApplyRefundOrder(func(params *tOrderApplyRefundOrderParams) (retVal interface{}, errCode string, err error) { - //var skuList []*model.OrderSku - //err = jxutils.Strings2Objs(params.RefundSkuList, &skuList) - //if err == nil { - // _, _, skuList = skuList2Map(skuList) - // var order *model.GoodsOrder - // order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) - // if err == nil { - // removedAll, err2 := fillSkuList(skuList, order.Skus) - // if err = err2; err == nil { - // if removedAll { - // err = defsch.FixedScheduler.RefundOrder(params.Ctx, order, params.Reason) - // } else { - // err = defsch.FixedScheduler.PartRefundOrder(params.Ctx, order, skuList, params.Reason) - // } - // } - // } - //} + // 微信,支付宝-通联,(抖音-抖音支付,快手-快手支付) 小程序,下单时不区分平台,支付时区分() + + // 1- 创建afsOrder 售后单 + // 2- + var skuList []*model.OrderSku + err = jxutils.Strings2Objs(params.RefundSkuList, &skuList) + if err == nil { + _, _, skuList = skuList2Map(skuList) + var order *model.GoodsOrder + order, err = partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) + if err == nil { + removedAll, err2 := fillSkuList(skuList, order.Skus) + if err = err2; err == nil { + if removedAll { + err = defsch.FixedScheduler.RefundOrder(params.Ctx, order, params.Reason) + } else { + err = defsch.FixedScheduler.PartRefundOrder(params.Ctx, order, skuList, params.Reason) + } + } + } + } return retVal, "", err }) }