From aa2a7cbcbf1ed994f442d0e9335198e71b089f30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 19 May 2023 14:14:48 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/defsch/defsch_ext.go | 2 -- business/jxstore/cms/store.go | 1 - business/jxutils/tasksch/task.go | 3 +-- business/model/dao/dao_order.go | 1 - business/partner/delivery/dada/waybill.go | 1 - business/partner/delivery/fn/waybill.go | 18 ++++++++++++------ controllers/fn_callback.go | 6 ++---- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 3c06d220d..4f61ed2ed 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -206,7 +206,6 @@ func (s *DefScheduler) CreateWaybillOnProviders4SavedOrder(ctx *jxcontext.Contex } newPrice = maxFee } - globals.SugarLogger.Debugf("==========newPrice := %d", newPrice) // 门店支出运费,门店发单 if order.CreateDeliveryType == model.YES { if storeAcct.AccountBalance > int(newPrice) { @@ -527,7 +526,6 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor } else { feeInfo.DeliveryFee += model.WayBillDeliveryMarkUp // 加收两毛 feeInfo.TimeoutSecond = timeoutSecond - globals.SugarLogger.Debugf("预下单加价==============GetWaybillFee := %s", utils.Format4Output(feeInfo, false)) } } else { feeInfo = &partner.WaybillFeeInfo{ diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 30a235188..8d0953306 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -1856,7 +1856,6 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor // 更新商品 if isSyncStoreMapSku { - globals.SugarLogger.Debugf("修改门店调价包是同步门店商品价格=============: %v", err) singleStoreHandler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler) task := tasksch.NewParallelTask("修改门店调价包的时候,同时同步门店商品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { diff --git a/business/jxutils/tasksch/task.go b/business/jxutils/tasksch/task.go index ae2df0469..2179e462f 100644 --- a/business/jxutils/tasksch/task.go +++ b/business/jxutils/tasksch/task.go @@ -511,8 +511,7 @@ func SendMessage(t *BaseTask) { } if err := ddmsg.SendUserMessage(dingdingapi.MsgTyeText, authInfo.UserID, "异步任务完成", content); err != nil { - err2 := enterprise_msg.SendUserMessage(authInfo.Mobile, "异步任务完成", "", content) - globals.SugarLogger.Errorf("==============errr ddd %v", err2) + enterprise_msg.SendUserMessage(authInfo.Mobile, "异步任务完成", "", content) } } } diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index a9063e530..1f8f61857 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1030,7 +1030,6 @@ func GetOrders(db *DaoDB, ids []int64, isIncludeSku, isIncludeFake bool, fromDat if len(statuss) > 0 { sqlWhere += " AND t1.status IN (" + GenQuestionMarks(len(statuss)) + ")" sqlParams = append(sqlParams, statuss) - //globals.SugarLogger.Debugf("sqlParams statuss===========%d", statuss) } } if params["lockStatuss"] != nil { diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 3cc8207b7..086b19b66 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -282,7 +282,6 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf if result, err = api.DadaAPI.QueryDeliverFee(billParams); err != nil { return nil, err } - globals.SugarLogger.Debugf("QueryDeliverFee===============预下单获取配送费:%s", utils.Format4Output(result, false)) deliveryFeeInfo.DeliveryFee = jxutils.StandardPrice2Int(result.DeliverFee) // jxutils.StandardPrice2Int(result.Fee) deliveryFeeInfo.RefDeliveryFee = deliveryFeeInfo.DeliveryFee } diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 82cce00ed..cfa109344 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -205,11 +205,22 @@ func (c *DeliveryHandler) GetWaybillFee(order *model.GoodsOrder) (deliveryFeeInf } // 订单状态 -func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackResponse) { +func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortStatus) (resp *fnpsapi.CallbackResponse) { cc := &fnpsapi.OrderCallbackParam{} if err := utils.Map2StructByJson(msg.Param, cc, true); err != nil { return fnpsapi.Err2CallbackResponse(err, "") } + var good *model.GoodsOrder + sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` + sqlParams := []interface{}{cc.PartnerOrderCode} + dao.GetRow(dao.GetDB(), &good, sql, sqlParams) + if good == nil || good.VendorOrderID == "" { + _, err := fnpsapi.HttpToGuoYuanFN(utils.Struct2MapByJson(resultParam), "order") + if err != nil { + return fnpsapi.Err2CallbackResponse(err, "") + } + return fnpsapi.Err2CallbackResponse(nil, "") + } order := &model.Waybill{ VendorWaybillID: utils.Int64ToStr(cc.OrderId), @@ -225,11 +236,6 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackRespon order.StatusTime = time.Now() } order.VendorOrderID, order.OrderVendorID = jxutils.SplitUniversalOrderID(cc.PartnerOrderCode) - - var good *model.GoodsOrder - sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` - sqlParams := []interface{}{cc.PartnerOrderCode} - dao.GetRow(dao.GetDB(), &good, sql, sqlParams) order.OrderVendorID = good.VendorID orderStatus := utils.Str2Int64(order.VendorStatus) diff --git a/controllers/fn_callback.go b/controllers/fn_callback.go index 09a3a21f9..997fe77fc 100644 --- a/controllers/fn_callback.go +++ b/controllers/fn_callback.go @@ -11,7 +11,6 @@ type FnController struct { web.Controller } - // 门店回掉 func (c *FnController) FnStore() { if c.Ctx.Input.Method() == http.MethodPost { @@ -33,7 +32,7 @@ func (c *FnController) FnStore() { // 订单状态 func (c *FnController) FnOrder() { if c.Ctx.Input.Method() == http.MethodPost { - msg, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request) + msg, result, callbackResponse := api.FnAPI.GetChainOrderStatusNotify(c.Ctx.Request) if callbackResponse.Code == -1 { c.Data["code"] = callbackResponse c.ServeJSON() @@ -41,7 +40,7 @@ func (c *FnController) FnOrder() { } // 订单回调 - callbackResponse = fn.OnWaybillMsg(msg) + callbackResponse = fn.OnWaybillMsg(msg, result) c.Data["code"] = callbackResponse c.ServeJSON() } else { @@ -66,4 +65,3 @@ func (c *FnController) FnAbnormal() { c.Abort("404") } } -