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

- fk

Browse Source
This commit is contained in:
gazebo
2019-08-26 17:31:56 +08:00
parent a39a4b7917
commit ec612b807b
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/waybill.go
View File

@@ -99,8 +99,12 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) {
duplicatedCount = 1 duplicatedCount = 1
} }
} else { } else {
if bill.Status == model.WaybillStatusAccepted { // 处理美团配送丢失新运单消息的情况
existingBill, err2 := w.LoadWaybill(bill.VendorWaybillID, bill.WaybillVendorID) existingBill, err2 := w.LoadWaybill(bill.VendorWaybillID, bill.WaybillVendorID)
// todo
if err2 == nil {
bill.DeliveryFlag = existingBill.DeliveryFlag
}
if bill.Status == model.WaybillStatusAccepted { // 处理美团配送丢失新运单消息的情况
if err2 != nil { if err2 != nil {
if dao.IsNoRowsError(err2) || err2 == ErrCanNotFindWaybill { if dao.IsNoRowsError(err2) || err2 == ErrCanNotFindWaybill {
existingBill = bill existingBill = bill

1
business/jxstore/cms/authz.go
View File

@@ -15,6 +15,7 @@ import (
// todo 是否需要将Store.MarketManPhone与OperatorPhone成角色？ // todo 是否需要将Store.MarketManPhone与OperatorPhone成角色？
func TransferLegacyWeixins(mobile string) (err error) { func TransferLegacyWeixins(mobile string) (err error) {
globals.SugarLogger.Debugf("TransferLegacyWeixins mobile:%s", mobile)
if !globals.EnableWXAuth2 { if !globals.EnableWXAuth2 {
return nil return nil
} }