+ 添加canOrderCreateWaybillNormally

business/partner/delivery/delivery.go

@@ -50,8 +50,8 @@ func CallCreateWaybillPolicy(policy partner.CreateWaybillPolicy, refDeliveryFee,
 	}
 	if errStr := policy(deliveryFee, deliveryFee, addFee); errStr != "" {
 		waybillVendorName := jxutils.GetVendorName(waybillVendorID)
-		errStr = fmt.Sprintf("oderID:%s在平台:%s，创建运单出错:%s", order.VendorOrderID, waybillVendorName, errStr)
-		globals.SugarLogger.Debugf("%s CreateWaybill failed with %s", waybillVendorName, errStr)
+		errStr = fmt.Sprintf("oderID:%s创建运单出错:%s", order.VendorOrderID, errStr)
+		globals.SugarLogger.Debugf("%s CallCreateWaybillPolicy failed with %s", waybillVendorName, errStr)
 		return errors.New(errStr)
 	}
 	return nil

business/partner/delivery/mtps/waybill.go

@@ -10,7 +10,6 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"git.rosy.net.cn/jx-callback/globals"
@@ -166,17 +165,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
 					"poi_seq":           fmt.Sprintf("#%d", order.OrderSeq),
 				}
 				result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
-				if err = err2; err != nil {
+				if err = err2; err == nil {
 					globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
-
-					tmpLog := &legacymodel.TempLog{
-						VendorOrderID:    order.VendorOrderID,
-						RefVendorOrderID: order.VendorOrderID,
-						IntValue1:        addFee,
-						Msg:              fmt.Sprintf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err),
-					}
-					db.Insert(tmpLog)
-				} else {
 					bill = &model.Waybill{
 						VendorOrderID:    order.VendorOrderID,
 						OrderVendorID:    order.VendorID,