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

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-09 18:58:07 +08:00
parent 64ee09a388
commit 68090f2eff
4 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -487,8 +487,6 @@ func (c *DeliveryHandler) GetRidderPosition(ctx *jxcontext.Context, vendorOrgCod
// 获取骑手信息(订单详情)
func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeisongId string) (rider *mtpsapi.RiderInfo, err error) {
order, err := api.DadaAPI.QueryOrderInfo(orderId)
globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("order111111111111 := %s", utils.Format4Output(err, false))
if err != nil {
return nil, err
}
@@ -540,8 +538,5 @@ func (c *DeliveryHandler) GetRiderInfo(orderId string, deliveryId int64, mtPeiso
result.LogisticsStatus = 0
result.LogisticsContext = model.RiderGetOrderDeliverOther
}
globals.SugarLogger.Debugf("dadaresult_order := %s", utils.Format4Output(order, false))
globals.SugarLogger.Debugf("result_result := %s", utils.Format4Output(result, false))
return result, nil
}

4
business/partner/purchase/tiktok_store/order.go
View File

@@ -219,8 +219,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
// GetOrderRider 商家自配送同步配送信息
func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) {
appKey := `7153997323561879075` // 暂时定死
appSecret := `3517d3ea-b96b-4379-a7a4-2d9389e8ffeb` //暂时定死
appKey := `7152420904331429407` // 暂时定死
appSecret := `cc7ba367-2394-4cbb-81c6-26f0e929d1c6` //暂时定死
return tiktokShop.NewExpress(appKey, appSecret, "").OrderStatusAndPsInfo(param)
}

2
business/partner/purchase/tiktok_store/store_sku2_utils.go
View File

@@ -148,7 +148,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
param.CategoryLeafId = storeSku.VendorVendorCatID
}
// param.AccountTemplateId = ""
// 获取上传图,商品轮播图
img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5)
if err != nil {
@@ -313,7 +312,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
} else {
param.CategoryLeafId = storeSku.VendorVendorCatID
}
// param.AccountTemplateId = ""
// 获取上传图,商品轮播图
img, err := GetTiktokImgList(utils.Int2Str(storeSku.StoreID), storeDetail.VendorOrgCode, storeSku.ImgOrigin, storeSku.Img2, storeSku.Img3, storeSku.Img4, storeSku.Img5)
if err != nil {

23
controllers/tiktok_delivery.go
View File

@@ -171,7 +171,6 @@ func (c *LogisticsController) LogisticsQuery() {
Timestamp: utils.Time2Str(time.Now()),
TrackNo: param.TrackNo,
Traces: []TracesList{{
Opcode: "ORDER_RECEIVED",
Timestamp: utils.Time2Str(time.Now()),
Content: "抖音定时保底更新",
ThirdPartyCompany: tiktok_api.TiktokExpressCode,
@@ -184,6 +183,28 @@ func (c *LogisticsController) LogisticsQuery() {
},
}
switch data[0].Status {
case 5: // 呼叫骑手
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsStatusCALLRIDER
case 10, 12: // 骑手接单
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsORDERRECEIVED
case 15: // 到店
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsRIDERARRIVED
case 20: //配送中
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsRIDERPICKUP
case 105, 120: // 完成
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsDELIVERED
case 8, 115: // 取消
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsCANCELDELIVERY
returnParam.Data.Traces[0].CancelCode = "3000" // 骑手原因取消
returnParam.Data.Traces[0].CancelDesc = "繁忙" // 骑手原因取消
case 22: //配送异常
returnParam.Data.Traces[0].Opcode = tiktok_api.TiktokLogisticsINDDELIVERYEXCEPTION
returnParam.Data.Traces[0].ExceptionCode = "5001" // 服务商系统异常
returnParam.Data.Traces[0].ExceptionDesc = "服务商系统异常" // 服务商系统异常
}
c.Data["json"] = returnParam
c.ServeJSON()
}