diff --git a/business/jxstore/misc/misc.go b/business/jxstore/misc/misc.go index 43082461e..2e16a79b2 100644 --- a/business/jxstore/misc/misc.go +++ b/business/jxstore/misc/misc.go @@ -195,7 +195,7 @@ func Init() { orderman.UpdateTiktokShopTotalMoney() }, []string{ "03:35:00", - "16:35:00", + "11:05:00", }) /// 更新淘鲜达结算信息 ScheduleTimerFunc("UpdateTaoTotalMoney", func() { diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 408aed0ed..504ecce37 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -442,7 +442,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } } - globals.SugarLogger.Debugf("============================%s", utils.Format4Output(foodDataList, false)) if globals.EnableMtwmStoreWrite { if len(foodDataList) == 1 { foodDataList[0]["skus"] = string(utils.MustMarshal(foodDataList[0]["skus"])) diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index b3c3c32e6..ff46b3dff 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -242,9 +242,10 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s // GetOrderRider 商家自配送同步配送信息 func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) { - appKey := `7152420904331429407` // 暂时定死 - appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死 - return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfoNew(param) + //appKey := `7152420904331429407` // 暂时定死 + //appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死 + //return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfoNew(param) + return getAPI(vendorOrgCode, 0, vendorStoreID).OrderStatusAndPsInfoNew(param) } func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) { @@ -653,13 +654,21 @@ func (c *PurchaseHandler) SelfDeliverDelivered(order *model.GoodsOrder, userName ThirdCarrierOrderId: order.VendorOrderID, CourierName: "", CourierPhone: "", - LogisticsProviderCode: "10002", + LogisticsProviderCode: utils.MyselfPsCode, LogisticsStatus: 0, LogisticsContext: "商家自配送,已送达", Latitude: "", Longitude: "", OpCode: tiktokShop.TiktokLogisticsDELIVERED, } + bills, _ := dao.GetWaybills(dao.GetDB(), order.VendorOrderID, nil) + for _, v := range bills { + if v.Status == model.OrderStatusCanceled { + continue + } + riderInfo.CourierName = v.CourierName + riderInfo.CourierPhone = v.CourierMobile + } return c.GetOrderRider("", "", utils.Struct2MapByJson(riderInfo)) } diff --git a/business/partner/purchase/tiktok_store/order_afs_utils.go b/business/partner/purchase/tiktok_store/order_afs_utils.go index 554600739..e3be092a0 100644 --- a/business/partner/purchase/tiktok_store/order_afs_utils.go +++ b/business/partner/purchase/tiktok_store/order_afs_utils.go @@ -124,7 +124,7 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * } } else { if err2 := partner.CurOrderManager.OnAfsOrderStatusChanged(orderStatus); err2 == nil { - if msgId == tiktokShop.CallbackRefundOrderSuccessMsgTagId { + if msgId == tiktokShop.CallbackRefundOrderSuccessMsgTagId || msgId == tiktokShop.CallbackReturnRefundAgreedMsgTagId { skuList, _ := dao.GetSimpleOrderSkus(db, orderStatus.RefVendorOrderID, nil) totalSkuCount := 0 for _, v := range skuList { @@ -142,6 +142,16 @@ func (c *PurchaseHandler) onAfsOrderMsg(msgId string, msg interface{}) (retVal * goodsOrder.VendorStatus = orderStatus.VendorStatus dao.UpdateEntity(db, goodsOrder, "Status", "VendorStatus") // 取消三方运单 + wayBill, _ := dao.GetWaybills(db, orderStatus.RefVendorOrderID, nil) + for _, v := range wayBill { + if v.Status != model.WaybillStatusCanceled { + if handlerInfo := partner.GetDeliveryPlatformFromVendorID(v.WaybillVendorID); handlerInfo != nil { + if err := handlerInfo.Handler.CancelWaybill(v, 0, "订单被取消了"); err != nil { + partner.CurOrderManager.OnOrderMsg(goodsOrder, "", fmt.Sprintf("抖店订单取消时,取消运单异常:%s", err.Error())) + } + } + } + } } }