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

jd.postFakeMsg中正确设置AppKey

Browse Source
This commit is contained in:
gazebo
2019-12-16 10:19:54 +08:00
parent 65d6ac4268
commit ff6cd228a6
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1043,6 +1043,7 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
userName := ctx.GetUserName() userName := ctx.GetUserName()
storeMap.StoreID = storeID storeMap.StoreID = storeID
storeMap.VendorID = vendorID storeMap.VendorID = vendorID
storeMap.VendorOrgCode = vendorOrgCode
storeMap.Status = model.StoreStatusOpened storeMap.Status = model.StoreStatusOpened
storeMap.DeliveryType = model.StoreDeliveryTypeByStore storeMap.DeliveryType = model.StoreDeliveryTypeByStore
storeMap.SyncStatus = 0 storeMap.SyncStatus = 0

2
business/partner/purchase/jd/jd.go
View File

@@ -24,7 +24,7 @@ func init() {
func getAPI(appOrgCode string) (apiObj *jdapi.API) { func getAPI(appOrgCode string) (apiObj *jdapi.API) {
if appOrgCode == "" { if appOrgCode == "" {
// globals.SugarLogger.Warnf("getAPI appOrgCode is empty") globals.SugarLogger.Warnf("getAPI appOrgCode is empty")
} }
return partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API) return partner.CurAPIManager.GetAPI(model.VendorIDJD, appOrgCode).(*jdapi.API)
} }

20
business/partner/purchase/jd/order.go
View File

@@ -284,12 +284,14 @@ func (c *PurchaseHandler) callbackMsg2Status(msg *jdapi.CallbackOrderMsg) *model
return orderStatus return orderStatus
} }
func (c *PurchaseHandler) postFakeMsg(vendorOrderID, vendorStatus string) { func (c *PurchaseHandler) postFakeMsg(vendorOrgCode, vendorOrderID, vendorStatus string) {
msg := &jdapi.CallbackOrderMsg{ msg := &jdapi.CallbackOrderMsg{
CallbackMsg: &jdapi.CallbackMsg{}, CallbackMsg: &jdapi.CallbackMsg{
BillID: vendorOrderID, AppKey: getAPI(vendorOrgCode).GetAppKey(),
StatusID: vendorStatus, },
Timestamp: utils.Time2Str(time.Now()), BillID: vendorOrderID,
StatusID: vendorStatus,
Timestamp: utils.Time2Str(time.Now()),
} }
utils.CallFuncAsync(func() { utils.CallFuncAsync(func() {
OnOrderMsg(msg) OnOrderMsg(msg)
@@ -309,14 +311,14 @@ func (c *PurchaseHandler) AcceptOrRefuseOrder(order *model.GoodsOrder, isAcceptI
if globals.EnableJdStoreWrite { if globals.EnableJdStoreWrite {
err = getAPI(order.VendorOrgCode).OrderAcceptOperate(order.VendorOrderID, isAcceptIt, userName) err = getAPI(order.VendorOrgCode).OrderAcceptOperate(order.VendorOrderID, isAcceptIt, userName)
if isAcceptIt && err == nil { if isAcceptIt && err == nil {
c.postFakeMsg(order.VendorOrderID, jdapi.StatusIDWaitOutStore) c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.StatusIDWaitOutStore)
} }
} else { } else {
if isAcceptIt { if isAcceptIt {
c.postFakeMsg(order.VendorOrderID, jdapi.StatusIDWaitOutStore) c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.StatusIDWaitOutStore)
} else { } else {
c.postFakeMsg(order.VendorOrderID, jdapi.OrderStatusCanceled) c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.OrderStatusCanceled)
} }
} }
return err return err
@@ -327,7 +329,7 @@ func (c *PurchaseHandler) PickupGoods(order *model.GoodsOrder, isSelfDelivery bo
if !isSelfDelivery && globals.EnableJdStoreWrite { if !isSelfDelivery && globals.EnableJdStoreWrite {
_, err = getAPI(order.VendorOrgCode).OrderJDZBDelivery(order.VendorOrderID, userName) _, err = getAPI(order.VendorOrgCode).OrderJDZBDelivery(order.VendorOrderID, userName)
} else { } else {
c.postFakeMsg(order.VendorOrderID, jdapi.OrderStatusFinishedPickup) c.postFakeMsg(order.VendorOrgCode, order.VendorOrderID, jdapi.OrderStatusFinishedPickup)
} }
return err return err
} }

2
business/partner/purchase/jd/store.go
View File

@@ -113,8 +113,6 @@ func (p *PurchaseHandler) ReadStore(ctx *jxcontext.Context, vendorOrgCode, vendo
retVal.DeliveryRange = utils.Int2Str(deliveryRange.DeliveryRangeRadius) retVal.DeliveryRange = utils.Int2Str(deliveryRange.DeliveryRangeRadius)
} }
return retVal, nil return retVal, nil
} else {
globals.SugarLogger.Warnf("jd vendorOrgCode:%s vendorStoreID:%s", vendorOrgCode, vendorStoreID)
} }
} }
return nil, err return nil, err