1
This commit is contained in:
@@ -869,6 +869,7 @@ func GetVendorStore(ctx *jxcontext.Context, vendorID int, vendorOrgCode, vendorS
|
|||||||
//} else {
|
//} else {
|
||||||
// retVal.BussinessStatus = 1
|
// retVal.BussinessStatus = 1
|
||||||
//}
|
//}
|
||||||
|
globals.SugarLogger.Debugf("---------retVal := %s", utils.Format4Output(retVal, false))
|
||||||
return retVal, err
|
return retVal, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -84,6 +84,8 @@ func shopStatus2JX(status int) (jxStatus int) {
|
|||||||
|
|
||||||
func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeDetail *dao.StoreDetail2, err error) {
|
func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorStoreID string) (storeDetail *dao.StoreDetail2, err error) {
|
||||||
shopInfo, err := api.FnAPI.GetStore(vendorStoreID)
|
shopInfo, err := api.FnAPI.GetStore(vendorStoreID)
|
||||||
|
globals.SugarLogger.Debugf("---------err := %v", err)
|
||||||
|
globals.SugarLogger.Debugf("---------shopInfo := %s", utils.Format4Output(shopInfo, false))
|
||||||
if err == nil {
|
if err == nil {
|
||||||
storeDetail = &dao.StoreDetail2{
|
storeDetail = &dao.StoreDetail2{
|
||||||
Store: model.Store{
|
Store: model.Store{
|
||||||
@@ -98,6 +100,7 @@ func (c *DeliveryHandler) GetStore(ctx *jxcontext.Context, storeID int, vendorSt
|
|||||||
CourierStatus: shopStatus2JX(shopInfo.Status),
|
CourierStatus: shopStatus2JX(shopInfo.Status),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
globals.SugarLogger.Debugf("---------storeDetail := %s", utils.Format4Output(storeDetail, false))
|
||||||
return storeDetail, err
|
return storeDetail, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -163,6 +163,11 @@ func (c *PurchaseHandler) onAfsOrderMsg(msg *mtwmapi.CallbackMsg) (retVal *mtwma
|
|||||||
afsOrder.AfsFinishedAt = time.Now()
|
afsOrder.AfsFinishedAt = time.Now()
|
||||||
afsOrder.Status = model.AfsOrderStatusFinished
|
afsOrder.Status = model.AfsOrderStatusFinished
|
||||||
}
|
}
|
||||||
|
if refundData.NotifyType == mtwmapi.MsgTypeOrderAgree && msg.Cmd == mtwmapi.MsgTypeOrderRefund {
|
||||||
|
order, _ := partner.CurOrderManager.LoadOrder(orderStatus.RefVendorOrderID, model.VendorIDMTWM)
|
||||||
|
order.Status = model.OrderStatusCanceled
|
||||||
|
dao.UpdateEntity(db, order, "Status")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
err = partner.CurOrderManager.OnAfsOrderNew(afsOrder, orderStatus)
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user