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

1

Browse Source
This commit is contained in:
邹宗楠
2025-01-06 17:19:11 +08:00
parent c73357624e
commit 99f91b24d3
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/sku.go
View File

@@ -3542,12 +3542,12 @@ func GetSkuNamesNew(ctx *jxcontext.Context, keyword string, skuIDs, skuNameIDs [
t2.id sku_id
FROM sku_name t1
LEFT JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?
LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code IN (?,?,?) AND t3.deleted_at = ?
LEFT JOIN thing_map t3 ON t3.thing_id = t2.id AND t3.thing_type = ? AND t3.vendor_org_code = ? AND t3.deleted_at = ?
WHERE t1.deleted_at = ?
`
}
sqlParams := []interface{}{
utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", "390558", "339032", utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue, model.ThingTypeSku, "320406", utils.DefaultTimeValue,
}
if keyword != "" {
keywordLike := "%" + keyword + "%"

12
controllers/mtwm_callback.go
View File

@@ -3,11 +3,9 @@ package controllers
import (
"encoding/json"
"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
"git.rosy.net.cn/baseapi/utils"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/dao"
"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"github.com/astaxie/beego/server/web"
"io/ioutil"
@@ -23,9 +21,6 @@ type MtwmController struct {
func (c *MtwmController) onCallbackMsg(msgType string) {
msg, callbackResponse := api.MtwmAPI.GetCallbackMsg(c.Ctx.Request)
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
globals.SugarLogger.Debugf("------mtmsg := %s", utils.Format4Output(msg, false))
}
if callbackResponse == nil {
vendorStoreId := msg.FormData.Get("app_poi_code")
if vendorStoreId == "" {
@@ -55,14 +50,7 @@ func (c *MtwmController) onCallbackMsg(msgType string) {
}
}
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
globals.SugarLogger.Debugf("------msg := %s", utils.Format4Output(msg, false))
globals.SugarLogger.Debugf("------msgType := %s", utils.Format4Output(msgType, false))
}
callbackResponse = mtwm.OnCallbackMsg(msg, msgType)
if msg.FormData.Get("app_poi_code") == "25791090" && (web.BConfig.RunMode == model.ServerTypeFruits || web.BConfig.RunMode == model.ServerTypePet) {
globals.SugarLogger.Debugf("------callbackResponse := %s", utils.Format4Output(callbackResponse, false))
}
if callbackResponse == nil {
callbackResponse = mtwmapi.Err2CallbackResponse(nil, "")
}