diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 8ea1ddbc2..95d06ac04 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -518,6 +518,11 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo // isBlendWay = strings.Contains(mtStoreInfo.LogisticsCodes, model.MTWMStorePSWay8) //} + // 暂时只处理抖音平台,抖音暂无配送,只要是抖音订单,三方配送压单了,直接通知送出 + if order.VendorID == model.VendorIDDD && bill.Status == model.WaybillStatusNew { + s.SelfDeliverDelivering(order, "自配送中") + } + if bill.Status == model.WaybillStatusNew { s.addWaybill2Map(savedOrderInfo, bill) if !isPending { diff --git a/business/partner/purchase/tiktok_store/order.go b/business/partner/purchase/tiktok_store/order.go index 2d6c1f9cd..f8bd1410a 100644 --- a/business/partner/purchase/tiktok_store/order.go +++ b/business/partner/purchase/tiktok_store/order.go @@ -103,7 +103,7 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s InvoiceTaxerID: "", InvoiceEmail: "", VendorOrgCode: vendorOrgCode, - TotalShopMoney: utils.Float64TwoInt64(float64(result.PayAmount) * 0.95), // 抖音平台扣点金额0.05 + TotalShopMoney: utils.Float64TwoInt64(float64(result.OrderAmount) * 0.95), // 抖音平台扣点金额0.05 } // 本地获取订单记录 orderSeq, _ := dao.GetVendorOrderNumber(dao.GetDB(), model.VendorIDDD, order.VendorStoreID) @@ -479,7 +479,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac orderStatus.Status = model.OrderStatusUnknown orderStatus.Remark = "126-预约发货:" shopId = orderMsg.ShopId - case tiktokShop.CallbackWaitOrderMsgTagId: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货 + case FakeMsgType: // 应为需要同步京东,美团拣货功能制作的假拣货,抖音不存在拣货 orderMsg := tiktokShop.FakePickUpGoodsData{} if err := utils.Map2StructByJson(msg, &orderMsg, false); err != nil { return nil, 0 @@ -489,7 +489,7 @@ func (c *PurchaseHandler) callbackMsg2Status(msgId, orderId string, msg interfac orderStatus.StatusTime = time.Now() orderStatus.Status = model.OrderStatusFinishedPickup orderStatus.Remark = "15-抖音假拣货:" - shopId = 0 + shopId = orderMsg.ShopId default: return nil, 0 } @@ -508,9 +508,14 @@ func vendorStatusToLocalStatus(vendorStatus int64) int { return model.OrderStatusUnknown } -func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) { - msg := &tiktokShop.FakePickUpGoodsData{PId: vendorOrderID, VendorStatus: vendorStatus} - +func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, VendorStatus, appOrgCode string) { + // c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup) + msg := &tiktokShop.FakePickUpGoodsData{ + PId: vendorOrderID, + VendorStatus: VendorStatus, + Cmd: cmd, + ShopId: utils.Str2Int64(appOrgCode), + } utils.CallFuncAsync(func() { c.onOrderMsg(cmd, vendorOrderID, msg) }) @@ -547,7 +552,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo // err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").PreparationMealComplete(utils.Str2Int64(order.VendorOrderID)) // } //} - c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup) + c.postFakeMsg(order.VendorOrderID, FakeMsgType, fakeFinishedPickup, order.VendorOrgCode) return nil } @@ -568,12 +573,19 @@ func (c *PurchaseHandler) CanSwitch2SelfDeliver(order *model.GoodsOrder) (isCan return order.BusinessType != model.BusinessTypeDingshida, nil } -// Swtich2SelfDeliver 暂无转自送 +// Swtich2SelfDeliver 抖音转自送的时候就是通知抖音发货了 func (c *PurchaseHandler) Swtich2SelfDeliver(order *model.GoodsOrder, userName string) (err error) { - //if globals.EnableMtwmStoreWrite { - // err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderLogisticsChange2Self(utils.Str2Int64(order.VendorOrderID)) - //} - return err + return getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderDelivering(&order_logisticsAdd_request.OrderLogisticsAddParam{ + OrderId: order.VendorOrderID, + Company: "", + CompanyCode: "chengdouruoxi", + LogisticsCode: order.VendorWaybillID, + IsRefundReject: false, + IsRejectRefund: false, + SerialNumberList: nil, + AddressId: 0, + StoreId: utils.Str2Int64(order.VendorStoreID), + }) } // Swtich2SelfDelivered 暂无自送完成 @@ -642,12 +654,10 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod // CancelOrder 取消订单 (抖音商家无法发起退单操作,商家联系不到客户取消订单/拒收/缺货) func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { - if globals.EnableDdStoreWrite { - return errors.New("抖音商家无法发起退单操作") - //if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").OrderCancel(utils.Str2Int64(order.VendorOrderID), reason, mtwmapi.CancelReasonOther); err == nil { - // // 调用开放平台接口取消订单,不推送取消订单消息和退款消息。 - // c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel)) - //} + // 售后原因枚举 MissGram = 1缺重,必传克数、金额; MissItem = 2缺货,只支持整单退; RefuseSign = 3 拒收,支持按件数退,金额由抖音计算 + if _, err = getAPI(order.VendorOrgCode, 0, "").ApplyMarketAfterSale(utils.Str2Int64(order.VendorOrderID), 3); err == nil { + // 调用开放平台接口取消订单,不推送取消订单消息和退款消息。 + c.postFakeMsg(order.VendorOrderID, tiktokShop.CallbackCancelOrderMsgTagId, utils.Int2Str(tiktokShop.CreateOrderStatusCancel), order.VendorOrgCode) } return err } diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 3deae5052..2f5074c16 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -73,6 +73,8 @@ func QueryAllMainSkuList(appOrgCode string, param *MainSku) ([]*TiktokIdAndLocal localSkuId = skuDetail.OutProductId } else if skuDetail.OuterProductId != "" { localSkuId = utils.Str2Int64(skuDetail.OuterProductId) + } else { + localSkuId = utils.Str2Int64(skuDetail.SpecPrices[0].Code) } var attrId []string @@ -122,8 +124,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI api := getAPI(storeDetail.VendorOrgCode, storeID, vendorStoreID) if isCreate { syncType = "创建商品" - for _, storeSku := range storeSkuList { - // 创建商品 + for _, storeSku := range storeSkuList { // 创建商品 param := &product_addV2_request.ProductAddV2Param{ CategoryLeafId: utils.Str2Int64(storeSku.SkuVendorMapCatID), Name: utils.LimitUTF8StringLen(storeSku.SkuName, mtwmapi.MaxSkuNameCharCount), @@ -135,7 +136,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI Supply7dayReturn: 2, // 是否支持7天无理由,0不支持,1支持,2支持(拆封后不支持) Mobile: storeDetail.Tel1, Commit: true, - Specs: "净重|" + utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit, + Specs: "重量|" + utils.Float64ToStr(float64(storeSku.SpecQuality)) + storeSku.SpecUnit, NeedRechargeMode: false, SellChannel: []int64{0}, StartSaleType: 0, @@ -262,7 +263,7 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI Supply7dayReturn: 2, Mobile: storeDetail.Tel1, Commit: true, - Specs: "净重|" + fmt.Sprintf("%f", storeSku.SpecQuality) + storeSku.SpecUnit, + Specs: "重量|" + fmt.Sprintf("%f", storeSku.SpecQuality) + storeSku.SpecUnit, NeedRechargeMode: false, SellChannel: []int64{0}, StartSaleType: 0,