liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 修改Rollback调用时机

Browse Source 
- 创建三方运单判断EnableStoreWrite
This commit is contained in:
gazebo
2019-04-13 11:30:24 +08:00
parent 0055892cb2
commit 16725bf8f8
4 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
business/jxstore/cms/storeman.go
View File

@@ -49,8 +49,11 @@ func (s *StoreManager) OnStoreStatusChanged(vendorStoreID string, vendorID int,
if err == nil && (storeKV != nil || storeMapKV != nil) { if err == nil && (storeKV != nil || storeMapKV != nil) {
dao.Begin(db) dao.Begin(db)
defer func() { defer func() {
if err != nil { if r := recover(); r != nil || err != nil {
dao.Rollback(db) dao.Rollback(db)
if r != nil {
panic(r)
}
} }
}() }()
if storeKV != nil { if storeKV != nil {

5
business/model/dao/store.go
View File

@@ -197,8 +197,11 @@ func FormalizeStoreStatus(db *DaoDB, storeID, storeStatus int) (err error) {
if statusList[0] != model.StoreStatusOpened { if statusList[0] != model.StoreStatusOpened {
Begin(db) Begin(db)
defer func() { defer func() {
if err != nil { if r := recover(); r != nil || err != nil {
Rollback(db) Rollback(db)
if r != nil {
panic(r)
}
} }
}() }()
if storeStatus != statusList[0] { if storeStatus != statusList[0] {

58
business/partner/delivery/dada/waybill.go
View File

@@ -131,44 +131,48 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
"cargo_num": order.GoodsCount, "cargo_num": order.GoodsCount,
} }
// 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单 if globals.EnableStoreWrite {
var lists []orm.ParamsList // 达达要求第二次创建运单，调用函数不同。所以查找两天内有无相同订单号的运单
num, err2 := db.Raw(` var lists []orm.ParamsList
num, err2 := db.Raw(`
SELECT vendor_waybill_id SELECT vendor_waybill_id
FROM waybill FROM waybill
WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day) WHERE waybill_created_at > DATE_ADD(NOW(), interval -2 day)
AND vendor_order_id = ? AND vendor_order_id = ?
AND waybill_vendor_id = ? AND waybill_vendor_id = ?
`, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists) `, jxutils.ComposeUniversalOrderID(order.VendorOrderID, order.VendorID), model.VendorIDDada).ValuesList(&lists)
var result *dadaapi.CreateOrderResponse var result *dadaapi.CreateOrderResponse
if err = err2; err == nil && num > 0 { if err = err2; err == nil && num > 0 {
globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num) globals.SugarLogger.Debugf("CreateWaybill orderID:%s num=%d use ReaddOrder", order.VendorOrderID, num)
result, err = api.DadaAPI.ReaddOrder(billParams, addParams) result, err = api.DadaAPI.ReaddOrder(billParams, addParams)
} else {
if err != nil {
globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
}
if false {
result, err = api.DadaAPI.AddOrder(billParams, addParams)
} else { } else {
if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil { if err != nil {
return nil, err globals.SugarLogger.Warnf("CreateWaybill orderID:%s error:%v", order.VendorOrderID, err)
} }
dadaFee := jxutils.StandardPrice2Int(result.Fee) if false {
if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil { result, err = api.DadaAPI.AddOrder(billParams, addParams)
return nil, err } else {
if result, err = api.DadaAPI.QueryDeliverFee(billParams, addParams); err != nil {
return nil, err
}
dadaFee := jxutils.StandardPrice2Int(result.Fee)
if err = delivery.CallCreateWaybillPolicy(policy, deliveryFee, addFee, dadaFee, order, model.VendorIDDada); err != nil {
return nil, err
}
err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
} }
err = api.DadaAPI.AddOrderAfterQuery(result.DeliveryNo)
} }
} if err == nil && result != nil {
if err == nil && result != nil { bill = &model.Waybill{
bill = &model.Waybill{ VendorOrderID: order.VendorOrderID,
VendorOrderID: order.VendorOrderID, OrderVendorID: order.VendorID,
OrderVendorID: order.VendorID, WaybillVendorID: model.VendorIDDada,
WaybillVendorID: model.VendorIDDada, DesiredFee: deliveryFee,
DesiredFee: deliveryFee, ActualFee: jxutils.StandardPrice2Int(result.Fee),
ActualFee: jxutils.StandardPrice2Int(result.Fee), }
} }
} else {
err = fmt.Errorf("测试环境不能真正创建运单")
} }
} }
} }

24
business/partner/delivery/mtps/waybill.go
View File

@@ -164,17 +164,21 @@ func (c *DeliveryHandler) CreateWaybill(order *model.GoodsOrder, policy partner.
"goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq), "goods_pickup_info": fmt.Sprintf("%s第%d号单", model.VendorChineseNames[order.VendorID], order.OrderSeq),
"poi_seq": fmt.Sprintf("#%d", order.OrderSeq), "poi_seq": fmt.Sprintf("#%d", order.OrderSeq),
} }
result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams) if globals.EnableStoreWrite {
if err = err2; err == nil { result, err2 := api.MtpsAPI.CreateOrderByShop(billParams, addParams)
globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err) if err = err2; err == nil {
bill = &model.Waybill{ globals.SugarLogger.Debugf("CreateWaybill failed, orderID:%s, billParams:%v, addParams:%v, error:%v", order.VendorOrderID, billParams, addParams, err)
VendorOrderID: order.VendorOrderID, bill = &model.Waybill{
OrderVendorID: order.VendorID, VendorOrderID: order.VendorOrderID,
VendorWaybillID: result.MtPeisongID, OrderVendorID: order.VendorID,
VendorWaybillID2: utils.Int64ToStr(result.DeliveryID), VendorWaybillID: result.MtPeisongID,
WaybillVendorID: model.VendorIDMTPS, VendorWaybillID2: utils.Int64ToStr(result.DeliveryID),
DesiredFee: deliveryFee, WaybillVendorID: model.VendorIDMTPS,
DesiredFee: deliveryFee,
}
} }
} else {
err = fmt.Errorf("测试环境不能真正创建运单")
} }
} }
} }