+ 添加canOrderCreateWaybillNormally

business/jxcallback/scheduler/basesch/basesch_ext.go

@@ -31,7 +31,7 @@ func (c *BaseScheduler) CreateWaybillOnProviders(ctx *jxcontext.Context, order *
 				bills = append(bills, bill)
 			} else {
 				globals.SugarLogger.Debugf("CreateWaybillOnProviders orderID:%s userName:%s vendorID:%d failed with error:%v", order.VendorOrderID, userName, courierVendorID, err)
-				errList = append(errList, err.Error())
+				errList = append(errList, fmt.Sprintf("平台:%s,%s", jxutils.GetVendorName(courierVendorID), err.Error()))
 			}
 		}
 	}

business/jxcallback/scheduler/defsch/defsch.go

@@ -555,15 +555,6 @@ func (s *DefScheduler) swtich2SelfDeliverWithRetry(savedOrderInfo *WatchOrderInf
 					})
 				} else {
 					globals.SugarLogger.Infof("swtich2SelfDeliverWithRetry finally failed, orderID:%s bill:%v, err:%v", order.VendorOrderID, bill, err)
-
-					tmpLog := &legacymodel.TempLog{
-						VendorOrderID:    bill.VendorWaybillID,
-						RefVendorOrderID: order.VendorOrderID,
-						Msg:              fmt.Sprintf("swtich2SelfDeliverWithRetry finally failed, orderID:%s bill:%v, err:%v", order.VendorOrderID, bill, err),
-					}
-					db := orm.NewOrm()
-					db.Insert(tmpLog)
-
 					if s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonSwitch2SelfFailed, partner.CancelWaybillReasonStrSwitch2SelfFailed) == nil {
 						// 转自送失败的取消，要将订单中的运单状态更新
 						if s.isBillCandidate(order, bill) {

business/model/legacymodel/tmplog.go

@@ -1,9 +0,0 @@
-package legacymodel
-
-type TempLog struct {
-	ID               int64  `orm:"column(id)"`
-	VendorOrderID    string `orm:"column(vendor_order_id);size(48);index"`
-	RefVendorOrderID string `orm:"column(ref_vendor_order_id);size(48);index"`
-	IntValue1        int64
-	Msg              string `orm:"type(text)"`
-}

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)
+		errStr = fmt.Sprintf("oderID:%s创建运单出错:%s", order.VendorOrderID, errStr)
-		globals.SugarLogger.Debugf("%s CreateWaybill failed with %s", waybillVendorName, 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,

globals/beegodb/beegodb.go

@@ -15,7 +15,6 @@ func Init() {
 	orm.RegisterModel(new(legacymodel.BlackClient))
 	orm.RegisterModel(new(legacymodel.JxBadComments))
 	orm.RegisterModel(new(legacymodel.StoreBill))
-	orm.RegisterModel(new(legacymodel.TempLog))
 	orm.RegisterModel(new(legacymodel.WeiXins), new(legacymodel.JxBackendUser))
 
 	orm.RegisterModel(new(model.GoodsOrder))