From ed39a2c052b6deb92534e756f52bcde673f46838 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Wed, 1 Sep 2021 15:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E7=AB=9E=E5=A4=A9=E6=8B=A9=E5=94=AE?= =?UTF-8?q?=E5=90=8E=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/orderman/order.go | 11 +++++--- business/jxcallback/orderman/orderman_ext.go | 27 +++++++++++++++++--- business/jxstore/misc/misc.go | 11 +++++--- business/jxstore/tempop/tempop.go | 15 ++--------- 4 files changed, 40 insertions(+), 24 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 1366b6581..f64427b61 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2154,12 +2154,15 @@ func RefreshJdAfsOrderTotalShopMoney() { sqlParams := []interface{}{time.Now().AddDate(0, 0, -3), model.VendorIDJD, model.AfsOrderStatusFinished} dao.GetRows(db, &afsOrders, sql, sqlParams) for _, v := range afsOrders { - if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { - if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, v.VendorOrderID, v.AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { - v.AfsTotalShopMoney = orderAfsInfo.AfsTotalShopMoney + //排除物竞天择的 + if order, _ := partner.CurOrderManager.LoadOrder(v.VendorOrderID, v.VendorID); !strings.Contains(order.BuyerComment, "JD") { + if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { + if orderAfsInfo, err := handler.GetOrderAfsInfo(nil, v.VendorOrderID, v.AfsOrderID); err == nil && orderAfsInfo.AfsTotalShopMoney != 0 { + v.AfsTotalShopMoney = orderAfsInfo.AfsTotalShopMoney + } } + dao.UpdateEntity(db, v, "AfsTotalShopMoney") } - dao.UpdateEntity(db, v, "AfsTotalShopMoney") } } diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 617b32ca3..bfd96d50c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1563,12 +1563,20 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord if err != nil { return err } + var afsOrderList []map[*model.AfsOrder]float64 if results != nil { for _, v := range results.BillList.Result { if v.DueAmount != 0 { - order, err := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD) - if order == nil || err != nil { - continue + order, _ := partner.CurOrderManager.LoadOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD) + //可能是物竞天择的售后单 + if order == nil { + if afsOrder, _ := partner.CurOrderManager.LoadAfsOrder(utils.Int64ToStr(v.OrderID), model.VendorIDJD); afsOrder != nil { + var afsOrderMap = make(map[*model.AfsOrder]float64) + afsOrderMap[afsOrder] = v.DueAmount + afsOrderList = append(afsOrderList, afsOrderMap) + } else { + continue + } } store, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID, order.VendorOrgCode) // stores, _ := dao.GetStoreList(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, nil, nil, nil, nil, "") @@ -1584,6 +1592,19 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord } } } + if len(afsOrderList) > 0 { + for i := len(afsOrderList) - 1; i < 0; i-- { + afsOrderMap := afsOrderList[i] + for k, v := range afsOrderMap { + if order2, _ := partner.CurOrderManager.LoadOrder(k.VendorOrderID, model.VendorIDJD); order2 != nil { + if k.AfsTotalShopMoney == 0 && order2.TotalShopMoney != 0 { + k.AfsTotalShopMoney = order2.TotalShopMoney - utils.Float64TwoInt64(v*100) + dao.UpdateEntity(db, k, "AfsTotalShopMoney") + } + } + } + } + } return err } diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 39554cf64..e817555c3 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -186,12 +186,19 @@ func Init() { orderman.SaveJdsOrders(jxcontext.AdminCtx, time.Now().Add(-30*time.Minute), time.Now()) }, 5*time.Second, 10*time.Minute) + //刷新京东物竞天择订单结算价 ScheduleTimerFunc("RefreshJdShopOrdersEarningPrice", func() { orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -2)), utils.Time2Str(time.Now().AddDate(0, 0, -2))) orderman.RefreshJdShopOrdersEarningPrice(jxcontext.AdminCtx, utils.Time2Str(time.Now().AddDate(0, 0, -1)), utils.Time2Str(time.Now().AddDate(0, 0, -1))) }, []string{ "05:00:00", }) + //刷新京东售后单结算价 + ScheduleTimerFunc("RefreshJdAfsOrderTotalShopMoney", func() { + orderman.RefreshJdAfsOrderTotalShopMoney() + }, []string{ + "05:30:00", + }) ScheduleTimerFunc("auto enable remote store", func() { cms.EnableHaveRestStores(jxcontext.AdminCtx, false, true) @@ -276,10 +283,6 @@ func Init() { ScheduleTimerFunc("SendQywxPeopleCount", func() { cms.SendQywxPeopleCount(jxcontext.AdminCtx) }, dailyHeartbeat) - //刷新京东售后单结算价 - ScheduleTimerFunc("RefreshJdAfsOrderTotalShopMoney", func() { - orderman.RefreshJdAfsOrderTotalShopMoney() - }, openRemoteStoreTimeList) ScheduleTimerFunc("doDailyWork1", func() { //同步商品额外前缀和水印图(打标记) cms.SyncSkuExperfixAndWatermark(jxcontext.AdminCtx) diff --git a/business/jxstore/tempop/tempop.go b/business/jxstore/tempop/tempop.go index 330445599..9c6412124 100644 --- a/business/jxstore/tempop/tempop.go +++ b/business/jxstore/tempop/tempop.go @@ -4,8 +4,6 @@ import ( "bytes" "context" "fmt" - dyvmsapiclient "github.com/alibabacloud-go/dyvmsapi-20170525-2.0.2/client" - "github.com/alibabacloud-go/tea/tea" "net" "regexp" "strconv" @@ -1987,17 +1985,8 @@ func UploadJdsImage(ctx *jxcontext.Context) (err error) { // } // go connHandler(conn, "1e000f02000151323032313036313530303030313"+utils.Int2Str(i)+"00000033") //} - mobileNum := "18160030913" - templateParam := map[string]interface{}{ - "tel": "111111", - } - request := &dyvmsapiclient.SingleCallByTtsRequest{ - CalledNumber: tea.String(mobileNum), - TtsCode: tea.String(globals.SMSVoicePickOrderTemplate), - TtsParam: tea.String(string(utils.MustMarshal(templateParam))), - } - _, _err := api.VoiceClient.SingleCallByTts(request) - return _err + cms.RefreshStoreIsOnline(jxcontext.AdminCtx) + return err } func Hextob(str string) []byte {