This commit is contained in:
richboo111
2022-11-14 09:36:25 +08:00
13 changed files with 221 additions and 171 deletions

View File

@@ -3,7 +3,6 @@ package controllers
import (
"fmt"
"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
"git.rosy.net.cn/jx-callback/globals"
"github.com/panjf2000/ants"
"io"
"sync"
@@ -39,7 +38,6 @@ func (c *SyncController) SyncStoresSkus() {
if err = jxutils.Strings2Objs(params.StoreIDs, &storeIDs, params.SkuIDs, &skuIDs, params.VendorIDs, &vendorIDs); err != nil {
return retVal, "", err
}
globals.SugarLogger.Debugf("============1")
retVal, err = cms.CurVendorSync.SyncStoresSkus(params.Ctx, nil, 0, db, vendorIDs, storeIDs, skuIDs, params.IsForce, params.IsAsync, params.IsContinueWhenError)
return retVal, "", err
})

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()
}