From f6e9dca62bd4f789ff2868b925a7ca550be4ce27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Jul 2023 16:57:01 +0800 Subject: [PATCH 01/15] 1 --- business/partner/purchase/tao_vegetable/order_afs.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index bc902f1a4..aed539bf2 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -324,10 +324,12 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal skuStr := *v.Attributes str2, err := strconv.Unquote("\"" + skuStr + "\"") if err != nil { + globals.SugarLogger.Debugf("Unquote := %s", utils.Format4Output(err, false)) return tao_vegetable.CallBackResultInfo(err) } skuDetail := tao_vegetable.GoodsScarceRefund{} if err := json.Unmarshal([]byte(str2), &skuDetail); err != nil { + globals.SugarLogger.Debugf("Unmarshal := %s", utils.Format4Output(err, false)) return tao_vegetable.CallBackResultInfo(err) } From d05fb9d0cb429d79aa7223913299932673128561 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Jul 2023 17:01:39 +0800 Subject: [PATCH 02/15] 1 --- .../partner/purchase/tao_vegetable/order_afs.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index aed539bf2..b13dff935 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -17,7 +17,6 @@ import ( "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" - "strconv" "time" ) @@ -322,13 +321,13 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal for _, v := range *scarceGoods { var refundFee int64 = 0 skuStr := *v.Attributes - str2, err := strconv.Unquote("\"" + skuStr + "\"") - if err != nil { - globals.SugarLogger.Debugf("Unquote := %s", utils.Format4Output(err, false)) - return tao_vegetable.CallBackResultInfo(err) - } + //str2, err := strconv.Unquote("\"" + skuStr + "\"") + //if err != nil { + // globals.SugarLogger.Debugf("Unquote := %s", utils.Format4Output(err, false)) + // return tao_vegetable.CallBackResultInfo(err) + //} skuDetail := tao_vegetable.GoodsScarceRefund{} - if err := json.Unmarshal([]byte(str2), &skuDetail); err != nil { + if err := json.Unmarshal([]byte(skuStr), &skuDetail); err != nil { globals.SugarLogger.Debugf("Unmarshal := %s", utils.Format4Output(err, false)) return tao_vegetable.CallBackResultInfo(err) } From e11958e45df6c8f174145a9a4b8d9978f80fb630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Jul 2023 17:02:08 +0800 Subject: [PATCH 03/15] 1 --- business/partner/purchase/tao_vegetable/order_afs.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index b13dff935..441e9e9af 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -320,15 +320,8 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal for _, v := range *scarceGoods { var refundFee int64 = 0 - skuStr := *v.Attributes - //str2, err := strconv.Unquote("\"" + skuStr + "\"") - //if err != nil { - // globals.SugarLogger.Debugf("Unquote := %s", utils.Format4Output(err, false)) - // return tao_vegetable.CallBackResultInfo(err) - //} skuDetail := tao_vegetable.GoodsScarceRefund{} - if err := json.Unmarshal([]byte(skuStr), &skuDetail); err != nil { - globals.SugarLogger.Debugf("Unmarshal := %s", utils.Format4Output(err, false)) + if err := json.Unmarshal([]byte(*v.Attributes), &skuDetail); err != nil { return tao_vegetable.CallBackResultInfo(err) } From 1628d5cf0e870dec4ad7141dba047bb09bb52a07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 10 Jul 2023 18:45:52 +0800 Subject: [PATCH 04/15] 1 --- .../partner/purchase/tao_vegetable/order.go | 55 ++++++++++++------- .../purchase/tao_vegetable/order_afs.go | 40 +++++++------- 2 files changed, 57 insertions(+), 38 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 0c8bc9c2b..d89a62b91 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -641,26 +641,42 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod // CancelOrder 商户取消订单(取消订单全部商品) func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") + localSkuList, _ := dao.GetSimpleOrderSkus(dao.GetDB(), order.VendorOrderID, nil) + skuMap := make(map[string]*model.OrderSku, 0) + for _, v := range localSkuList { + skuMap[v.VendorSubOrderID] = v + } orderSkuList, err := getOrderCancelList(api, order) if err != nil { return err } - outSubOrderIds := make([]string, 0, len(*orderSkuList.OutSubOrders)) + outSubOrderIds := make([]domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO, 0, len(*orderSkuList.OutSubOrders)) for _, v := range *orderSkuList.OutSubOrders { if *v.CanReverse { - outSubOrderIds = append(outSubOrderIds, *v.OutSubOrderId) + subOrder := domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO{ + RefundFee: utils.String2Pointer(utils.Int64ToStr(*v.MaxRefundFee)), + RefundAmount: nil, + OutSubOrderId: v.OutSubOrderId, + } + if skuMap[*v.OutSubOrderId] != nil { + subOrder.RefundAmount = utils.String2Pointer(utils.Int2Str(skuMap[*v.OutSubOrderId].Count)) + } else { + continue + } + outSubOrderIds = append(outSubOrderIds, subOrder) } } reasonId := *orderSkuList.ReasonList - param := &request3156.AlibabaTclsAelophyRefundCsapplyRequest{ - RefundCsApplyDTO: &domain3156.AlibabaTclsAelophyRefundCsapplyRefundCsApplyDto{ - ReasonId: reasonId[0].ReasonId, - OutOrderId: utils.String2Pointer(order.VendorOrderID2), - StoreId: utils.String2Pointer(order.VendorStoreID), - RequestId: utils.String2Pointer(fmt.Sprintf("%s%d", order.VendorStoreID, time.Now().UnixNano())), - OutSubOrderIds: &outSubOrderIds, - Memo: utils.String2Pointer(reason), + param := &request3156.AlibabaTclsAelophyRefundCsapplyNewRequest{ + RefundCsApplyDTO: &domain3156.AlibabaTclsAelophyRefundCsapplyNewRefundCsApplyNewDTO{ + ReasonId: reasonId[0].ReasonId, + OutOrderId: utils.String2Pointer(order.VendorOrderID2), + StoreId: utils.String2Pointer(order.VendorStoreID), + RequestId: utils.String2Pointer(fmt.Sprintf("%s%d", order.VendorStoreID, time.Now().UnixNano())), + Memo: utils.String2Pointer(reason), + SubRefundOrders: &outSubOrderIds, + RefundReason: utils.String2Pointer(reason), }, } @@ -668,15 +684,16 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusMerchantCancel, tao_vegetable.OrderStatusMerchantCancel) } - // 发送取消状态,商户取消 - err = api.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{ - WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ - StoreId: utils.String2Pointer(order.VendorStoreID), - BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)), - Status: utils.String2Pointer(tao_vegetable.OrderStatusMerchantCancel), - }, - }) - + if order.Status < model.OrderStatusEndBegin { + // 发送取消状态,商户取消 + err = api.DeliveryFinish(&request591.AlibabaAelophyOrderWorkCallbackRequest{ + WorkCallbackRequest: &domain591.AlibabaAelophyOrderWorkCallbackWorkCallbackRequest{ + StoreId: utils.String2Pointer(order.VendorStoreID), + BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)), + Status: utils.String2Pointer(tao_vegetable.OrderStatusMerchantCancel), + }, + }) + } return err } diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index 441e9e9af..28d30c2de 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -429,26 +429,28 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) orderStatus.Remark = fmt.Sprintf("QueryTaoAfsOrderId:%s", refundData.BizSubRefundId) orderStatus.VendorOrderID = refundData.OutMainRefundId } else { - param := &request591.AlibabaWdkOrderRefundGetRequest{ - OrderFrom: utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)), - ShopId: nil, - StoreId: utils.String2Pointer(refundData.StoreId), - RefundIds: &[]int64{utils.Str2Int64(refundData.BizSubRefundId)}, - } - time.Sleep(time.Second * 1) - refundAfs, _ := getAPI("", 0, refundData.StoreId).QueryAfsOrderDetail(param) - if refundAfs.Orders == nil { - globals.SugarLogger.Debugf("================售中退款成功回调查询售后单为空:") - } else { - orders := *refundAfs.Orders - orderStatus.RefVendorOrderID = utils.Int64ToStr(*orders[0].OriginParentId) - orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusRefundSuccess, "用户售中退款成功") - orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusRefundSuccess) - orderStatus.StatusTime = time.Now() - orderStatus.Remark = fmt.Sprintf("QueryTaoAfsOrderId:%s", refundData.BizSubRefundId) - orderStatus.VendorOrderID = utils.Int64ToStr(*orders[0].RefundOrderId) - taoRefundList = refundAfs.Orders + var refundAfs *domain591.AlibabaWdkOrderRefundGetOrderSyncRefundListResult + for i := 0; i < 4; i++ { + param := &request591.AlibabaWdkOrderRefundGetRequest{ + OrderFrom: utils.Int64ToPointer(utils.Str2Int64(tao_vegetable.TaoVegetableChannelCode)), + ShopId: nil, + StoreId: utils.String2Pointer(refundData.StoreId), + RefundIds: &[]int64{utils.Str2Int64(refundData.BizSubRefundId)}, + } + refundAfs, _ = getAPI("", 0, refundData.StoreId).QueryAfsOrderDetail(param) + if refundAfs.Orders != nil { + break + } + time.Sleep(time.Second * 1) } + orders := *refundAfs.Orders + orderStatus.RefVendorOrderID = utils.Int64ToStr(*orders[0].OriginParentId) + orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusRefundSuccess, "用户售中退款成功") + orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusRefundSuccess) + orderStatus.StatusTime = time.Now() + orderStatus.Remark = fmt.Sprintf("QueryTaoAfsOrderId:%s", refundData.BizSubRefundId) + orderStatus.VendorOrderID = utils.Int64ToStr(*orders[0].RefundOrderId) + taoRefundList = refundAfs.Orders } } From 5cb534a4a711c58801a3232f412cb2911662d85c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 09:09:31 +0800 Subject: [PATCH 05/15] 1 --- .../partner/purchase/tao_vegetable/order.go | 86 ++++++++++--------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index d89a62b91..a0bb7c184 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -641,48 +641,6 @@ func (c *PurchaseHandler) AgreeOrRefuseCancel(ctx *jxcontext.Context, order *mod // CancelOrder 商户取消订单(取消订单全部商品) func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.GoodsOrder, reason string) (err error) { api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") - localSkuList, _ := dao.GetSimpleOrderSkus(dao.GetDB(), order.VendorOrderID, nil) - skuMap := make(map[string]*model.OrderSku, 0) - for _, v := range localSkuList { - skuMap[v.VendorSubOrderID] = v - } - orderSkuList, err := getOrderCancelList(api, order) - if err != nil { - return err - } - outSubOrderIds := make([]domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO, 0, len(*orderSkuList.OutSubOrders)) - for _, v := range *orderSkuList.OutSubOrders { - if *v.CanReverse { - subOrder := domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO{ - RefundFee: utils.String2Pointer(utils.Int64ToStr(*v.MaxRefundFee)), - RefundAmount: nil, - OutSubOrderId: v.OutSubOrderId, - } - if skuMap[*v.OutSubOrderId] != nil { - subOrder.RefundAmount = utils.String2Pointer(utils.Int2Str(skuMap[*v.OutSubOrderId].Count)) - } else { - continue - } - outSubOrderIds = append(outSubOrderIds, subOrder) - } - } - - reasonId := *orderSkuList.ReasonList - param := &request3156.AlibabaTclsAelophyRefundCsapplyNewRequest{ - RefundCsApplyDTO: &domain3156.AlibabaTclsAelophyRefundCsapplyNewRefundCsApplyNewDTO{ - ReasonId: reasonId[0].ReasonId, - OutOrderId: utils.String2Pointer(order.VendorOrderID2), - StoreId: utils.String2Pointer(order.VendorStoreID), - RequestId: utils.String2Pointer(fmt.Sprintf("%s%d", order.VendorStoreID, time.Now().UnixNano())), - Memo: utils.String2Pointer(reason), - SubRefundOrders: &outSubOrderIds, - RefundReason: utils.String2Pointer(reason), - }, - } - - if err = api.PartialRefund(param); err == nil { - c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusMerchantCancel, tao_vegetable.OrderStatusMerchantCancel) - } if order.Status < model.OrderStatusEndBegin { // 发送取消状态,商户取消 @@ -693,6 +651,50 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods Status: utils.String2Pointer(tao_vegetable.OrderStatusMerchantCancel), }, }) + } else { + localSkuList, _ := dao.GetSimpleOrderSkus(dao.GetDB(), order.VendorOrderID, nil) + skuMap := make(map[string]*model.OrderSku, 0) + for _, v := range localSkuList { + skuMap[v.VendorSubOrderID] = v + } + orderSkuList, err := getOrderCancelList(api, order) + if err != nil { + return err + } + outSubOrderIds := make([]domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO, 0, len(*orderSkuList.OutSubOrders)) + for _, v := range *orderSkuList.OutSubOrders { + if *v.CanReverse { + subOrder := domain3156.AlibabaTclsAelophyRefundCsapplyNewCsApplySubOrderDTO{ + RefundFee: utils.String2Pointer(utils.Int64ToStr(*v.MaxRefundFee)), + RefundAmount: nil, + OutSubOrderId: v.OutSubOrderId, + } + if skuMap[*v.OutSubOrderId] != nil { + subOrder.RefundAmount = utils.String2Pointer(utils.Int2Str(skuMap[*v.OutSubOrderId].Count)) + } else { + continue + } + outSubOrderIds = append(outSubOrderIds, subOrder) + } + } + + reasonId := *orderSkuList.ReasonList + param := &request3156.AlibabaTclsAelophyRefundCsapplyNewRequest{ + RefundCsApplyDTO: &domain3156.AlibabaTclsAelophyRefundCsapplyNewRefundCsApplyNewDTO{ + ReasonId: reasonId[0].ReasonId, + OutOrderId: utils.String2Pointer(order.VendorOrderID2), + StoreId: utils.String2Pointer(order.VendorStoreID), + RequestId: utils.String2Pointer(fmt.Sprintf("%s%d", order.VendorStoreID, time.Now().UnixNano())), + Memo: utils.String2Pointer(reason), + SubRefundOrders: &outSubOrderIds, + RefundReason: utils.String2Pointer(reason), + OrderFrom: utils.Int64ToPointer(tao_vegetable.ChannelCome), + }, + } + + if err = api.PartialRefund(param); err == nil { + c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusMerchantCancel, tao_vegetable.OrderStatusMerchantCancel) + } } return err } From e37383a0d8c2cee5c51eadff09cf1a0856ecdfb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 09:14:49 +0800 Subject: [PATCH 06/15] 1 --- controllers/jx_order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 40c481ae6..7424078a0 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -636,7 +636,7 @@ func (c *OrderController) AdjustOrder() { func (c *OrderController) CancelOrder() { c.callCancelOrder(func(params *tOrderCancelOrderParams) (retVal interface{}, errCode string, err error) { order, err := partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) - if order.Status >= model.OrderStatusEndBegin { + if order.Status >= model.OrderStatusEndBegin && order.VendorID != model.VendorIDTaoVegetable { return nil, "", fmt.Errorf("订单处于完成状态,不支持取消操作!请走售后流程") } if err == nil { From 6deada8e0b002ddbe25f90756cec14399190c07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 09:15:12 +0800 Subject: [PATCH 07/15] 1 --- controllers/jx_order.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/jx_order.go b/controllers/jx_order.go index 7424078a0..664e86d5e 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -636,7 +636,7 @@ func (c *OrderController) AdjustOrder() { func (c *OrderController) CancelOrder() { c.callCancelOrder(func(params *tOrderCancelOrderParams) (retVal interface{}, errCode string, err error) { order, err := partner.CurOrderManager.LoadOrder(params.VendorOrderID, params.VendorID) - if order.Status >= model.OrderStatusEndBegin && order.VendorID != model.VendorIDTaoVegetable { + if order.Status >= model.OrderStatusFinished && order.VendorID != model.VendorIDTaoVegetable { return nil, "", fmt.Errorf("订单处于完成状态,不支持取消操作!请走售后流程") } if err == nil { From 969e26af022b3a39da4e91b738447490b8ae0c5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 13:47:50 +0800 Subject: [PATCH 08/15] 1 --- business/jxcallback/orderman/order.go | 26 ++----------------- business/partner/delivery/dada/waybill.go | 5 ++++ business/partner/delivery/fn/waybill.go | 5 ++++ business/partner/delivery/mtps/waybill.go | 6 ++++- business/partner/delivery/sfps/waybill.go | 5 ++++ business/partner/delivery/uupt/waybill.go | 5 ++++ .../partner/purchase/tao_vegetable/order.go | 14 ++++++++++ 7 files changed, 41 insertions(+), 25 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 597581283..99999866e 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -2442,18 +2442,11 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id ` sqlParams := []interface{}{vendorOrderID} dao.GetRows(db, &orderSkus, sql, sqlParams) - if len(orderSkus) < 5 { - return 0, fmt.Errorf("商品数小于5，不允许删除！") + if len(orderSkus) < 3 { + return 0, fmt.Errorf("商品数小于3，不允许删除！") } if orderSkus[0].ID == int64(id) { - //if orderSkus[0].JxSkuID == skuID { return 0, fmt.Errorf("不允许删第一个商品！") - //} - //} else { - // if orderSkus[0].SkuID == skuID { - // return 0, fmt.Errorf("不允许删第一个商品！") - // } - //} } for _, v := range order.Skus { if v.ID == int64(id) { @@ -2465,21 +2458,6 @@ func DelOrderSkuInfo(ctx *jxcontext.Context, vendorOrderID string, vendorID, id shopPrice = v.ShopPrice * int64(v.Count) earningPrice = v.EarningPrice * int64(v.Count) } - //if v.SkuID == 0 { - // if v.JxSkuID == skuID { - - // } - //} else { - // if v.SkuID == skuID { - // sql := ` - // DELETE FROM order_sku WHERE id = ? - // ` - // sqlParams := []interface{}{v.ID} - // dao.ExecuteSQL(db, sql, sqlParams) - // shopPrice = v.ShopPrice * int64(v.Count) - // earningPrice = v.EarningPrice * int64(v.Count) - // } - //} } order.ShopPrice -= shopPrice order.EarningPrice -= earningPrice diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 7f6fb8972..1b457783b 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -4,7 +4,9 @@ import ( "errors" "fmt" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" + tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "time" "git.rosy.net.cn/baseapi/platformapi/dadaapi" @@ -118,6 +120,9 @@ func (c *DeliveryHandler) onWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaap tiktokStatusPush(order, msg.OrderStatus) case model.VendorIDMTWM, model.VendorIDTaoVegetable: delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 + if goodsOrder.VendorID == model.VendorIDTaoVegetable && msg.OrderStatus == dadaapi.OrderStatusAccepted { + tao_vegetable.PushDelivererChangeInfo(goodsOrder, order, tao.TaoDeliveryTypeDD) + } } return err diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index afb2a4edc..ad246b058 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -3,9 +3,11 @@ package fn import ( "fmt" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" + tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/jxutils/jxcontext" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "strings" "time" @@ -311,6 +313,9 @@ func OnWaybillMsg(msg *fnpsapi.OrderStatusNottify, resultParam *fnpsapi.ShortSta tiktokStatusPush(order, orderStatus) case model.VendorIDMTWM, model.VendorIDTaoVegetable: delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 + if good.VendorID == model.VendorIDTaoVegetable && cc.OrderStatus == fnpsapi.OrderStatusAssigned { + tao_vegetable.PushDelivererChangeInfo(good, order, tao.TaoDeliveryTypeFN) + } } return fnpsapi.Err2CallbackResponse(nil, "") } diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 77263ccac..5354973e3 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -10,6 +10,7 @@ import ( "strings" "git.rosy.net.cn/baseapi/platformapi/mtpsapi" + tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/orderman" "git.rosy.net.cn/jx-callback/business/jxutils" @@ -18,6 +19,7 @@ import ( "git.rosy.net.cn/jx-callback/business/model/dao" "git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner/delivery" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/client/orm" @@ -139,12 +141,14 @@ func (c *DeliveryHandler) onWaybillMsg(msg *mtpsapi.CallbackOrderMsg) (retVal *m // 加入调度器 err := mtpsapi.Err2CallbackResponse(partner.CurOrderManager.OnWaybillStatusChanged(order), order.VendorStatus) - switch order.OrderVendorID { case model.VendorIDDD: pushMTPSToTiktok(msg.Status, order) case model.VendorIDMTWM, model.VendorIDTaoVegetable: delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 + if goodsOrder.VendorID == model.VendorIDTaoVegetable && msg.Status == mtpsapi.OrderStatusAccepted { + tao_vegetable.PushDelivererChangeInfo(goodsOrder, order, tao.TaoDeliveryTypeMT) + } } return err diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index bb4d7e781..455904adc 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -3,6 +3,8 @@ package sfps import ( "errors" "fmt" + tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "time" "git.rosy.net.cn/jx-callback/globals" @@ -400,6 +402,9 @@ func OnWaybillMsg(urlIndex string, msg interface{}) (resp *sfps2.CallbackRespons tiktokStatusPush(order, orderStatus) case model.VendorIDTaoVegetable, model.VendorIDMTWM: delivery.GetOrderRiderInfoToPlatform(order.VendorOrderID, order.Status) // 骑手位置更新 + if good.VendorID == model.VendorIDTaoVegetable && orderStatus == sfps2.OrderStatusTakeOrder { + tao_vegetable.PushDelivererChangeInfo(good, order, tao.TaoDeliveryTypeSF) + } } return sfps2.Err2CallbackResponse(nil) } diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index bd8e25156..74042272e 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -2,6 +2,8 @@ package uupt import ( "fmt" + tao "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" + "git.rosy.net.cn/jx-callback/business/partner/purchase/tao_vegetable" "strings" "time" @@ -386,6 +388,9 @@ func OnWaybillMsg(req *uuptapi.WaybillCallbackParam) (resp *uuptapi.CallbackResp tiktokStatusPush(param, req.State) case model.VendorIDMTWM, model.VendorIDTaoVegetable: delivery.GetOrderRiderInfoToPlatform(param.VendorOrderID, param.Status) // 骑手位置更新 + if good.VendorID == model.VendorIDTaoVegetable && req.State == uuptapi.StateRMGrabsOrder { + tao_vegetable.PushDelivererChangeInfo(good, param, tao.TaoDeliveryTypeOther) + } } return uuptapi.Err2CallbackResponse(nil) } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index a0bb7c184..2859cf744 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -251,6 +251,20 @@ func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, par return getAPI(vendorOrgCode, 0, vendorStoreID).DeliveryTrajectory(req) } +func PushDelivererChangeInfo(order *model.GoodsOrder, bill *model.Waybill, deliveryType string) error { + param := &request591.AlibabaAelophyOrderDelivererChangeRequest{ + DelivererChangeRequest: &domain591.AlibabaAelophyOrderDelivererChangeDelivererChangeRequest{ + StoreId: utils.String2Pointer(order.VendorStoreID), + BizOrderId: utils.Int64ToPointer(utils.Str2Int64(order.VendorOrderID)), + DelivererName: utils.String2Pointer(bill.CourierName), + DelivererPhone: utils.String2Pointer(bill.CourierMobile), + DelivererCompany: nil, + LogisticsNo: utils.String2Pointer(bill.VendorWaybillID), + }, + } + return getAPI(order.VendorOrgCode, 0, "").DelivererChange(param) +} + func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID string) (order *model.GoodsOrder, err error) { order, _, err = p.getOrder(vendorOrgCode, utils.Str2Int64(vendorOrderID), vendorStoreID) return order, err From 33ef9ff88336458dc02cd405b02a68601f968bbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 15:03:35 +0800 Subject: [PATCH 09/15] 1 --- .../purchase/tao_vegetable/order_utils.go | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order_utils.go b/business/partner/purchase/tao_vegetable/order_utils.go index 86ed90286..11b2bf574 100644 --- a/business/partner/purchase/tao_vegetable/order_utils.go +++ b/business/partner/purchase/tao_vegetable/order_utils.go @@ -63,20 +63,37 @@ func OrderStatusChangeDelivery(order *model.GoodsOrder, orderStatus string) *req Status: utils.String2Pointer(orderStatus), } bill, _ := partner.CurOrderManager.LoadWaybill(order.VendorWaybillID, order.WaybillVendorID) + storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") if bill != nil { if bill.CourierName == "" && bill.CourierMobile == "" { - storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.JxStoreID, model.VendorIDTaoVegetable, "") param.WorkCallbackRequest.DelivererName = utils.String2Pointer("门店老板") param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(storeDetail.Tel1) + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF) + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(bill.VendorWaybillID) } else { param.WorkCallbackRequest.DelivererName = utils.String2Pointer(bill.CourierName) param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer(bill.CourierMobile) + switch bill.WaybillVendorID { + case model.VendorIDDada: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeDD) + case model.VendorIDFengNiao: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeFN) + case model.VendorIDMTPS: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeMT) + case model.VendorIDSFPS: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSF) + default: + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeOther) + } + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(bill.VendorWaybillID) } } if param.WorkCallbackRequest.DelivererName == nil || param.WorkCallbackRequest.DelivererPhone == nil { - param.WorkCallbackRequest.DelivererName = utils.String2Pointer("暂无") - param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("暂无") + param.WorkCallbackRequest.DelivererName = utils.String2Pointer(storeDetail.Tel1) + param.WorkCallbackRequest.DelivererPhone = utils.String2Pointer("门店老板") + param.WorkCallbackRequest.DelivererCompany = utils.String2Pointer(tao_vegetable.TaoDeliveryTypeSELF) + param.WorkCallbackRequest.LogisticsNo = utils.String2Pointer(order.VendorOrderID + "_1") } return param From 264ce8b3c1b724a1c4c61bc860fc97951cc6932d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Tue, 11 Jul 2023 15:16:02 +0800 Subject: [PATCH 10/15] 1 --- business/partner/purchase/tao_vegetable/order.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 2859cf744..1f45cc96f 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -567,10 +567,7 @@ func (c *PurchaseHandler) SelfDeliverDelivering(order *model.GoodsOrder, userNam return err } if err = api.DeliveryFinish(param); err == nil { - paramDelivery, err := orderStatusChangeNotice(order, tao_vegetable.OrderStatusDelivery) - if err != nil { - return err - } + paramDelivery := OrderStatusChangeDelivery(order, tao_vegetable.OrderStatusDelivery) // 开始配送 return api.DeliveryFinish(paramDelivery) } From 0095f09c4fa0f28f3089adc9aaac083cabc0999b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 10:48:52 +0800 Subject: [PATCH 11/15] 1 --- business/jxstore/cms/sync_store_sku.go | 2 ++ .../purchase/tao_vegetable/store_sku2.go | 22 +++++++------------ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index b4f2b805a..c4ea0ece7 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -753,6 +753,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag if len(createList) > 0 { _, err = putils.FreeBatchStoreSkuSyncInfo("创建门店商品", func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr + globals.SugarLogger.Debugf("==============len createList : %d", len(createList)) + globals.SugarLogger.Debugf("==============len batchedStoreSkuList : %d", len(batchedStoreSkuList)) if failedList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) { if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, []*partner.StoreSkuInfo{ &partner.StoreSkuInfo{ diff --git a/business/partner/purchase/tao_vegetable/store_sku2.go b/business/partner/purchase/tao_vegetable/store_sku2.go index eb7880ea4..cebd2695f 100644 --- a/business/partner/purchase/tao_vegetable/store_sku2.go +++ b/business/partner/purchase/tao_vegetable/store_sku2.go @@ -170,6 +170,11 @@ func (p *PurchaseHandler) UpdateStoreCategory(ctx *jxcontext.Context, storeID in } func (p *PurchaseHandler) DeleteStoreCategory(ctx *jxcontext.Context, storeID int, vendorStoreID, vendorCatID string, level int) (err error) { + // 668594 正式服印象汇 668469 测试服芬姐(淘宝所有门店公用分类) , 模板门店才能删除 + if storeID != 668594 && storeID != 668469 { + return nil + } + api := getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID) // 只能删除叶子结点 // 看看这个level是不是代表子节点,感觉不是 @@ -208,6 +213,7 @@ func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, v } func (p *PurchaseHandler) CreateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { + globals.SugarLogger.Debugf("len CreateStoreSkus := %d", len(storeSkuList)) failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, true) return failedList, err } @@ -284,6 +290,7 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku totalCount := len(storeSkuList) vendorSkuIdMap := make(map[string]string, 0) + globals.SugarLogger.Debugf("storeSkuList := %d", len(storeSkuList)) for index, storeSku := range storeSkuList { price := utils.String2Pointer(utils.Float64ToStr(utils.Int64ToFloat64(storeSku.VendorPrice) / utils.Int64ToFloat64(100))) sku := domain585.AlibabaWdkSkuAddSkuDo{ @@ -345,20 +352,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku sku.WeightFlag = utils.Int64ToPointer(tao_vegetable.CreateSkuWeightFlagNo) sku.AvgWeight = utils.String2Pointer("1") // (重量) sku.PreMinusWeight = utils.String2Pointer("1") // 每个购买单位重量,预扣重量 - //if storeSku.Upc == "" { - // //sku.WeightFlag = utils.Int64ToPointer(tao_vegetable.CreateSkuWeightFlagYes) - // if storeSku.SpecUnit == "g" || storeSku.SpecUnit == "ml" || storeSku.SpecUnit == "G" || storeSku.SpecUnit == "ML" { - // sku.PreMinusWeight = utils.String2Pointer(utils.Float64ToStr(float64(storeSku.SpecQuality) / float64(1000))) // 一个售卖单位按多少库存单位扣款(钱) - // //sku.AvgWeight = utils.String2Pointer(utils.Float64ToStr(float64(storeSku.SpecQuality) / float64(1000))) // (重量) - // } - // if storeSku.SpecUnit == "kg" || storeSku.SpecUnit == "l" || storeSku.SpecUnit == "KG" || storeSku.SpecUnit == "L" { - // sku.PreMinusWeight = utils.String2Pointer(utils.Float64ToStr(float64(storeSku.SpecQuality))) // 每个购买单位重量,预扣重量 - // //sku.AvgWeight = utils.String2Pointer(utils.Float64ToStr(float64(storeSku.SpecQuality) / float64(1000))) // (重量) - // } - //} else { - // //sku.WeightFlag = utils.Int64ToPointer(tao_vegetable.CreateSkuWeightFlagNo) - // sku.PreMinusWeight = utils.String2Pointer("1") // 每个购买单位重量,预扣重量 - //} sku.SkuSuppliers = &[]domain585.AlibabaWdkSkuAddSkuSupplierDo{ domain585.AlibabaWdkSkuAddSkuSupplierDo{ ReturnFlag: utils.Int64ToPointer(model.NO), @@ -378,6 +371,7 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku } param = append(param, sku) + if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || index+model.YES == totalCount { createPram.ParamList = ¶m result, err := api.AddStoreSku(createPram) From 85a22440a4f27572d9121820e33651233cb63750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 10:57:03 +0800 Subject: [PATCH 12/15] 1 --- business/jxstore/cms/sync_store_sku.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index c4ea0ece7..f0b03c393 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -792,7 +792,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } } return nil, len(successList), err - }, ctx, task, createList, 1, isContinueWhenError2) + }, ctx, task, createList, 20, isContinueWhenError2) if err != nil { globals.SugarLogger.Debug("create sku wrong on ：", err) } From a217cadbe4a42afa61f1add107f061f72771b7df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 11:42:57 +0800 Subject: [PATCH 13/15] 1 --- business/jxstore/cms/sync_store_sku.go | 4 ---- business/jxutils/tasksch/parallel_task.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index f0b03c393..e00fd558f 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -753,8 +753,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag if len(createList) > 0 { _, err = putils.FreeBatchStoreSkuSyncInfo("创建门店商品", func(task tasksch.ITask, batchedStoreSkuList []*dao.StoreSkuSyncInfo) (result interface{}, successCount int, err error) { var failedList []*partner.StoreSkuInfoWithErr - globals.SugarLogger.Debugf("==============len createList : %d", len(createList)) - globals.SugarLogger.Debugf("==============len batchedStoreSkuList : %d", len(batchedStoreSkuList)) if failedList, err = singleStoreHandler.CreateStoreSkus(ctx, storeID, vendorStoreID, batchedStoreSkuList); singleStoreHandler.IsErrSkuExist(err) { if skuNameList, err2 := singleStoreHandler.GetStoreSkusFullInfo(ctx, task, storeID, vendorStoreID, []*partner.StoreSkuInfo{ &partner.StoreSkuInfo{ @@ -782,8 +780,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag dao.InsertSensitiveWord(sensitiveWord, vendorID, ctx.GetUserName()) } } - globals.SugarLogger.Debugf("batchedStoreSkuList := %s", utils.Format4Output(batchedStoreSkuList, false)) - globals.SugarLogger.Debugf("failedList := %s", utils.Format4Output(failedList, false)) successList := putils.UnselectStoreSkuSyncListByVendorSkuIDs(batchedStoreSkuList, GetVendorSkuIDList(failedList)) if len(successList) > 0 { _, err := updateStoreSku(dao.GetDB(), vendorID, successList, model.SyncFlagNewMask) diff --git a/business/jxutils/tasksch/parallel_task.go b/business/jxutils/tasksch/parallel_task.go index 151c57017..afe123059 100644 --- a/business/jxutils/tasksch/parallel_task.go +++ b/business/jxutils/tasksch/parallel_task.go @@ -21,7 +21,7 @@ type ParallelConfig struct { // ParentTask ITask // IsAsync bool ParallelCount int - BatchSize int + BatchSize int // 最大传入数据量 IsContinueWhenError bool } From 2c34badf6bccd207b216f6aa366daeced05ba3d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 13:56:48 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxstore/cms/store_sku.go | 4 -- business/jxstore/cms/sync_store_sku.go | 14 +------ business/partner/printer/xpyun/xpyun.go | 3 -- .../partner/purchase/tao_vegetable/act.go | 7 ---- .../purchase/tao_vegetable/callback.go | 2 - .../purchase/tao_vegetable/financial.go | 1 - .../partner/purchase/tao_vegetable/order.go | 8 ---- .../purchase/tao_vegetable/order_afs.go | 8 ---- .../purchase/tao_vegetable/store_sku2.go | 37 ++++--------------- .../partner/purchase/tiktok_store/store.go | 1 - .../purchase/tiktok_store/store_sku2_utils.go | 2 - .../purchase/tiktok_store/warehouse.go | 1 - controllers/taobao_vegetable.go | 8 ---- 13 files changed, 9 insertions(+), 87 deletions(-) diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 37f51c855..3e89a0991 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -396,8 +396,6 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b txDB, _ := dao.Begin(db) defer dao.Commit(db, txDB) - //globals.SugarLogger.Debugf("store_sku 检查：sql:%s sqlParams:%s", sql, sqlParams) - if err = dao.GetRowsTx(txDB, &SkuNames, sql, sqlParams...); err == nil { //globals.SugarLogger.Debugf(" 检查参数：SkuNames:%s", utils.Format4Output(SkuNames, false)) skuNamesInfo = &dao.StoreSkuNamesInfo2{ @@ -441,9 +439,7 @@ func GetStoresSkusForStore(ctx *jxcontext.Context, storeID int, isFocus, isAct b sql2 += " AND b.status = ?" sqlParams2 = append(sqlParams2, status) } - //globals.SugarLogger.Debugf("store_sku 检查：sql2:%s sqlParams2:%s", sql2, sqlParams2) if err = dao.GetRows(db, &skus, sql2, sqlParams2); err == nil { - //globals.SugarLogger.Debugf(" 检查参数：skus:%s", utils.Format4Output(skus, false)) v.Skus = skus } return retVal, err diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go index e00fd558f..7e3f38376 100644 --- a/business/jxstore/cms/sync_store_sku.go +++ b/business/jxstore/cms/sync_store_sku.go @@ -133,7 +133,6 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo } } else if model.IsSyncStatusNew(catInfo.CatSyncStatus) { // 新增 2 err = handler.CreateStoreCategory(ctx, storeID, vendorStoreID, catInfo) - globals.SugarLogger.Debugf("CreateStoreCategory err ========= %v", err) if err != nil && handler.IsErrCategoryExist(err) { if cat, err2 := handler.GetStoreCategory(ctx, storeID, vendorStoreID, catInfo.Name); err2 == nil { catInfo.VendorCatID = cat.VendorCatID @@ -710,17 +709,8 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag updateList = updateList[:] updateList = rList2 } - // if configs, err := dao.QueryConfigs(dao.GetDB(), "jdsCookie2", model.ConfigTypeCookie, ""); err == nil { - // api.JdShop2API.SetCookieWithStr(configs[0].Value) - // } + } - globals.SugarLogger.Debugf("createList ==== := %s", utils.Format4Output(createList, false)) - globals.SugarLogger.Debugf("updateList ==== := %s", utils.Format4Output(updateList, false)) - globals.SugarLogger.Debugf("deleteList ==== := %s", utils.Format4Output(deleteList, false)) - globals.SugarLogger.Debugf("stockList ==== := %s", utils.Format4Output(stockList, false)) - globals.SugarLogger.Debugf("onlineList ==== := %s", utils.Format4Output(onlineList, false)) - globals.SugarLogger.Debugf("offlineList ==== := %s", utils.Format4Output(offlineList, false)) - globals.SugarLogger.Debugf("priceList ==== := %s", utils.Format4Output(priceList, false)) task := tasksch.NewParallelTask("syncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError2), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { step := batchItemList[0].(int) @@ -788,7 +778,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag } } return nil, len(successList), err - }, ctx, task, createList, 20, isContinueWhenError2) + }, ctx, task, createList, singleStoreHandler.GetStoreSkusBatchSize(partner.FuncUpdateStoreSkus), isContinueWhenError2) if err != nil { globals.SugarLogger.Debug("create sku wrong on ：", err) } diff --git a/business/partner/printer/xpyun/xpyun.go b/business/partner/printer/xpyun/xpyun.go index af0851fbc..7fe73171f 100644 --- a/business/partner/printer/xpyun/xpyun.go +++ b/business/partner/printer/xpyun/xpyun.go @@ -34,7 +34,6 @@ func (c *PrinterHandler) GetVendorID() int { func (c *PrinterHandler) PrintMsg(ctx *jxcontext.Context, sn, copies, voiceType, msgContent string) (printerStatus *partner.PrinterStatus, err error) { if sn != "" { //if globals.EnableStoreWrite { - globals.SugarLogger.Debugf("printMsg voiceType====%s", voiceType) printOrderID, err1 := api.XpyunAPI.Print(&xpyunapi.PrintRequest{ Sn: sn, Content: msgContent, @@ -101,9 +100,7 @@ func (c *PrinterHandler) RebindPrinter(ctx *jxcontext.Context, lastBindResult *p } func (c *PrinterHandler) PrintOrder(ctx *jxcontext.Context, store *model.Store, storeDetail *dao.StoreDetail, order *model.GoodsOrder, printType string, asfOrder *model.AfsOrder) (printerStatus *partner.PrinterStatus, err error) { - globals.SugarLogger.Debugf("打印order参数：%s", utils.Format4Output(order, false)) if len(order.Skus) == 0 { - globals.SugarLogger.Debugf("order.sku为空") return } content := "" diff --git a/business/partner/purchase/tao_vegetable/act.go b/business/partner/purchase/tao_vegetable/act.go index 3ce9c6cc0..c6387c60b 100644 --- a/business/partner/purchase/tao_vegetable/act.go +++ b/business/partner/purchase/tao_vegetable/act.go @@ -77,7 +77,6 @@ func storeSku2ActData(act *model.Act2, actStoreSku []*model.ActStoreSku2, handle } for _, v := range actStoreSku { - globals.SugarLogger.Debugf("打印初始商品参数 sku=%s", utils.Format4Output(v, false)) if handler == nil || handler(v.SyncStatus) { stock := int64(0) if v.Stock > 0 { @@ -192,7 +191,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode actData := act2TxdActivity(act) //2 活动商品详情 actSkuData := storeSku2ActData(act, actStoreSku, isCreateOrUpdate) - globals.SugarLogger.Debugf("进入获取活动参数,actData=%s,actSkuData=%s", utils.Format4Output(actData, false), utils.Format4Output(actSkuData, false)) if actData != nil && actSkuData != nil { if globals.EnableMtwmStoreWrite { @@ -200,7 +198,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode //创建活动 actData.StoreIds = &[]string{vendorStoreID} actID, err1 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityCreate(*actData) - globals.SugarLogger.Debugf("createOneShopAct actData=%s,err=%v", utils.Format4Output(actData, false), err1) if err1 != nil || actID == 0 { failedList = append(failedList, &partner.StoreSkuInfoWithErr{ VendoreID: model.VendorIDTaoVegetable, @@ -213,7 +210,6 @@ func createOneShopAct(act *model.Act2, vendorStoreID string, actStoreSku []*mode //活动增加商品 actSkuData.ActId = &actID err3, successSkuCode, failSkuCode := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivitySkuCreate(*actSkuData) - globals.SugarLogger.Debugf("createOneShopAct actSkuData=%s,err3=%v", utils.Format4Output(actSkuData, false), err3) err = err3 if err != nil { //商品新增失败，回滚删除创建的活动 err4 := getAPI(act.VendorOrgCode, 0, vendorStoreID).ActivityDelete(*actData.CreatorId, *actData.CreatorName, actID) @@ -295,12 +291,9 @@ func createSkuAct(ctx *jxcontext.Context, parentTask tasksch.ITask, act *model.A task := tasksch.NewParallelTask("txd createSkuAct", nil, ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { list := batchItemList[0].([]*model.ActStoreSku2) - globals.SugarLogger.Debugf("我在这里4") failedList, err2 := createOneShopAct(act, list[0].VendorStoreID, list) - globals.SugarLogger.Debugf("我在这里6，failedList=%s, err2=%v", utils.Format4Output(failedList, false), err2) if err = err2; err2 == nil { if len(failedList) > 0 { - globals.SugarLogger.Debugf("我在这里5") failedMap := putils.StoreSkuInfoWithErrList2MapBySku(failedList) list = []*model.ActStoreSku2{} for _, v := range actStoreSku { diff --git a/business/partner/purchase/tao_vegetable/callback.go b/business/partner/purchase/tao_vegetable/callback.go index b8898dec2..9d8c09894 100644 --- a/business/partner/purchase/tao_vegetable/callback.go +++ b/business/partner/purchase/tao_vegetable/callback.go @@ -3,7 +3,6 @@ package tao_vegetable import ( "git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/globals" @@ -16,7 +15,6 @@ func OnCallbackMsg(orderStatus, orderId string, msg interface{}) (response *tao_ if CurPurchaseHandler != nil { jxutils.CallMsgHandler(func() { response = CurPurchaseHandler.onOrderMsg(orderStatus, orderId, msg) - globals.SugarLogger.Debugf("OnCallbackMsg response : %s", utils.Format4Output(response, false)) }, jxutils.ComposeUniversalOrderID(orderId, model.VendorIDTaoVegetable)) } return response diff --git a/business/partner/purchase/tao_vegetable/financial.go b/business/partner/purchase/tao_vegetable/financial.go index 8b1a6c9b0..653be279d 100644 --- a/business/partner/purchase/tao_vegetable/financial.go +++ b/business/partner/purchase/tao_vegetable/financial.go @@ -214,6 +214,5 @@ func (p *PurchaseHandler) OrderDetail2Financial(result *domain591.AlibabaAelophy orderFinancial.SelfDeliveryDiscountMoney = *result.SkuDiscountPlatformFee // 平台承担运费补贴（商家自送）+ orderFinancial.DistanceFreightMoney = 0 - globals.SugarLogger.Debugf("orderFinancial===============: %s", utils.Format4Output(orderFinancial, false)) return orderFinancial } diff --git a/business/partner/purchase/tao_vegetable/order.go b/business/partner/purchase/tao_vegetable/order.go index 1f45cc96f..4ead61426 100644 --- a/business/partner/purchase/tao_vegetable/order.go +++ b/business/partner/purchase/tao_vegetable/order.go @@ -156,14 +156,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve } multiSkuMap[sku.SkuID]++ order.Skus = append(order.Skus, sku) - //salePrice += sku.SalePrice - //weight += sku.Weight - globals.SugarLogger.Debugf("=====skuPrice := %d", sku.SalePrice) } } - //order.SalePrice = salePrice - //order.Weight = weight - //globals.SugarLogger.Debugf("=====skuPrice := %d", salePrice) // 淘宝默认自配送 if *orderDetail.DeliveryType == tao_vegetable.OrderDeliveryTypeTime { @@ -514,7 +508,6 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo return err } if err = getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "").DeliveryFinish(param); err != nil { - globals.SugarLogger.Debugf("PickupGoods 拣货失败可能是BizSubOrderId 没填写 : %s", err.Error()) return err } c.postFakeMsg(order.VendorOrderID, tao_vegetable.OrderStatusPickedUp, tao_vegetable.OrderStatusPickedUp) @@ -717,7 +710,6 @@ func (c *PurchaseHandler) CancelOrder(ctx *jxcontext.Context, order *model.Goods func (c *PurchaseHandler) AdjustOrder(ctx *jxcontext.Context, order *model.GoodsOrder, removedSkuList []*model.OrderSku, reason string) (err error) { api := getAPI(order.VendorOrgCode, jxutils.GetSaleStoreIDFromOrder(order), "") - globals.SugarLogger.Debugf("removedSkuList := %s", utils.Format4Output(removedSkuList, false)) // 获取需要退货商品的子订单id refundSkuOrderID := make(map[int]*model.OrderSku, 0) for _, v := range removedSkuList { diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index 28d30c2de..3ea086cbf 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -46,7 +46,6 @@ func (c *PurchaseHandler) isAfsMsg(orderStatus string, orderId string, orderCall // RefundIds: &[]int64{utils.Str2Int64(success.BizSubRefundId)}, //} //refundAfs, _ := getAPI("", 0, success.StoreId).QueryAfsOrderDetail(param) - //globals.SugarLogger.Debugf("==============refundAfs.Orders : %s", utils.Format4Output(refundAfs.Orders != nil, false)) //if refundAfs.Orders != nil { // return true //} @@ -72,9 +71,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal var err error var db = dao.GetDB() orderStatus, scarceGoods := c.callbackAfsMsg2Status(status, msg) - globals.SugarLogger.Debugf("status := %s", status) - globals.SugarLogger.Debugf("orderStatus := %s", utils.Format4Output(orderStatus, false)) - globals.SugarLogger.Debugf("scarceGoods := %s", utils.Format4Output(scarceGoods, false)) // 用户取消售后 switch status { case tao_vegetable.OrderStatusApplyAfs: @@ -286,8 +282,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal //直接就来一个新的售后单，并且还是售后完成的 afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt afsOrder.Flag = model.AfsOrderFlagAgreeUserRefund - globals.SugarLogger.Debugf("==============onsaleRefund afsOrd: = %s", utils.Format4Output(afsOrder, false)) - globals.SugarLogger.Debugf("==============onsaleRefund orderStatus: = %s", utils.Format4Output(orderStatus, false)) err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus) } case tao_vegetable.OrderStatusRefundSuccess: @@ -341,8 +335,6 @@ func (c *PurchaseHandler) onAfsOrderMsg(status string, msg interface{}) (retVal afsOrder.SkuUserMoney += refundFee afsOrder.RefundType = model.AfsTypePartRefund - globals.SugarLogger.Debugf("============OrderStatusRefundSuccess afsOrder: %s", utils.Format4Output(afsOrder, false)) - globals.SugarLogger.Debugf("============OrderStatusRefundSuccess orderStatus: %s", utils.Format4Output(orderStatus, false)) if afsOrder != nil { //直接就来一个新的售后单，并且还是售后完成的 afsOrder.AfsFinishedAt = afsOrder.AfsCreatedAt diff --git a/business/partner/purchase/tao_vegetable/store_sku2.go b/business/partner/purchase/tao_vegetable/store_sku2.go index cebd2695f..c4f2467ce 100644 --- a/business/partner/purchase/tao_vegetable/store_sku2.go +++ b/business/partner/purchase/tao_vegetable/store_sku2.go @@ -41,19 +41,19 @@ var ( func (p *PurchaseHandler) GetStoreSkusBatchSize(funcID int) (batchSize int) { switch funcID { case partner.FuncUpdateStoreSkusStock, partner.FuncUpdateStoreSkusStatus, partner.FuncUpdateStoreSkusPrice: - batchSize = mtwmapi.MaxStoreSkuBatchSize + batchSize = 20 case partner.FuncDeleteStoreSkus: - batchSize = mtwmapi.MaxBatchDeleteSize + batchSize = 20 case partner.FuncCreateStoreSkus: - batchSize = 1 // 可考虑用批量操作 + batchSize = 20 // 可考虑用批量操作 case partner.FuncUpdateStoreSkus: - batchSize = 1 // mtwmapi.MaxStoreSkuBatchSize + batchSize = 20 // mtwmapi.MaxStoreSkuBatchSize case partner.FuncGetStoreSkusFullInfo: - batchSize = 1 + batchSize = 20 case partner.FuncCreateActs: - batchSize = mtwmapi.MaxRetailDiscountCreateBatchSize + batchSize = 20 case partner.FuncCancelActs: - batchSize = mtwmapi.MaxRetailDiscountDeleteBatchSize + batchSize = 20 } return batchSize } @@ -122,7 +122,6 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in Code: utils.String2Pointer(utils.Int2Str(storeCat.StoreCatID)), Name: &storeCat.StoreCatName, }}) - globals.SugarLogger.Debugf("CreateStoreCategory=====err := %v", err) if storeCat.CatSyncStatus&model.SyncFlagNewMask == 0 && p.IsErrCategoryNotExist(err) && storeCat.StoreCatName != "" { // 修改分类名，但分类不存在 storeCat.CatSyncStatus |= model.SyncFlagNewMask createCategory := &request.AlibabaWdkSkuCategoryAddRequest{Param: &domain.AlibabaWdkSkuCategoryAddCategoryDo{ @@ -136,7 +135,6 @@ func (p *PurchaseHandler) CreateStoreCategory(ctx *jxcontext.Context, storeID in } skuCode, err := api.AddStoreCategoryInfo(createCategory) - globals.SugarLogger.Debugf("AddStoreCategoryInfo=====err := %v", err) if err != nil { return err } @@ -207,8 +205,6 @@ func (p *PurchaseHandler) IsErrSkuNotExist(err error) (isNotExist bool) { func (p *PurchaseHandler) UpdateStoreSkus(ctx *jxcontext.Context, storeID int, vendorStoreID string, storeSkuList []*dao.StoreSkuSyncInfo) (failedList []*partner.StoreSkuInfoWithErr, err error) { failedList, err = p.createOrUpdateStoreSkus(ctx, storeID, vendorStoreID, storeSkuList, false) - globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", err) - globals.SugarLogger.Debugf("UpdateStoreSkus=====err := %v", failedList) return failedList, err } @@ -230,13 +226,9 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI api := getAPI(getStoreVendorOrgCode(storeID), storeID, vendorStoreID) if isCreate { failedList, err = createTaoVegetable(ctx, api, storeSkuList, vendorStoreID, storeID, syncType) - globals.SugarLogger.Debugf("创建淘鲜达商品异常:%v", err) } else { failedList, err = UpdateTaoVegetable(api, storeSkuList, vendorStoreID, storeID, syncType) - globals.SugarLogger.Debugf("更新淘鲜达商品异常:%v", err) } - globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", err) - globals.SugarLogger.Debugf("createOrUpdateStoreSkus=====err := %v", failedList) return failedList, err } @@ -278,8 +270,6 @@ func UpdateTaoVegetable(api *tao_vegetable.API, storeSkuList []*dao.StoreSkuSync updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) } } - globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", err) - globals.SugarLogger.Debugf("UpdateTaoVegetable=====err := %v", failedList) return failedList, err } @@ -375,7 +365,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku if (index+model.YES)%tao_vegetable.MAXHandleCount == model.NO || index+model.YES == totalCount { createPram.ParamList = ¶m result, err := api.AddStoreSku(createPram) - globals.SugarLogger.Debugf("创建淘鲜达商品异常 result :%s", utils.Format4Output(result, false)) if err != nil { globals.SugarLogger.Debugf("创建淘鲜达商品异常:%s", err.Error()) } @@ -400,10 +389,6 @@ func createTaoVegetable(ctx *jxcontext.Context, api *tao_vegetable.API, storeSku } failedListStock := updateStoreSkusStockByCreate(ctx, api, storeID, vendorStoreID, successSku) failedList = append(failedList, failedListStock...) - globals.SugarLogger.Debugf("storeSkuList=====err := %s", utils.Format4Output(storeSkuList, false)) - - globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", err) - globals.SugarLogger.Debugf("createTaoVegetable=====err := %v", failedList) return failedList, nil } @@ -460,8 +445,6 @@ func (p *PurchaseHandler) DeleteStoreSkus(ctx *jxcontext.Context, storeID int, v updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) } } - globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", err) - globals.SugarLogger.Debugf("DeleteStoreSkus=====err := %v", failedList) return failedList, err //param := &request.AlibabaAxChannelSkuStatusUpdateRequest{ChannelSkuUpdateStatusReq: &domain.AlibabaAxChannelSkuStatusUpdateChannelSkuUpdateStatusReq{ // StoreId: utils.String2Pointer(vendorStoreID), @@ -514,8 +497,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStatus(ctx *jxcontext.Context, vendorOr updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) } } - globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", err) - globals.SugarLogger.Debugf("UpdateStoreSkusStatus=====err := %v", failedList) return failedList, err } @@ -548,8 +529,6 @@ func (p *PurchaseHandler) UpdateStoreSkusPrice(ctx *jxcontext.Context, vendorOrg updateSkuList = make([]domain585.AlibabaWdkSkuUpdateSkuDo, 0, 0) } } - globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", err) - globals.SugarLogger.Debugf("UpdateStoreSkusPrice=====err := %v", failedList) return failedList, err } @@ -619,8 +598,6 @@ func (p *PurchaseHandler) UpdateStoreSkusStock(ctx *jxcontext.Context, vendorOrg param.BatchStockPublishDto = nil } } - globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", err) - globals.SugarLogger.Debugf("UpdateStoreSkusStock=====err := %v", failedList) return failedList, err } diff --git a/business/partner/purchase/tiktok_store/store.go b/business/partner/purchase/tiktok_store/store.go index a6cafc6a3..1e4d94e50 100644 --- a/business/partner/purchase/tiktok_store/store.go +++ b/business/partner/purchase/tiktok_store/store.go @@ -505,7 +505,6 @@ func CreateFreightTemplate(storeCode, deliveryFeeDeductionSill int) (int64, erro //param.Columns = nil param.Template.TemplateName += "固定运费模板" } - globals.SugarLogger.Debugf("创建运费模板") if resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param); err != nil { return 0, err } else { diff --git a/business/partner/purchase/tiktok_store/store_sku2_utils.go b/business/partner/purchase/tiktok_store/store_sku2_utils.go index 9e3c49f12..ff638af00 100644 --- a/business/partner/purchase/tiktok_store/store_sku2_utils.go +++ b/business/partner/purchase/tiktok_store/store_sku2_utils.go @@ -226,8 +226,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI } else if localThing[0].SyncStatus == model.ThingTypeSyncSuccess { // 主商品存在,直接同步子商品 childrenProductId, err := api.CreateSubProduct(utils.Str2Int64(localThing[0].VendorThingID), utils.Str2Int64(vendorStoreID)) - globals.SugarLogger.Debugf("==========:%s", localThing[0].VendorThingID) - globals.SugarLogger.Debugf("==========:%v", err) if err != nil && strings.Contains(err.Error(), "2010004") { // 2010004:主商品非在线审核通过状态，不允许绑定子商品 // 线上本地都存在,但是线上审核不成功,就去更新主商品 mainOrderDetail = loadMainProductId(api, storeSku, localThing[0].VendorThingID) diff --git a/business/partner/purchase/tiktok_store/warehouse.go b/business/partner/purchase/tiktok_store/warehouse.go index b9dccfe03..dee54e75f 100644 --- a/business/partner/purchase/tiktok_store/warehouse.go +++ b/business/partner/purchase/tiktok_store/warehouse.go @@ -295,7 +295,6 @@ func SpecialTreat(vendorOrgCode string, vendorStoreID, storeID, deliveryFeeDeduc } //3.设置门店起送价 默认为0 if bindSaleLimitID, err := GetStoreSaleLimit(vendorOrgCode, vendorStoreID); err != nil { - //errList.AddErr(fmt.Errorf("获取门店限售模板失败:%v", err)) globals.SugarLogger.Debugf("获取门店限售模板失败:%v", err) } else { if bindSaleLimitID == 0 || utils.IsNil(bindSaleLimitID) { //创建 diff --git a/controllers/taobao_vegetable.go b/controllers/taobao_vegetable.go index bf9926651..048f73b8b 100644 --- a/controllers/taobao_vegetable.go +++ b/controllers/taobao_vegetable.go @@ -29,17 +29,14 @@ func (c *TaoBaoVegetableController) GetCode() { if c.Ctx.Input.Method() == http.MethodPost { body, err := ioutil.ReadAll(c.Ctx.Request.Body) if err != nil { - globals.SugarLogger.Debugf("商户收取code获取:%s,%s", string(body), err.Error()) c.Data["json"] = tao_vegetable.CallBackResultInfo(err) c.ServeJSON() return } - globals.SugarLogger.Debugf("商户收取code获取:%s", string(body)) codeData = string(body) } else { codeData = c.Ctx.Input.Query("code") } - globals.SugarLogger.Debugf("code:%s", utils.Format4Output(codeData, false)) tokenInfo, err := api.TaoVegetableApi.GetStoreToken(codeData, "") if err != nil { globals.SugarLogger.Debugf("获取门店token错误:%s", err.Error()) @@ -47,7 +44,6 @@ func (c *TaoBaoVegetableController) GetCode() { c.ServeJSON() return } - globals.SugarLogger.Debugf("token:%s", utils.Format4Output(tokenInfo, false)) // 创建或者更新账号token param := &model.VendorOrgCode{ @@ -137,7 +133,6 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() { globals.SugarLogger.Debugf("ApplyCancelOrder := %s", utils.Format4Output(afsOrder, false)) globals.SugarLogger.Debugf("ApplyCancelOrder err := %s", utils.Format4Output(err, false)) if err != nil { - globals.SugarLogger.Debugf("用户发起售后:%s", err.Error()) c.Data["json"] = tao_vegetable.CallBackResultInfo(err) c.ServeJSON() return @@ -183,7 +178,6 @@ func (c *TaoBaoVegetableController) UserCancelRefund() { globals.SugarLogger.Debugf("UserCancelRefund := %s", utils.Format4Output(afsOrder, false)) globals.SugarLogger.Debugf("UserCancelRefund err := %s", utils.Format4Output(err, false)) if err != nil { - globals.SugarLogger.Debugf("用户取消售后:%s", err.Error()) c.Data["json"] = tao_vegetable.CallBackResultInfo(err) c.ServeJSON() return @@ -229,7 +223,6 @@ func (c *TaoBaoVegetableController) CancelOnSaleRefundOrder() { globals.SugarLogger.Debugf("CancelOnSaleRefundOrder := %s", utils.Format4Output(afsOrder, false)) globals.SugarLogger.Debugf("CancelOnSaleRefundOrder err := %s", utils.Format4Output(err, false)) if err != nil { - globals.SugarLogger.Debugf("用户售中取消:%s", err.Error()) c.Data["json"] = tao_vegetable.CallBackResultInfo(err) c.ServeJSON() return @@ -274,7 +267,6 @@ func (c *TaoBaoVegetableController) RefundOrderSuccess() { globals.SugarLogger.Debugf("RefundOrderSuccess := %s", utils.Format4Output(refundSuccess, false)) globals.SugarLogger.Debugf("RefundOrderSuccess err := %s", utils.Format4Output(err, false)) if err != nil { - globals.SugarLogger.Debugf("用户售后成功消息通知:%s", err.Error()) c.Data["json"] = tao_vegetable.CallBackResultInfo(err) c.ServeJSON() return From d53ae43639d9769170ede70dd2c7bed36d890f6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 12 Jul 2023 15:25:25 +0800 Subject: [PATCH 15/15] 1 --- business/jxcallback/orderman/order.go | 4 ---- business/partner/purchase/tao_vegetable/order_afs.go | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go index 99999866e..44233f0f1 100644 --- a/business/jxcallback/orderman/order.go +++ b/business/jxcallback/orderman/order.go @@ -171,8 +171,6 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } }() - globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", vendorOrgCode) - globals.SugarLogger.Debugf("========OnOrderStatusChanged : %s", utils.Format4Output(orderStatus, false)) // 有些平台（比如美团外卖），在新订单事件没有成功返回，但在重发订单消息前，订单状态转换，则不会再重发新订单事件，特殊处理一下 if orderStatus != nil { if orderStatus.Status == model.OrderStatusAccepted { @@ -183,11 +181,9 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m } } } else { - globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false)) loadOrder.Status = model.OrderStatusAccepted loadOrder.VendorStatus = tao_vegetable.OrderStatusNew c.UpdateOrderFields(loadOrder, []string{"Status", "VendorStatus"}) - globals.SugarLogger.Debugf("========loadOrder : %s", utils.Format4Output(loadOrder, false)) } } } diff --git a/business/partner/purchase/tao_vegetable/order_afs.go b/business/partner/purchase/tao_vegetable/order_afs.go index 3ea086cbf..c92529ce4 100644 --- a/business/partner/purchase/tao_vegetable/order_afs.go +++ b/business/partner/purchase/tao_vegetable/order_afs.go @@ -441,7 +441,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{}) orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusRefundSuccess) orderStatus.StatusTime = time.Now() orderStatus.Remark = fmt.Sprintf("QueryTaoAfsOrderId:%s", refundData.BizSubRefundId) - orderStatus.VendorOrderID = utils.Int64ToStr(*orders[0].RefundOrderId) + orderStatus.VendorOrderID = *orders[0].OutMianOrderId taoRefundList = refundAfs.Orders }