From 0c8c438f0eb57d45d95376632414335a1f403f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Wed, 17 Jan 2024 10:11:47 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 3 +++ business/model/dao/freight_template.go | 4 +++- business/partner/delivery/fn/waybill.go | 16 +++++++++------- business/partner/delivery/mtps/waybill.go | 14 ++++++++------ business/partner/delivery/sfps/waybill.go | 14 ++++++++------ business/partner/delivery/uupt/waybill.go | 16 +++++++++------- business/partner/purchase/jd/callback.go | 3 +++ business/partner/purchase/jd/store.go | 11 +++++------ 8 files changed, 48 insertions(+), 33 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 9c89e289d..a553df1f8 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -3525,6 +3525,9 @@ func UpdateJdStoreNameAll(ctx *jxcontext.Context) (err error) { ` if err = dao.GetRows(db, &stores, sql, model.VendorIDJD, v); err == nil { for _, store := range stores { + if store.Status == model.StoreStatusDisabled { + continue + } a := jd.GetAPI(store.VendorOrgCode) storeParams := &jdapi.OpStoreParams{ StationNo: store.VendorStoreID, diff --git a/business/model/dao/freight_template.go b/business/model/dao/freight_template.go index 7bf549ee0..78d47a315 100644 --- a/business/model/dao/freight_template.go +++ b/business/model/dao/freight_template.go @@ -106,11 +106,13 @@ func InsertItemFreight(tem *model.FreightTemplate) error { sqlParams = append(sqlParams, tem.TradeLimitID) sqlStr = append(sqlStr, tradeLimitIDSql) } + if len(sqlStr) == model.NO { + return nil + } tStr = "WHERE a.store_id = ? AND a.vendor_store_id = ?" sqlParams = append(sqlParams, tem.StoreID, tem.VendorStoreID) tStr2 := sql + strings.Join(sqlStr, ",") + tStr _, err := ExecuteSQL(GetDB(), tStr2, sqlParams...) - fmt.Println(tStr2) return err } diff --git a/business/partner/delivery/fn/waybill.go b/business/partner/delivery/fn/waybill.go index 42ae01deb..2804e5434 100644 --- a/business/partner/delivery/fn/waybill.go +++ b/business/partner/delivery/fn/waybill.go @@ -100,13 +100,15 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment) } - // 获取配送费 - fee, err := c.GetWaybillFee(order) - if err != nil { - return nil, err - } - if fee.DeliveryFee >= model.DefMaxDeliveryFee { - return nil, fmt.Errorf("蜂鸟超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + if maxDeliveryFee == model.NO { + // 获取配送费 + fee, err := c.GetWaybillFee(order) + if err != nil { + return nil, err + } + if fee.DeliveryFee >= model.DefMaxDeliveryFee { + return nil, fmt.Errorf("蜂鸟超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + } } // 蜂鸟入参结构体 diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 664f5b330..a5f1e3c8b 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -331,12 +331,14 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment) } - fee, err := c.GetWaybillFee(order) - if err != nil { - return nil, err - } - if fee.DeliveryFee >= model.DefMaxDeliveryFee { - return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + if maxDeliveryFee == model.NO { + fee, err := c.GetWaybillFee(order) + if err != nil { + return nil, err + } + if fee.DeliveryFee >= model.DefMaxDeliveryFee { + return nil, fmt.Errorf("美团配送超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + } } // 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出 diff --git a/business/partner/delivery/sfps/waybill.go b/business/partner/delivery/sfps/waybill.go index 5e3b0e0b1..8249b1ed0 100644 --- a/business/partner/delivery/sfps/waybill.go +++ b/business/partner/delivery/sfps/waybill.go @@ -89,12 +89,14 @@ func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee i return nil, fmt.Errorf("此平台配送已被系统关闭，暂不发配送 [%v]", vendorOrgCode[0].Comment) } - fee, err := d.GetWaybillFee(order) - if err != nil { - return nil, err - } - if fee.DeliveryFee >= model.DefMaxDeliveryFee { - return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + if maxDeliveryFee == model.NO { + fee, err := d.GetWaybillFee(order) + if err != nil { + return nil, err + } + if fee.DeliveryFee >= model.DefMaxDeliveryFee { + return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + } } store, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "") diff --git a/business/partner/delivery/uupt/waybill.go b/business/partner/delivery/uupt/waybill.go index 58f9544d8..1ad557a8d 100644 --- a/business/partner/delivery/uupt/waybill.go +++ b/business/partner/delivery/uupt/waybill.go @@ -139,14 +139,16 @@ func (d DeliveryHandler) IsErrStoreExist(err error) bool { } func (d DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee int64) (bill *model.Waybill, err error) { - fee, err := d.GetWaybillFee(order) - if err != nil { - return nil, err - } - if fee.DeliveryFee >= model.DefMaxDeliveryFee { - return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) - } + if maxDeliveryFee == model.NO { + fee, err := d.GetWaybillFee(order) + if err != nil { + return nil, err + } + if fee.DeliveryFee >= model.DefMaxDeliveryFee { + return nil, fmt.Errorf("顺丰超最高限价, 所需运费:%s, 最高限价:%s", jxutils.IntPrice2StandardCurrencyString(fee.DeliveryFee), jxutils.IntPrice2StandardCurrencyString(model.DefMaxDeliveryFee)) + } + } //获取门店老板详情 storeOwner, err := dao.GetStoreDetail(dao.GetDB(), getReallyStoreID(order.StoreID, order.JxStoreID), 0, "") if err != nil { diff --git a/business/partner/purchase/jd/callback.go b/business/partner/purchase/jd/callback.go index 395cdc5e3..8f655d039 100644 --- a/business/partner/purchase/jd/callback.go +++ b/business/partner/purchase/jd/callback.go @@ -2,6 +2,8 @@ package jd import ( "git.rosy.net.cn/baseapi/platformapi/jdapi" + "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" ) func OnOrderMsg(msg *jdapi.CallbackOrderMsg, a *jdapi.API) (retVal *jdapi.CallbackResponse) { @@ -21,6 +23,7 @@ func OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackR func OnStoreMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) { if CurPurchaseHandler != nil { retVal = CurPurchaseHandler.OnStoreMsg(AppKey2OrgCode(msg.AppKey), msg) + globals.SugarLogger.Debugf("retVal========= %s", utils.Format4Output(retVal, false)) } return retVal } diff --git a/business/partner/purchase/jd/store.go b/business/partner/purchase/jd/store.go index fa7313b66..547dbb95f 100644 --- a/business/partner/purchase/jd/store.go +++ b/business/partner/purchase/jd/store.go @@ -142,12 +142,10 @@ func (p *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin if err = dao.GetRows(db, &stores, sql, model.VendorIDJD, utils.DefaultTimeValue, storeID); err == nil { for _, store := range stores { a := getAPI(store.VendorOrgCode) - // phone := "" - // if store.MarketManPhone != "" { - // phone = store.MarketManPhone - // } else { - // phone = model.VendorStoreTel - // } + if store.Status == model.StoreStatusDisabled { + continue + } + storeParams := &jdapi.OpStoreParams{ StationNo: store.VendorStoreID, Operator: userName, @@ -339,6 +337,7 @@ func (p *PurchaseHandler) GetStoreStatus(ctx *jxcontext.Context, vendorOrgCode s // 当前京东的storeCrud消息不会在门店状态改变时发送，所以意义不大，先放在这里 func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOrderMsg) (response *jdapi.CallbackResponse) { + globals.SugarLogger.Debugf("OnStoreMsg========= %s", utils.Format4Output(msg, false)) var err error if msg.StatusID == jdapi.StatusIDUpdateStore { var storeStatus int