1

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,

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
 }

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))
+		}
 	}
 
 	// 蜂鸟入参结构体

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))
+		}
 	}
 
 	// 忽略坐标转换错误，即使是转换出错，也只能当成转换成功来处理，底层会有错误日志输出

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, "")

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 {

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
 }

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