From 12781c14bef4981e6e2f19c5c010b6e25bb46aa9 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 30 Mar 2019 18:32:13 +0800 Subject: [PATCH] =?UTF-8?q?+=20=E6=B7=BB=E5=8A=A0canOrderCreateWaybillNorm?= =?UTF-8?q?ally?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch_ext.go | 2 +- business/jxcallback/scheduler/defsch/defsch.go | 9 --------- business/model/legacymodel/tmplog.go | 9 --------- business/partner/delivery/delivery.go | 4 ++-- business/partner/delivery/mtps/waybill.go | 12 +----------- globals/beegodb/beegodb.go | 1 - 6 files changed, 4 insertions(+), 33 deletions(-) delete mode 100644 business/model/legacymodel/tmplog.go diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 58d9ef565..9b8a0c9b4 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/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())) } } } diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 18f63eb63..d835570ba 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/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) { diff --git a/business/model/legacymodel/tmplog.go b/business/model/legacymodel/tmplog.go deleted file mode 100644 index 673ac8161..000000000 --- a/business/model/legacymodel/tmplog.go +++ /dev/null @@ -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)"` -} diff --git a/business/partner/delivery/delivery.go b/business/partner/delivery/delivery.go index 23bb2909f..f6a90914b 100644 --- a/business/partner/delivery/delivery.go +++ b/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 diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 6bf93844b..3869f80fe 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/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, diff --git a/globals/beegodb/beegodb.go b/globals/beegodb/beegodb.go index a60b89d4e..7ceb2f16b 100644 --- a/globals/beegodb/beegodb.go +++ b/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))