This commit is contained in:
邹宗楠
2025-12-18 09:33:16 +08:00
parent aa0e94ac6e
commit 422ff821f1
13 changed files with 69360 additions and 69319 deletions

View File

@@ -3,6 +3,8 @@ package controllers
import (
"bytes"
"fmt"
"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/partner/im"
"io/ioutil"
@@ -255,9 +257,9 @@ func (c *DjswController) imMsg() {
} else {
var base *jdapi.BaseInfo
if utils.UnmarshalUseNumber(msg, &base); err == nil {
globals.SugarLogger.Debugf("-----url := %s", url)
globals.SugarLogger.Debugf("-----msg := %s", string(msg))
globals.SugarLogger.Debugf("-----base := %s", utils.Format4Output(base, false))
if url == "msgReadAck" || url == "chatRiskMsg" {
ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "2452A93EEB9111EC9B06525400E86DC0", fmt.Sprintf("jdIm:%s消息推送", url), utils.Format4Output(msg, false))
}
callbackResponse = jdapi.Err2CallbackResponse(im.ReadMsgFromVendor(model.VendorIDJD, url, []byte(base.JdParamJson)), "")
callbackResponse = jdapi.Err2CallbackResponse(nil, "")
}

View File

@@ -1,15 +0,0 @@
package controllers
import (
"git.rosy.net.cn/baseapi/platformapi/jdapi"
"git.rosy.net.cn/baseapi/utils"
"testing"
)
func TestName(t *testing.T) {
msg := `{"app_key":"1dba76d40cac446ca500c0391a0b6c9d","format":"json","jd_param_json":"{\"statusId\":\"\",\"billId\":\"\",\"extendJsonData\":\"{\\\"ver\\\":\\\"4.2\\\",\\\"fromChannelId\\\":-1,\\\"mid\\\":376841420,\\\"body\\\":{\\\"chatinfo\\\":{\\\"venderId\\\":\\\"store_10352814_1000051632\\\",\\\"isJdSuperMarket\\\":\\\"0\\\",\\\"source\\\":\\\"jimitwo_service_smart_sdk\\\",\\\"deviceNo\\\":\\\"dd_dvc_aes_73FF2098F02392E999FE00A26817AE212E55DF89C9D405370B4B09A908F3A355\\\",\\\"label\\\":1,\\\"IMService\\\":false,\\\"storeId\\\":\\\"1000051632\\\",\\\"distinguishPersonJimi\\\":2,\\\"proVer\\\":\\\"smart_android_15.2.90\\\",\\\"sid\\\":\\\"9ec16e789610328114db937025384666\\\",\\\"entry\\\":\\\"sdk_recent\\\",\\\"askAllocateType\\\":\\\"multiChat\\\",\\\"leaveMsgTable\\\":1,\\\"venderName\\\":\\\"京西菜市-新都三河店\\\",\\\"askType\\\":\\\"o2o\\\",\\\"disputeId\\\":-1,\\\"ddSessionType\\\":\\\"1\\\",\\\"appId\\\":\\\"im.waiter\\\",\\\"systemVer\\\":\\\"android_12_BRA-AL00\\\",\\\"eidtoken\\\":\\\"jdd01SVZE72NCBZ6AXTRFHLIRLNUSF25PCOYF4OPNU3BOITK5SR62TUHMBIDGFBOYGQ7TWY7WRDPLHA3LP6NME42NE5IQNXASKIGJA6ULRAI01234567\\\",\\\"region\\\":\\\"CN\\\",\\\"verification\\\":\\\"slide\\\"},\\\"llmStream\\\":0,\\\"thumbnail\\\":\\\"\\\",\\\"param\\\":{\\\"$ref\\\":\\\"$.body.chatinfo\\\"},\\\"type\\\":\\\"text\\\",\\\"requestData\\\":{\\\"entry\\\":\\\"sdk_recent\\\",\\\"venderId\\\":\\\"store_10352814_1000051632\\\"},\\\"content\\\":\\\"高处不胜寒\\\",\\\"sid\\\":\\\"9ec16e789610328114db937025384666\\\"},\\\"type\\\":\\\"chat_message\\\",\\\"clientTime\\\":1765872110902,\\\"datetime\\\":1765872111084,\\\"len\\\":0,\\\"from\\\":{\\\"app\\\":\\\"im.customer\\\",\\\"art\\\":\\\"\\\",\\\"clientType\\\":\\\"android\\\",\\\"pin\\\":\\\"jd_52db6569f724f\\\"},\\\"subType\\\":\\\"text\\\",\\\"id\\\":\\\"b9fd3e9b5b194599a2d74df33c319c7b\\\",\\\"to\\\":{\\\"app\\\":\\\"im.waiter\\\",\\\"pin\\\":\\\"liyang12345ly\\\"},\\\"lang\\\":\\\"zh_CN\\\",\\\"timestamp\\\":1765872111084}\",\"storeId\":\"11998833\",\"timestamp\":\"2025-12-16 16:01:51\"}","sign":"34C4AC9FAEB277FDEA9D9CBEC18BCFDB","timestamp":"2025-12-16 16:01:51","token":"de4a9818-b171-41ed-ba37-0b060cad001f","v":"1.0"}`
var base *jdapi.BaseInfo
if err := utils.Map2StructByJson(msg, &base, false); err == nil {
}
}

View File

@@ -309,8 +309,9 @@ func (c *OrderController) ExportMTWaybills() {
// @Param toDate query string false "结束日期包含格式2006-01-02如果订单号为空此项必须要求"
// @Param isDateFinish query bool false "是否fromDate与toDate指的是订单结束日期缺省不是"
// @Param vendorIDs query string false "订单所属厂商列表[1,2,3],缺省不限制"
// @Param waybillVendorIDs query string false "承运人所属厂商列表[1,2,3],缺省不限制"
// @Param waybillVendorIDs query string false "承运人所属厂商列表[1,2,3],缺省不限制"
// @Param storeIDs query string false "京西门店ID列表[1,2,3],缺省不限制"
// @Param fromStoreIDs query string false "物料京西门店ID列表[1,2,3],缺省不限制"
// @Param statuss query string false "订单状态列表[1,2,3],缺省不限制"
// @Param lockStatuss query string false "订单锁定状态列表[1,2,3],缺省不限制"
// @Param cities query string false "城市code列表[1,2,3],缺省不限制"