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-06 13:51:51 +08:00
parent ab6db54205 3dc6d1508e
commit fbfec31c95
9 changed files with 53 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
business/partner/purchase/im/im.go → business/partner/im/im.go
View File

@@ -7,6 +7,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/model" "git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/baseapi/utils/errlist"
@@ -18,15 +20,15 @@ import (
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
push "git.rosy.net.cn/jx-callback/business/jxutils/unipush" push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
"git.rosy.net.cn/jx-callback/globals/api"
) )
func SendVendorV2(data SendData) (err error) { func SendVendorV2(data SendData, vendorOrgCode string) (err error) {
if data.VendorID == model.VendorIDMTWM { if data.VendorID == model.VendorIDMTWM {
dataStr, _ := json.Marshal(data.Data) dataStr, _ := json.Marshal(data.Data)
temp := string(dataStr) temp := string(dataStr)
globals.SugarLogger.Debugf("SendVendorV2 temp=%s", temp) globals.SugarLogger.Debugf("SendVendorV2 temp=%s", temp)
if _, err = api.MtwmAPI.MsgSend(string(dataStr)); err != nil { //if _, err = api.MtwmAPI.MsgSend(string(dataStr)); err != nil {
if _, err = partner.CurAPIManager.GetAPI(model.VendorIDMTWM, vendorOrgCode).(*mtwmapi.API).MsgSend(string(dataStr)); err != nil {
return err return err
} }
} }

0
business/partner/purchase/im/im_model.go → business/partner/im/im_model.go
View File

2
business/partner/purchase/ebai/im.go
View File

@@ -4,7 +4,7 @@ import (
"encoding/json" "encoding/json"
"git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/baseapi/platformapi/ebaiapi"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im" "git.rosy.net.cn/jx-callback/business/partner/im"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
) )

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

@@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"strings" "strings"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im" "git.rosy.net.cn/jx-callback/business/partner/im"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"

18
business/partner/purchase/mtwm/order.go
View File

@@ -9,6 +9,8 @@ import (
"strings" "strings"
"time" "time"
"git.rosy.net.cn/baseapi/platformapi/mtpsapi"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/jxutils"
@@ -396,14 +398,14 @@ func (c *PurchaseHandler) onOrderMsg(msg *mtwmapi.CallbackMsg) (response *mtwmap
} }
}) })
// 美团订单完成时,获取跑腿费用 // 美团订单完成时,获取跑腿费用
if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil { //if fee, feeErr := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order); feeErr != nil {
bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM) // bill, err := partner.CurOrderManager.LoadWaybill(order.VendorOrderID, model.VendorIDMTWM)
if bill == nil && err == nil { // if bill == nil && err == nil {
bill.ActualFee = fee // bill.ActualFee = fee
bill.DesiredFee = fee // bill.DesiredFee = fee
dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee") // dao.UpdateEntity(dao.GetDB(), bill, "ActualFee", "DesiredFee")
} // }
} //}
} }
} }

7
business/partner/purchase/mtwm/store.go
View File

@@ -4,6 +4,10 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"math"
"regexp"
"strings"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/baseapi/utils/errlist"
@@ -17,9 +21,6 @@ import (
"git.rosy.net.cn/jx-callback/business/partner" "git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals" "git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/jx-callback/globals/api"
"math"
"regexp"
"strings"
) )
var ( var (

10
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -524,10 +524,16 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na
} }
if v.AttrID == mtwmapi.SpecialAttrBrand || v.AttrID == mtwmapi.SpecialAttrProducer { //单独获取特殊属性 if v.AttrID == mtwmapi.SpecialAttrBrand || v.AttrID == mtwmapi.SpecialAttrProducer { //单独获取特殊属性
if data, err1 := apiObj.CategoryAttrValueList(utils.Str2Int64(v.AttrID), name); err1 == nil && len(data) > 0 { if data, err1 := apiObj.CategoryAttrValueList(utils.Str2Int64(v.AttrID), name); err1 == nil && len(data) > 0 {
if len(data) > 0 {
attrValue.ValueList = []ValueList{{ //默认取推荐第一个 attrValue.ValueList = []ValueList{{ //默认取推荐第一个
ValueID: utils.Str2Int(data[0].ValueID), ValueID: utils.Str2Int(data[0].ValueID),
Value: data[0].Value, Value: data[0].Value,
}} }}
} else {
attrValue.ValueList = []ValueList{{ //兜底处理
Value: "其他",
}}
}
} }
} else { } else {
if len(v.ValueList) > 0 { if len(v.ValueList) > 0 {
@@ -535,6 +541,10 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na
ValueID: utils.Str2Int(v.ValueList[0].ValueID), ValueID: utils.Str2Int(v.ValueList[0].ValueID),
Value: v.ValueList[0].Value, Value: v.ValueList[0].Value,
}} }}
} else { //兜底处理
attrValue.ValueList = []ValueList{{
Value: "其他",
}}
} }
} }
attrValues = append(attrValues, attrValue) attrValues = append(attrValues, attrValue)

