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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2022-11-02 10:17:44 +08:00
parent 1004ce21cf 660bfdabcb
commit afcfcdc393
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/partner/delivery/rider.go
View File

@@ -78,7 +78,7 @@ func GetOrderRiderInfoToPlatform(orderId string) {
switch riderInfo.LogisticsStatus { switch riderInfo.LogisticsStatus {
case 20: //配送中 case 20: //配送中
riderInfo.LogisticsStatus = 20 riderInfo.LogisticsStatus = 20
riderInfo.OpCode = tiktok_api.TiktokLogisticsORDERRECEIVED riderInfo.OpCode = tiktok_api.TiktokLogisticsRIDERPICKUP
case 110: // 完成 case 110: // 完成
riderInfo.LogisticsStatus = 40 riderInfo.LogisticsStatus = 40
riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED riderInfo.OpCode = tiktok_api.TiktokLogisticsDELIVERED

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

@@ -47,7 +47,7 @@ func (c *PurchaseHandler) GetVendorID() int {
} }
func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) { func (p *PurchaseHandler) GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error) {
cats, err := getAPI("53802960", 0, "").GetShopCategory(0) cats, err := getAPI("57939570", 0, "").GetShopCategory(0)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
controllers/tiktok_order.go
View File

@@ -3,6 +3,7 @@ package controllers
import ( import (
"git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api" "git.rosy.net.cn/baseapi/platformapi/tiktok_shop/tiktok_api"
"git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store" "git.rosy.net.cn/jx-callback/business/partner/purchase/tiktok_store"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
"strings" "strings"
@@ -21,6 +22,7 @@ func (t *TiktokController) CallbackTiktokOrderMsg() {
t.ServeJSON() t.ServeJSON()
return return
} }
globals.SugarLogger.Debugf("订单消息-------------------%s", string(byteList))
if strings.Contains(string(byteList), "\"msg_id\":\"0\"") { if strings.Contains(string(byteList), "\"msg_id\":\"0\"") {
t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess} t.Data["json"] = tiktok_api.CallbackResponse{Code: tiktok_api.CallbackSuccessCode, Msg: tiktok_api.CallbackSuccess}
t.ServeJSON() t.ServeJSON()