From 190f70a2681562b0ace5dcc6d8bd9b1fe822d810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 11:04:45 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=8E=E5=9B=A2?= =?UTF-8?q?=E9=85=8D=E9=80=81=E5=9C=B0=E5=9D=80=E8=BE=BE=E6=A0=87=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/rider.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index fbebed0d2..4ac8f9f8a 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -87,10 +87,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { } } - if riderInfo == nil || wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (riderInfo.CourierName == "" && v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 + if wayBillStatus == model.OrderStatusNew || wayBillStatus == model.OrderStatusCanceled || (v.WaybillVendorID == -1 && v.DeliveryType == "store") { // 真商家自送 riderInfo.OrderId = v.VendorOrderID riderInfo.CourierName = "门店老板" - riderInfo.CourierPhone = "18048531223" riderInfo.LogisticsProviderCode = "10017" riderInfo.LogisticsStatus = v.Status storeDetail, err := dao.GetStoreDetail(dao.GetDB(), v.JxStoreID, 0, "") @@ -139,9 +138,8 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { // 目前只推送美团骑手信息 switch v.VendorID { 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 { + if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, utils.Struct2Map(riderInfo, "", true)); err != nil { globals.SugarLogger.Errorf("Error pushing meituan rider information :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err) } } From ee7a4aba49a4307d0efd8e402e588fb117383d6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 14:31:15 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/unipush/push.go | 1 + business/partner/delivery/rider.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 26dad7ee1..3a3741b5d 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -221,6 +221,7 @@ func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, bo } if err := api.UniAppApi.SendMsgByUinApp(param); err != nil { + globals.SugarLogger.Errorf("SendMsgByUinApp err := %v", err) errs = append(errs, err) } } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 4ac8f9f8a..9da71d58d 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -140,7 +140,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { case model.VendorIDMTWM: // 美团订单 if handler := partner.GetPurchaseOrderHandlerFromVendorID(v.VendorID); handler != nil { if err := handler.GetOrderRider(v.VendorOrgCode, v.VendorStoreID, utils.Struct2Map(riderInfo, "", true)); err != nil { - globals.SugarLogger.Errorf("Error pushing meituan rider information :%s--%s--%v", riderInfo.OrderId, riderInfo.ThirdCarrierOrderId, err) + globals.SugarLogger.Errorf("Error pushing meituan rider information :%s--%s--%v", v.VendorOrderID, utils.Format4Output(riderInfo, false), err) } } case model.VendorIDELM: // 饿了么 From 484ce07d34e1ed45584b682a285d297917034078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 15:11:09 +0800 Subject: [PATCH 03/14] 1 --- business/jxutils/unipush/push.go | 2 +- business/partner/delivery/rider.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 3a3741b5d..6beaf271d 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -221,7 +221,7 @@ func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, bo } if err := api.UniAppApi.SendMsgByUinApp(param); err != nil { - globals.SugarLogger.Errorf("SendMsgByUinApp err := %v", err) + globals.SugarLogger.Errorf("SendMsgByUinApp err := %v,%d", err, utils.Format4Output(param, false)) errs = append(errs, err) } } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 9da71d58d..6617294cb 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -62,6 +62,12 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if orderId == "" && v.VendorID == model.VendorIDDD { // 抖音门店订单除了三方配送回调时推送,不在主动推送配送消息 continue } + + // 平台自配送 + if v.WaybillVendorID == model.YES { + continue + } + if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID) if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { From c72c2f077fcd0cd30976db3add8eb813e365cd65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 15:11:33 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/unipush/push.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 6beaf271d..41a96a572 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -221,7 +221,7 @@ func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, bo } if err := api.UniAppApi.SendMsgByUinApp(param); err != nil { - globals.SugarLogger.Errorf("SendMsgByUinApp err := %v,%d", err, utils.Format4Output(param, false)) + globals.SugarLogger.Errorf("SendMsgByUinApp err := %v,%s", err, utils.Format4Output(param, false)) errs = append(errs, err) } } From fff6007567d03ac9ab89890950f6c8c1176675f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 15:41:12 +0800 Subject: [PATCH 05/14] 1 --- business/jxutils/unipush/push.go | 1 - business/partner/delivery/rider.go | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/business/jxutils/unipush/push.go b/business/jxutils/unipush/push.go index 41a96a572..26dad7ee1 100644 --- a/business/jxutils/unipush/push.go +++ b/business/jxutils/unipush/push.go @@ -221,7 +221,6 @@ func pushMsgByUniApp(storeId int, storeName string, cID []string, msg string, bo } if err := api.UniAppApi.SendMsgByUinApp(param); err != nil { - globals.SugarLogger.Errorf("SendMsgByUinApp err := %v,%s", err, utils.Format4Output(param, false)) errs = append(errs, err) } } diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 6617294cb..69f4a8141 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -67,7 +67,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if v.WaybillVendorID == model.YES { continue } - + if orderId == "" { // 订单id为空是,是定时轮询操作,不做此状态 waybillList, _ := dao.GetWaybills(dao.GetDB(), v.VendorOrderID) if len(waybillList) > 0 && waybillList[0].Status > model.WaybillStatusEndBegin { @@ -109,7 +109,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { riderInfo.LogisticsStatus = 0 riderInfo.OpCode = tiktok_api.TiktokLogisticsStatusCALLRIDER case 12: // 骑手接单 - riderInfo.LogisticsStatus = 12 + riderInfo.LogisticsStatus = 10 riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED case 15: // 到店 riderInfo.LogisticsStatus = 15 @@ -166,7 +166,7 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { case model.VendorIDDD: // 抖店小时达 continue default: - globals.SugarLogger.Errorf("Order source error, non system order") + globals.SugarLogger.Errorf("Order source error, non system order: %s", v.VendorOrderID) continue } } From 3699a1be162c4a55ec43afb6b774e96246b16086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Fri, 28 Apr 2023 18:18:00 +0800 Subject: [PATCH 06/14] 1' --- business/partner/delivery/rider.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 69f4a8141..6194b1268 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -98,10 +98,6 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { riderInfo.CourierName = "门店老板" riderInfo.LogisticsProviderCode = "10017" riderInfo.LogisticsStatus = v.Status - storeDetail, err := dao.GetStoreDetail(dao.GetDB(), v.JxStoreID, 0, "") - if err != nil { - riderInfo.CourierPhone = storeDetail.Tel1 - } } switch riderInfo.LogisticsStatus { @@ -141,6 +137,18 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { if riderInfo.Latitude == "" { riderInfo.Latitude = utils.Float64ToStr(utils.Int2Float64(v.ConsigneeLat) / 1000000) } + + if riderInfo.CourierPhone == "" { + storeDetail, err := dao.GetStoreDetail(dao.GetDB(), v.JxStoreID, 0, "") + if err != nil { + riderInfo.CourierPhone = storeDetail.Tel1 + } + riderInfo.CourierName = "老板" + } + if riderInfo.CourierPhone == "" { + riderInfo.CourierName = "石锋" + riderInfo.CourierPhone = "18048531223" + } // 目前只推送美团骑手信息 switch v.VendorID { case model.VendorIDMTWM: // 美团订单 From 64f26c00172145e9c053cdfa3e8cdae5e9c50bce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 15:48:48 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E7=BB=93=E7=AE=97=E4=BF=A1=E6=81=AF(=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E9=85=8D=E9=80=81=E8=B4=B9,=E4=BF=9D=E9=99=A9?= =?UTF-8?q?=E8=B4=B9),=E9=85=8D=E9=80=81=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/basesch/basesch_ext.go | 12 ++++- business/partner/delivery/rider.go | 47 ++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index c7df132cb..610d298c3 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -230,7 +230,7 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s ) waybills, _ := dao.GetWaybills(db, order.VendorOrderID) //美团的订单如果是同意全部退款，要取消所有三方运单并停止调度 - if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDJX { + if order.VendorID == model.VendorIDMTWM || order.VendorID == model.VendorIDJX || order.VendorID == model.VendorIDEBAI { var ( afsCount, orderCount int ) @@ -255,6 +255,16 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s order.VendorStatus = utils.Int2Str(model.OrderStatusCanceled) partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag", "Status", "VendorStatus"}) } + if afsCount == orderCount && order.VendorID == model.VendorIDEBAI { + order.DeliveryFlag |= model.OrderDeliveryFlagMaskScheduleDisabled + order.Status = model.OrderStatusCanceled + order.VendorStatus = "10" // 饿百取消订单 + partner.CurOrderManager.UpdateOrderFields(order, []string{"DeliveryFlag", "Status", "VendorStatus"}) + for _, v := range waybills { + c.CancelWaybill(v, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) + } + + } } if order.EarningType == model.EarningTypePoints { var ( diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 6194b1268..15618643d 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -20,6 +20,33 @@ import ( "git.rosy.net.cn/jx-callback/globals" ) +var ( + // 换成京西结算账号 + jxSettleIdMap = map[int64]bool{ + // 菜市 + 7030017: true, + 7974502: true, + 100639968: true, + 100715370: true, + 100822700: true, + 101093797: true, + 102715080: true, + 102114997: true, + 102641826: true, + 102651220: true, + // 果园啊 + 6572945: true, + 6772759: true, + 101968432: true, + 102101411: true, + 102176700: true, + 102369597: true, + 102416681: true, + 102924441: true, + 103376926: true, + } +) + // 订单骑手信息推送:将获取到的三方配送订单,且订单状态为配送中的订单,将配送人员的信息返回给订单方 // 该方法为定时任务,没五分钟推送一次订单消息,订单状态发生变化时 //配送状态code，如下提供配送状态枚举值， @@ -397,18 +424,36 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeListValue := batchItemList[0].([]*model.StoreMap) for _, v := range storeListValue { - storeOrder, err := mtwm.GetAPI(v.VendorOrgCode, v.StoreID, v.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ + storeOrder, settleId, err := mtwm.GetAPI(v.VendorOrgCode, v.StoreID, v.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ AppPoiCode: v.VendorStoreID, StartDate: from, EndDate: to, Offset: 0, Limit: 200, }) + globals.SugarLogger.Debugf("==========order lens : %d,settleID :%d,err:%v", len(storeOrder), settleId, err) if err != nil { + globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) return nil, err } + // 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!) + if settleId != model.NO && jxSettleIdMap[settleId] { + globals.SugarLogger.Debugf("=================================1") + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.NO, model.NO, v.VendorStoreID, utils.DefaultTimeValue}...); err != nil { + globals.SugarLogger.Debugf("将门店修改为非服务商和系统发单: %v", err) + } + } else { + globals.SugarLogger.Debugf("=================================1.1") + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.YES, model.YES, v.VendorStoreID, utils.DefaultTimeValue}...); err != nil { + globals.SugarLogger.Debugf("将门店修改为服务商和门店发单: %v", err) + } + } + globals.SugarLogger.Debugf("=================================2") for _, so := range storeOrder { + globals.SugarLogger.Debugf("=================================so : %s", utils.Format4Output(so, false)) // 更新订单的结算信息 if so.PlatformSettlement > 0 { goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` From 7215b907ac62e3e85bcb675118c9a552639b77d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 16:17:41 +0800 Subject: [PATCH 08/14] 1 --- business/partner/delivery/rider.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 15618643d..65fdf6b7e 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -415,7 +415,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er from = startTime to = endTime } - storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDMTWM}, jxStoreId, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, model.StoreStatusAll, 0, "", "", "") + storeMapList, err := dao.GetStoresMapList(db, []int{model.VendorIDMTWM}, jxStoreId, []int{model.StoreStatusClosed, model.StoreStatusHaveRest, model.StoreStatusOpened}, model.StoreStatusAll, model.StoreIsSyncAll, "", "", "") if err != nil || len(storeMapList) == model.NO { globals.SugarLogger.Errorf("获取美团门店列表异常: %v", err) return err From 5c23542d124cea0e30ad885977f2698e419ee034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 16:22:58 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/rider.go | 84 +++++++++++++++--------------- 1 file changed, 41 insertions(+), 43 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 65fdf6b7e..3f9f1d288 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -422,56 +422,54 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er } taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - storeListValue := batchItemList[0].([]*model.StoreMap) - for _, v := range storeListValue { - storeOrder, settleId, err := mtwm.GetAPI(v.VendorOrgCode, v.StoreID, v.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ - AppPoiCode: v.VendorStoreID, - StartDate: from, - EndDate: to, - Offset: 0, - Limit: 200, - }) - globals.SugarLogger.Debugf("==========order lens : %d,settleID :%d,err:%v", len(storeOrder), settleId, err) - if err != nil { - globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) - return nil, err - } + storeListValue := batchItemList[0].(*model.StoreMap) + storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ + AppPoiCode: storeListValue.VendorStoreID, + StartDate: from, + EndDate: to, + Offset: 0, + Limit: 200, + }) + globals.SugarLogger.Debugf("==========order lens : %d,settleID :%d,err:%v", len(storeOrder), settleId, err) + if err != nil { + globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) + return nil, err + } - // 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!) - if settleId != model.NO && jxSettleIdMap[settleId] { - globals.SugarLogger.Debugf("=================================1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` - if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.NO, model.NO, v.VendorStoreID, utils.DefaultTimeValue}...); err != nil { - globals.SugarLogger.Debugf("将门店修改为非服务商和系统发单: %v", err) - } - } else { - globals.SugarLogger.Debugf("=================================1.1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` - if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.YES, model.YES, v.VendorStoreID, utils.DefaultTimeValue}...); err != nil { - globals.SugarLogger.Debugf("将门店修改为服务商和门店发单: %v", err) + // 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!) + if settleId != model.NO && jxSettleIdMap[settleId] { + globals.SugarLogger.Debugf("=================================1") + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.NO, model.NO, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { + globals.SugarLogger.Debugf("将门店修改为非服务商和系统发单: %v", err) + } + } else { + globals.SugarLogger.Debugf("=================================1.1") + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.YES, model.YES, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { + globals.SugarLogger.Debugf("将门店修改为服务商和门店发单: %v", err) + } + } + globals.SugarLogger.Debugf("=================================2") + for _, so := range storeOrder { + globals.SugarLogger.Debugf("=================================so : %s", utils.Format4Output(so, false)) + // 更新订单的结算信息 + if so.PlatformSettlement > 0 { + goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` + if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement + so.TimingFee + so.DeliveryFee, so.OrderId}...); err != nil { + globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err) } } - globals.SugarLogger.Debugf("=================================2") - for _, so := range storeOrder { - globals.SugarLogger.Debugf("=================================so : %s", utils.Format4Output(so, false)) - // 更新订单的结算信息 - if so.PlatformSettlement > 0 { - goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` - if _, err := dao.ExecuteSQL(db, goodsOrderSql, []interface{}{so.PlatformSettlement + so.TimingFee + so.DeliveryFee, so.OrderId}...); err != nil { - globals.SugarLogger.Debugf("更新订单结算信息错误: %v", err) - } + // 更新订单的配送信息 + if so.TimingFee != 0 || so.DeliveryFee != 0 { + wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE g.vendor_order_id = ? AND g.vendor_waybill_id = ? ` + if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee * -1, so.TimingFee * -1, so.OrderId, so.OrderId}...); err != nil { + globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) } - // 更新订单的配送信息 - if so.TimingFee != 0 || so.DeliveryFee != 0 { - wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE g.vendor_order_id = ? AND g.vendor_waybill_id = ? ` - if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee * -1, so.TimingFee * -1, so.OrderId, so.OrderId}...); err != nil { - globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) - } - } - } } + return retVal, err } task := tasksch.NewParallelTask("更新美团订单配送费/保险费/结算信息", tasksch.NewParallelConfig().SetParallelCount(4), jxcontext.AdminCtx, taskFunc, storeMapList) From c45fec0a6dd3d52e6427188421dcf92ecb82671f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 16:42:28 +0800 Subject: [PATCH 10/14] 1 --- business/partner/delivery/rider.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 3f9f1d288..1e1e7c2ff 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -423,14 +423,14 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeListValue := batchItemList[0].(*model.StoreMap) - storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(&mtwmapi.Bill{ + billListParam := &mtwmapi.Bill{ AppPoiCode: storeListValue.VendorStoreID, StartDate: from, EndDate: to, Offset: 0, Limit: 200, - }) - globals.SugarLogger.Debugf("==========order lens : %d,settleID :%d,err:%v", len(storeOrder), settleId, err) + } + storeOrder, settleId, err := mtwm.GetAPI(storeListValue.VendorOrgCode, storeListValue.StoreID, storeListValue.VendorStoreID).GetStoreBillList(billListParam) if err != nil { globals.SugarLogger.Debugf("GetStoreBillList err : %v", err) return nil, err @@ -438,21 +438,18 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er // 如果收款账户为京西的收款账户,则此门店不是服务商(否则是服务商,使用门店发单[需要自己的账户充值金额才行]!) if settleId != model.NO && jxSettleIdMap[settleId] { - globals.SugarLogger.Debugf("=================================1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE s.vendor_store_id = ? AND s.deleted_at = ?` if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.NO, model.NO, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("将门店修改为非服务商和系统发单: %v", err) } } else { - globals.SugarLogger.Debugf("=================================1.1") - brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE g.vendor_store_id = ? AND d.deleted_at = ?` + brandSql := `UPDATE store_map s SET s.create_delivery_type = ?,s.is_service = ? WHERE s.vendor_store_id = ? AND s.deleted_at = ?` if _, err := dao.ExecuteSQL(db, brandSql, []interface{}{model.YES, model.YES, storeListValue.VendorStoreID, utils.DefaultTimeValue}...); err != nil { globals.SugarLogger.Debugf("将门店修改为服务商和门店发单: %v", err) } } - globals.SugarLogger.Debugf("=================================2") + for _, so := range storeOrder { - globals.SugarLogger.Debugf("=================================so : %s", utils.Format4Output(so, false)) // 更新订单的结算信息 if so.PlatformSettlement > 0 { goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` From ff8b9be0ddb48ba6fae3fc1a4f08d96a12712f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 16:43:11 +0800 Subject: [PATCH 11/14] 1 --- business/partner/delivery/rider.go | 1 + 1 file changed, 1 insertion(+) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 1e1e7c2ff..33961f911 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -450,6 +450,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er } for _, so := range storeOrder { + globals.SugarLogger.Debugf("so=== : %s", utils.Format4Output(so, false)) // 更新订单的结算信息 if so.PlatformSettlement > 0 { goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` From 3bb83ebaf3591e187b7182c4f28cb8f865456e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 17:02:38 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=A8=E5=BA=97?= =?UTF-8?q?=E9=85=8D=E9=80=81=E8=B4=B9=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/delivery/rider.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 33961f911..288fa65d4 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -176,6 +176,9 @@ func GetOrderRiderInfoToPlatform(orderId string, wayBillStatus int) { riderInfo.CourierName = "石锋" riderInfo.CourierPhone = "18048531223" } + if riderInfo.ThirdCarrierOrderId == "" { + riderInfo.ThirdCarrierOrderId = riderInfo.OrderId + "_fake" + } // 目前只推送美团骑手信息 switch v.VendorID { case model.VendorIDMTWM: // 美团订单 @@ -460,7 +463,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er } // 更新订单的配送信息 if so.TimingFee != 0 || so.DeliveryFee != 0 { - wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE g.vendor_order_id = ? AND g.vendor_waybill_id = ? ` + wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? ` if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee * -1, so.TimingFee * -1, so.OrderId, so.OrderId}...); err != nil { globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) } From 20ca1073b9a3cbccc0b717ca2f64a0cd3ee28dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 17:15:54 +0800 Subject: [PATCH 13/14] 1 --- business/partner/delivery/rider.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 288fa65d4..78591e901 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -453,7 +453,6 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er } for _, so := range storeOrder { - globals.SugarLogger.Debugf("so=== : %s", utils.Format4Output(so, false)) // 更新订单的结算信息 if so.PlatformSettlement > 0 { goodsOrderSql := `UPDATE goods_order g SET g.total_shop_money = ? WHERE g.vendor_order_id = ? ` @@ -464,7 +463,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er // 更新订单的配送信息 if so.TimingFee != 0 || so.DeliveryFee != 0 { wayBillSql := `UPDATE waybill w SET w.desired_fee = ?,w.punctual_fee = ? WHERE w.vendor_order_id = ? AND w.vendor_waybill_id = ? ` - if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee * -1, so.TimingFee * -1, so.OrderId, so.OrderId}...); err != nil { + if _, err := dao.ExecuteSQL(db, wayBillSql, []interface{}{so.DeliveryFee, so.TimingFee, so.OrderId, so.OrderId}...); err != nil { globals.SugarLogger.Debugf("更新订单物流结算信息错误: %v", err) } } From 85b2870a5e48cfea4a8bd8af02db5ddb09ce013d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 4 May 2023 17:36:46 +0800 Subject: [PATCH 14/14] 1 --- business/jxstore/misc/misc.go | 4 ++-- business/partner/delivery/rider.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 1ce45fbc0..33c0fa3fa 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -222,9 +222,9 @@ func Init() { // 每天更新美团门当的结算信息和配送费等等 ScheduleTimerFunc("LoadingStoreOrderSettleAmount", func() { - // delivery.LoadingStoreOrderSettleAmount(0, 0, nil) + delivery.LoadingStoreOrderSettleAmount(0, 0, nil) }, []string{ - "04:50:00", + "19:50:00", }) // 定时任务更新昨天的都要商品和本地商品id的映射关系 diff --git a/business/partner/delivery/rider.go b/business/partner/delivery/rider.go index 78591e901..01a479019 100644 --- a/business/partner/delivery/rider.go +++ b/business/partner/delivery/rider.go @@ -410,7 +410,7 @@ func LoadingStoreOrderSettleAmount(startTime, endTime int64, jxStoreId []int) er var ( db = dao.GetDB() now = time.Now() - from = time.Date(now.Year(), now.Month(), now.Day()-2, 0, 0, 0, 0, time.Local).Unix() + from = time.Date(now.Year(), now.Month(), now.Day()-4, 0, 0, 0, 0, time.Local).Unix() to = time.Date(now.Year(), now.Month(), now.Day()-1, 23, 59, 59, 59, time.Local).Unix() )