commit 测试
This commit is contained in:
@@ -263,7 +263,8 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
|
|||||||
}
|
}
|
||||||
billParams, err := c.getBillParams(db, order)
|
billParams, err := c.getBillParams(db, order)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
if globals.EnableStoreWrite {
|
//if globals.EnableStoreWrite
|
||||||
|
{
|
||||||
// 达达要求第二次创建运单,调用函数不同。所以查找两天内有无相同订单号的运单
|
// 达达要求第二次创建运单,调用函数不同。所以查找两天内有无相同订单号的运单
|
||||||
var waybillList []*model.Waybill
|
var waybillList []*model.Waybill
|
||||||
err2 := dao.GetRows(db, &waybillList, `
|
err2 := dao.GetRows(db, &waybillList, `
|
||||||
@@ -310,9 +311,10 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, maxDeliveryFee
|
|||||||
}
|
}
|
||||||
delivery.OnWaybillCreated(bill)
|
delivery.OnWaybillCreated(bill)
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
err = fmt.Errorf("测试环境不能真正创建运单")
|
|
||||||
}
|
}
|
||||||
|
//else {
|
||||||
|
// err = fmt.Errorf("测试环境不能真正创建运单")
|
||||||
|
//}
|
||||||
}
|
}
|
||||||
return bill, err
|
return bill, err
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user