12
business/partner/purchase/mtwm/waybill.go
View File

@@ -55,12 +55,12 @@ func (c *PurchaseHandler) callbackMsg2Waybill(msg *mtwmapi.CallbackMsg) (retVal
retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp"))) retVal.StatusTime = getTimeFromTimestamp(utils.Str2Int64(msg.FormData.Get("timestamp")))
} }
order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM) //order, err := partner.CurOrderManager.LoadOrder(orderID, model.VendorIDMTWM)
if err == nil && order != nil { //if err == nil && order != nil {
fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order) // fee, _ := partner.GetPurchasePlatformFromVendorID(order.VendorID).GetPlatformLogisticsFee(order)
retVal.ActualFee = fee // retVal.ActualFee = fee
retVal.DesiredFee = fee // retVal.DesiredFee = fee
} //}
return retVal return retVal
} }

17
controllers/im.go
View File

@@ -5,9 +5,11 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"git.rosy.net.cn/jx-callback/globals/api" "git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/business/partner/purchase/im" "git.rosy.net.cn/jx-callback/business/partner/im"
"github.com/astaxie/beego/server/web" "github.com/astaxie/beego/server/web"
) )
@@ -69,6 +71,7 @@ func (c *IMController) SetImMsgRead() {
// @Title 向平台商发送信息(https方式) // @Title 向平台商发送信息(https方式)
// @Description 向平台商发送信息(https方式) // @Description 向平台商发送信息(https方式)
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param vendorOrgCode formData string true "美团appid"
// @Param sendData formData string true "平台商消息结构体" // @Param sendData formData string true "平台商消息结构体"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
@@ -80,7 +83,7 @@ func (c *IMController) SendToVendorV2() {
decoder := json.NewDecoder(b) decoder := json.NewDecoder(b)
if err = decoder.Decode(&sendData); err == nil { if err = decoder.Decode(&sendData); err == nil {
fmt.Println(sendData) fmt.Println(sendData)
if err = im.SendVendorV2(sendData); err != nil { if err = im.SendVendorV2(sendData, params.VendorOrgCode); err != nil {
return nil, "", err return nil, "", err
} }
} }
@@ -92,12 +95,14 @@ func (c *IMController) SendToVendorV2() {
// @Description 查询美团门店IM单聊开关状态 // @Description 查询美团门店IM单聊开关状态
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param appPoiCode query string true "美团门店id" // @Param appPoiCode query string true "美团门店id"
// @Param vendorOrgCode query string true "美团appid"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /GetPoiIMStatus [get] // @router /GetPoiIMStatus [get]
func (c *IMController) GetPoiIMStatus() { func (c *IMController) GetPoiIMStatus() {
c.callGetPoiIMStatus(func(params *tImGetPoiIMStatusParams) (interface{}, string, error) { c.callGetPoiIMStatus(func(params *tImGetPoiIMStatusParams) (interface{}, string, error) {
retVal, err := api.MtwmAPI.GetPoiIMStatus(params.AppPoiCode) //retVal, err := api.MtwmAPI.GetPoiIMStatus(params.AppPoiCode)
retVal, err := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, params.VendorOrgCode).(*mtwmapi.API).GetPoiIMStatus(params.AppPoiCode)
return retVal, "", err return retVal, "", err
}) })
} }
@@ -107,12 +112,14 @@ func (c *IMController) GetPoiIMStatus() {
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param appPoiCode formData string true "美团门店id" // @Param appPoiCode formData string true "美团门店id"
// @Param imStatus formData int true "状态 0-关闭 1-开启" // @Param imStatus formData int true "状态 0-关闭 1-开启"
// @Param vendorOrgCode formData string true "美团appid"
// @Success 200 {object} controllers.CallResult // @Success 200 {object} controllers.CallResult
// @Failure 200 {object} controllers.CallResult // @Failure 200 {object} controllers.CallResult
// @router /SetPoiIMStatus [post] // @router /SetPoiIMStatus [post]
func (c *IMController) SetPoiIMStatus() { func (c *IMController) SetPoiIMStatus() {
c.callSetPoiIMStatus(func(params *tImSetPoiIMStatusParams) (interface{}, string, error) { c.callSetPoiIMStatus(func(params *tImSetPoiIMStatusParams) (interface{}, string, error) {
err := api.MtwmAPI.SetPoiIMStatus(params.AppPoiCode, params.ImStatus) //err := api.MtwmAPI.SetPoiIMStatus(params.AppPoiCode, params.ImStatus)
err := partner.CurAPIManager.GetAPI(model.VendorIDMTWM, params.VendorOrgCode).(*mtwmapi.API).SetPoiIMStatus(params.AppPoiCode, params.ImStatus)
return nil, "", err return nil, "", err
}) })
} }