diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go index 21f3a4bcc..89d431fe4 100644 --- a/business/partner/purchase/mtwm/store_sku2.go +++ b/business/partner/purchase/mtwm/store_sku2.go @@ -500,13 +500,13 @@ func SwitchAttr(apiObj *mtwmapi.API, vendorStoreID string, vendorCatID int64, na attrValue CommonAttrValue attrValues []CommonAttrValue ) - //if nameID != 0 { //是否为纯创建 - // if tData, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil && len(tData) > 0 { - // if tData[0].MtAttribute != "[]" && tData[0].MtAttribute != "{}" && tData[0].MtAttribute != "" { - // return tData[0].MtAttribute - // } - // } - //} + if nameID != 0 { //是否为纯创建 + if tData, err := dao.GetSkuNames(db, []int{nameID}, nil, "", false); err == nil && len(tData) > 0 { + if tData[0].MtAttribute != "[]" && tData[0].MtAttribute != "{}" && tData[0].MtAttribute != "" { + return tData[0].MtAttribute + } + } + } if vendorCatID == 0 { //创建商品时无分类,使用推荐分类 if comTag, err := apiObj.RetailRecommendTag(name, vendorStoreID, 0, mtwmapi.TypeCategory); err == nil && comTag.TagID != 0 { tempCatID = int64(comTag.TagID) diff --git a/controllers/im.go b/controllers/im.go index a84099571..171fe14ca 100644 --- a/controllers/im.go +++ b/controllers/im.go @@ -5,6 +5,8 @@ import ( "encoding/json" "fmt" + "git.rosy.net.cn/jx-callback/globals/api" + "git.rosy.net.cn/jx-callback/business/partner/purchase/im" "github.com/astaxie/beego/server/web" ) @@ -85,3 +87,32 @@ func (c *IMController) SendToVendorV2() { return nil, "", nil }) } + +// @Title 查询美团门店IM单聊开关状态 +// @Description 查询美团门店IM单聊开关状态 +// @Param token header string true "认证token" +// @Param appPoiCode query string true "美团门店id" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /GetPoiIMStatus [get] +func (c *IMController) GetPoiIMStatus() { + c.callGetPoiIMStatus(func(params *tImGetPoiIMStatusParams) (interface{}, string, error) { + retVal, err := api.MtwmAPI.GetPoiIMStatus(params.AppPoiCode) + return retVal, "", err + }) +} + +// @Title 设置美团门店IM线上状态 +// @Description 设置美团门店IM线上状态 +// @Param token header string true "认证token" +// @Param appPoiCode formData string true "美团门店id" +// @Param imStatus formData int true "状态 0-关闭 1-开启" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /SetPoiIMStatus [post] +func (c *IMController) SetPoiIMStatus() { + c.callSetPoiIMStatus(func(params *tImSetPoiIMStatusParams) (interface{}, string, error) { + err := api.MtwmAPI.SetPoiIMStatus(params.AppPoiCode, params.ImStatus) + return nil, "", err + }) +} diff --git a/routers/commentsRouter_controllers.go b/routers/commentsRouter_controllers.go index 251fec840..85be64edd 100644 --- a/routers/commentsRouter_controllers.go +++ b/routers/commentsRouter_controllers.go @@ -4463,7 +4463,22 @@ func init() { MethodParams: param.Make(), Filters: nil, Params: nil}) - + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], + web.ControllerComments{ + Method: "GetPoiIMStatus", + Router: `/GetPoiIMStatus`, + AllowHTTPMethods: []string{"get"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) + web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:IMController"], + web.ControllerComments{ + Method: "SetPoiIMStatus", + Router: `/SetPoiIMStatus`, + AllowHTTPMethods: []string{"post"}, + MethodParams: param.Make(), + Filters: nil, + Params: nil}) //web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"] = append(web.GlobalControllerRouter["git.rosy.net.cn/jx-callback/controllers:FnController"], // web.ControllerComments{ // Method: "FnStore",