From b85dc4d5c26aa80b1e78093548d242126d814844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 20 Aug 2024 18:15:56 +0800 Subject: [PATCH] 1 --- business/jxcallback/orderman/orderman_ext.go | 1 + business/partner/purchase/mtwm/order.go | 4 ++++ controllers/jx_order.go | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 28dc3f9ec..bcaa6171c 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -1401,6 +1401,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in VendorOrgCode string VendorStoreID string } + globals.SugarLogger.Debugf("--------------dateVendorList := %s", utils.Format4Output(dateVendorList, false)) if len(dateVendorList) > 0 { var missingOrderList []*tOrderVendorPair var updateOrderStatusList []*model.GoodsOrder diff --git a/business/partner/purchase/mtwm/order.go b/business/partner/purchase/mtwm/order.go index f55b6c613..07109f73d 100644 --- a/business/partner/purchase/mtwm/order.go +++ b/business/partner/purchase/mtwm/order.go @@ -793,6 +793,10 @@ func (c *PurchaseHandler) ListOrders(ctx *jxcontext.Context, vendorOrgCode strin //} tmpOrderIDs, _ := getAPI(vendorOrgCode, 0, vendorStoreID).EcommerceGetOrderIdByPage(vendorStoreID, queryDate, endData) + globals.SugarLogger.Debugf("-------------------tmpOrderIDs := %s", utils.Format4Output(tmpOrderIDs, false)) + globals.SugarLogger.Debugf("-------------------queryDate := %s", utils.Format4Output(queryDate, false)) + globals.SugarLogger.Debugf("-------------------endData := %s", utils.Format4Output(endData, false)) + globals.SugarLogger.Debugf("-------------------vendorStoreID := %s", utils.Format4Output(vendorStoreID, false)) if len(tmpOrderIDs) > 0 { for _, v := range tmpOrderIDs { orderIDs = append(orderIDs, utils.Int64ToStr(v)) diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 66c66970e..c40e60e6c 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -83,7 +83,7 @@ func (c *OrderController) SelfDelivered() { bills, _ := dao.GetWaybills(dao.GetDB(), params.VendorOrderID, nil) for _, b := range bills { if b.WaybillVendorID == model.VendorJXFakeWL && b.Status < model.OrderStatusDelivering { - return nil, "", fmt.Errorf("物流单正在同步回传率,请稍后再点击送达") + return nil, "-1", fmt.Errorf("物流单正在同步回传率,请稍后再点击送达") } }