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

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

Browse Source
This commit is contained in:
邹宗楠
2023-09-28 09:10:36 +08:00
parent 5508672025 6aa051811e
commit f0ece290a3
4 changed files with 45 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
business/jxstore/cms/store.go
View File

@@ -6334,6 +6334,25 @@ func SetStoreAutoCallRider(vendorOrgCode string, openIDs, closeIDs []int64) (str
return "", nil
}
// CreateDDWarehouse 创建抖音门店区域仓
func CreateDDWarehouse(vendorOrgCode string, vendorStoreID, storeID int64) error {
var errList errlist.ErrList
bind, err := tiktok_store.GetWarehouseByStore(vendorOrgCode, vendorStoreID)
globals.SugarLogger.Debugf("CreateDDWarehouse bind=%s", utils.Format4Output(bind, false))
if err == nil && bind[utils.Int64ToStr(vendorStoreID)][0].WarehouseId > 0 {
return nil
}
warehouseID, err1 := tiktok_store.CreateWarehouse(vendorOrgCode, storeID)
if err1 != nil || warehouseID == 0 {
errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err1))
}
err1 = tiktok_store.BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID)
if err1 != nil { //仓库绑定通过自定义外部ID
errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库%d 失败:%v", storeID, warehouseID, err1))
}
return errList.GetErrListAsOne()
}
type MtRelInfo struct {
PoiCode string `json:"poi_code"`
PicUrl string `json:"pic_url"`

6
business/partner/im/im.go
View File

@@ -83,11 +83,9 @@ func ReadMsgFromClient(vendorID int, elmAppID string, msg interface{}) error {
LatestTime: pushContent.Cts,
OrderID: "",
}
globals.SugarLogger.Debugf("ReadMsgFromClient pushContent.OrderID=%d", pushContent.OrderID)
if pushContent.OrderID != 0 {
userList.OrderID = utils.Int2Str(pushContent.OrderID)
}
globals.SugarLogger.Debugf("ReadMsgFromClient userList=%s", utils.Format4Output(userList, false))
}
if vendorID == VendorIDELM {
var ElmData = ebaiapi.ImMessageSend{}
@@ -147,13 +145,10 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
LatestTime: PushContentReq.Cts,
OrderID: "",
}
globals.SugarLogger.Debugf("ReadMsgFromVendor PushContentReq.OrderID=%d", PushContentReq.OrderID)
vendorStoreID = PushContentReq.AppPoiCode
if PushContentReq.OrderID != 0 {
userList.OrderID = utils.Int2Str(PushContentReq.OrderID)
}
globals.SugarLogger.Debugf("ReadMsgFromVendor userList=%s", utils.Format4Output(userList, false))
}
if vendorID == VendorIDELM {
var ElmData = ebaiapi.ImMessageSend{}
@@ -362,6 +357,7 @@ func SetJxMsgRead(appID, vendorStoreID, vendorID, userID string) error {
temp = UserMessageList{
VendorID: v.VendorID,
UserID: v.UserID,
OrderID: v.OrderID,
NewMessageNum: 0,
LatestMsg: v.LatestMsg,
LatestTime: v.LatestTime,