diff --git a/business/partner/purchase/ebai/waybill.go b/business/partner/purchase/ebai/waybill.go index 25c4c8c22..5b7569e4e 100644 --- a/business/partner/purchase/ebai/waybill.go +++ b/business/partner/purchase/ebai/waybill.go @@ -47,6 +47,7 @@ func (c *PurchaseHandler) onWaybillMsg(msg *ebaiapi.CallbackMsg) (retVal *ebaiap } else { order.CourierName = utils.Interface2String(result["name"]) order.CourierMobile = utils.Interface2String(result["phone"]) + } if order.Status == model.WaybillStatusNew { order2, _ := partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.WaybillVendorID) @@ -80,8 +81,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *ebaiapi.CallbackMsg) (retVal Status: c.GetWaybillStatusFromVendorStatus(vendorStatus), VendorStatus: vendorStatus, StatusTime: utils.Timestamp2Time(msg.Timestamp), - - VendorOrgCode: msg.Source, + VendorOrgCode: msg.Source, } return retVal } diff --git a/business/partner/purchase/tiktok_store/waybill.go b/business/partner/purchase/tiktok_store/waybill.go index c115b4fb7..552f15ed7 100644 --- a/business/partner/purchase/tiktok_store/waybill.go +++ b/business/partner/purchase/tiktok_store/waybill.go @@ -3,6 +3,7 @@ package tiktok_store import ( "errors" "fmt" + superm_getShipmentInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getShipmentInfo/response" superm_getStoreAutoCallRiderInfo_response "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_getStoreAutoCallRiderInfo/response" superm_setStoreAutoCallRider_request "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/sdk-golang/api/superm_setStoreAutoCallRider/request" @@ -53,6 +54,10 @@ func (c *PurchaseHandler) onWaybillMsg(tag, orderId string, data interface{}) *t func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interface{}) (retVal *model.Waybill) { req := data.(tiktok_api.ShipmentInfoData) + tempRemark := "" + if req.ShipmentStatus == tiktok_api.ShipmentStatusReceived { + tempRemark = req.RiderName + "," + req.RiderPhone + } return &model.Waybill{ VendorOrderID: utils.Int64ToStr(req.ShopOrderID), OrderVendorID: model.VendorIDDD, @@ -64,7 +69,7 @@ func (c *PurchaseHandler) callbackMsg2Waybill(tag, orderId string, data interfac Status: c.GetWaybillStatusFromVendorStatus(utils.Int64ToStr(req.ShipmentStatus)), StatusTime: utils.Str2Time(req.OccurredTime), //StatusTime: getTimeFromTimestamp(utils.Str2Int64(req.OccurredTime)), - Remark: "", + Remark: tempRemark, VendorOrgCode: utils.Int64ToStr(req.ShopID), //为抖音账号ID } } diff --git a/controllers/uupt_callback.go b/controllers/uupt_callback.go index 74176ccb8..fc35f701f 100644 --- a/controllers/uupt_callback.go +++ b/controllers/uupt_callback.go @@ -1,13 +1,12 @@ package controllers import ( + "net/http" + "git.rosy.net.cn/baseapi/platformapi/uuptapi" - "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/partner/delivery/uupt" - "git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals/api" "github.com/astaxie/beego/server/web" - "net/http" ) type UuPtController struct { @@ -18,7 +17,6 @@ type UuPtController struct { func (c *UuPtController) UuWaybillCallback() { if c.Ctx.Input.Method() == http.MethodPost { resp, callbackResponse := api.UuAPI.WaybillCallback(c.Ctx.Request) - globals.SugarLogger.Debugf("UuWaybillCallback resp============%s", utils.Format4Output(resp, false)) if callbackResponse.ReturnCode == uuptapi.ReturnFail { c.Data["code"] = callbackResponse c.ServeJSON()