diff --git a/business/jxcallback/auto_delivery/auto_delivery.go b/business/jxcallback/auto_delivery/auto_delivery.go index 730154225..a7cb4c202 100644 --- a/business/jxcallback/auto_delivery/auto_delivery.go +++ b/business/jxcallback/auto_delivery/auto_delivery.go @@ -31,7 +31,7 @@ func Init() { return } - for _, v := range []string{"四川", "广东", "西安", "重庆"} { + for _, v := range []string{"四川", "广东", "陕西", "重庆"} { if _, ok := list[v]; ok && len(list[v]) >= 200 { continue } @@ -95,7 +95,12 @@ func AutoSettingFakeDelivery() { for _, v := range orderList { jxutils.CallMsgHandler(func() { // 1.根据订单客户地址获取骑手列表 - riderKey := strings.Split(v.ConsigneeAddress, "省")[0] + riderKey := "" + if strings.Contains(v.ConsigneeAddress, "重庆") || strings.Contains(v.ConsigneeAddress, "上海") || strings.Contains(v.ConsigneeAddress, "北京") { + riderKey = strings.Split(v.ConsigneeAddress, "市")[0] + } else { + riderKey = strings.Split(v.ConsigneeAddress, "省")[0] + } if len(riderListInfo[riderKey]) == model.NO { // 骑手列表 configRiderList, err := dao.QueryConfigs(db, "riderList", "AutoRiderList", "") @@ -127,6 +132,7 @@ func AutoSettingFakeDelivery() { } //自动发单 for riderName, riderPhone := range riderListInfo[riderKey][randTime] { + globals.SugarLogger.Debugf("SelfDeliveringAndUpdateStatus : %s", v.VendorOrderID) if err := defsch.FixedScheduler.SelfDeliveringAndUpdateStatus(jxcontext.AdminCtx, v.VendorOrderID, v.VendorID, jxcontext.AdminCtx.GetUserName(), riderName, riderPhone); err != nil { globals.SugarLogger.Errorf("自动发货错误:[%v]", err) return diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 687ff0fac..0bf729cef 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -180,7 +180,7 @@ func Init() { // 每五分钟轮询一次推送骑手信息坐标给美团 ScheduleTimerFuncByInterval(func() { delivery.GetOrderRiderInfoToPlatform("", 0) - }, 10*time.Second, 5*time.Minute) + }, 10*time.Second, 4*time.Minute) //每天晚上23:00更新抖店 审核状态 ScheduleTimerFunc("UpdateStorePoiStatus", func() { diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 26f33e27e..8960542bd 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1822,7 +1822,7 @@ func GetOrderStoreIDs(db *DaoDB, beginAt, endAt time.Time, vendorID int) (storeI // GetOrderListByStoreList 根据门店id获取正在刷单的门店商品 func GetOrderListByStoreList(db *DaoDB, storeId []int64) (order []*model.GoodsOrder, err error) { sql := `SELECT * FROM goods_order g WHERE g.order_created_at >= ? AND g.order_created_at <= ? AND g.jx_store_id IN (` + GenQuestionMarks(len(storeId)) + `)` + `AND g.vendor_id = ? AND g.status < ?` - sqlParam := []interface{}{time.Now().AddDate(0, 0, -7), time.Now(), storeId, model.VendorIDDD, model.OrderStatusDelivering} + sqlParam := []interface{}{time.Now().AddDate(0, 0, -5), time.Now().AddDate(0, 0, 1), storeId, model.VendorIDDD, model.OrderStatusDelivering} if err := GetRows(db, &order, sql, sqlParam...); err != nil { return nil, err diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 61aa75359..bed1375d1 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -4,7 +4,6 @@ import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" "git.rosy.net.cn/baseapi/utils" - "strconv" "strings" "time" @@ -226,10 +225,7 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify) (resp *fnpsapi.CallbackRespon dao.GetRow(dao.GetDB(), &good, sql, sqlParams) order.OrderVendorID = good.VendorID - orderStatus, err := strconv.Atoi(order.VendorStatus) - if err != nil { - return fnpsapi.Err2CallbackResponse(err, "") - } + orderStatus := utils.Str2Int64(order.VendorStatus) switch orderStatus { case fnpsapi.OrderStatusAcceptCreate, fnpsapi.OrderStatusAccept: // 0 创建订单 order.DesiredFee = GetDesiredFee(order.VendorOrderID) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index c5f276195..5550a8559 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -128,7 +128,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } // 目前只推送美团骑手信息 switch v.VendorID { - case model.VendorIDMTWM: // 美团发单 + case model.VendorIDMTWM: // 美团订单 paramsMap := utils.Struct2Map(riderInfo, "", true) if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, paramsMap); err != nil { @@ -136,16 +136,24 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } } case model.VendorIDELM: // 饿了么 + continue case model.VendorIDEBAI: // 饿百发单 + continue case model.VendorIDJD: // 京东发单 + continue case model.VendorIDGD: // 美团发单 + continue case model.VendorIDYB: // 银豹发单 + continue case model.VendorIDJDShop: // 京东商城 + continue case model.VendorIDWSC: // 微盟微商城 + continue case model.VendorIDDD: // 抖店小时达 + continue default: globals.SugarLogger.Errorf("Order source error, non system order") - return + continue } } return diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index a48420196..fd84f9412 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -291,11 +291,9 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp sql := `SELECT * FROM goods_order WHERE vendor_order_id = ? ORDER BY order_created_at DESC LIMIT 1 OFFSET 0` sqlParams := []interface{}{req.OriginID} dao.GetRow(dao.GetDB(), &good, sql, sqlParams) - globals.SugarLogger.Debugf("uupt OnWaybillMsg good=====%s ", utils.Format4Output(good, false)) param.OrderVendorID = good.VendorID //查询运单价格 if uuPrice, err := api.UuAPI.GetOrderDetail(req.OrderCode); err != nil { - globals.SugarLogger.Debugf("uuGetPrice err====%v", err) reallyPrice = 0 } else { reallyPrice = int64((utils.Str2Float64(uuPrice.OrderPrice) - utils.Str2Float64(uuPrice.PriceOff)) * 100) @@ -325,7 +323,6 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp default: globals.SugarLogger.Warnf("onWaybillMsg unknown State:%v", req.State) } - globals.SugarLogger.Debugf("UUPT onWaybillMsg param=====%s", utils.Format4Output(param, false)) if err := partner.CurOrderManager.OnWaybillStatusChanged(param); err != nil { return uuptapi.Err2CallbackResponse(err) }