From 2fc5eeaa193618435ce2ac550af92f9f4716ce18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Tue, 16 Dec 2025 15:53:03 +0800
Subject: [PATCH] =?UTF-8?q?jdim=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/im/im.go  | 21 ++++++++++++++-------
 controllers/jd_callback.go | 12 +++++++-----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/business/partner/im/im.go b/business/partner/im/im.go
index f8b090623..41f6d67b9 100644
--- a/business/partner/im/im.go
+++ b/business/partner/im/im.go
@@ -311,10 +311,16 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
 		}
 		vendorStoreID = ElmData.PlatformShopID
 	case model.VendorIDJD:
-		var risMsg *jdapi.ChatRisMsgCallback
+		var risMsg *jdapi.JdParamJsonObj
 		if err = utils.UnmarshalUseNumber(msg, &risMsg); err != nil {
 			return err
 		}
+		globals.SugarLogger.Debugf("-----rismsg := %s", utils.Format4Output(risMsg, false))
+		storeDetail, err := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), risMsg.StoreId, model.VendorIDJD, "")
+		if err != nil {
+			return err
+		}
+		risMsg.BillId = storeDetail.VendorOrgCode
 		jxMsg = &JXMsg{
 			SendType:   SendTypeJd,
 			MsgContent: &risMsg,
@@ -339,7 +345,9 @@ func ReadMsgFromVendor(vendorID int, elmAppID string, msg []byte) error {
 			userList.UserID = readMsg.From.Pin
 			userList.LatestTime = int(userMsg.Timestamp)
 		}
-		vendorStoreID = risMsg.StationId
+		vendorStoreID = risMsg.StoreId
+
+		return fmt.Errorf("咱暂不存储")
 	}
 
 	//1 存储详细聊天记录list
@@ -462,7 +470,6 @@ func GetNewAndTrim(key string, flag string) (cnt int, err error) {
 
 // GenMsgDetailID 生成查询详细聊天记录ID
 func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
-	//globals.SugarLogger.Debugf("GenMsgDetailID test0124 jxMsg=%s", utils.Format4Output(jxMsg, false))
 	if jxMsg == nil {
 		return ""
 	}
@@ -480,8 +487,8 @@ func GenMsgDetailID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string)
 		//msgID = elmAppID + ":" + d2.PlatformShopID + ":3:" + d2.PayLoad.GroupID
 		msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3:" + ElmData.PayLoad.GroupID
 	case model.VendorIDJD:
-		var data = jxMsg.MsgContent.(*jdapi.ChatRisMsgCallback)
-		msgID = data.VenderId + ":" + data.StationId + ":0:"
+		var data = jxMsg.MsgContent.(*jdapi.JdParamJsonObj)
+		msgID = data.BillId + ":" + data.StoreId + ":0:"
 		systemMsg, userMsg, readMsg, _ := jdapi.ImMsgChange(data, elmAppID)
 		switch elmAppID {
 		case jdapi.ImCallbackRisMsg:
@@ -510,8 +517,8 @@ func GenMsgListID(jxMsg *JXMsg, vendorID int, elmAppID string) (msgID string) {
 		json.Unmarshal(tempMsgContent, &ElmData)
 		msgID = elmAppID + ":" + ElmData.PlatformShopID + ":3"
 	case model.VendorIDJD:
-		var data = jxMsg.MsgContent.(*jdapi.ChatRisMsgCallback)
-		msgID = data.VenderId + ":" + data.StationId + ":0"
+		var data = jxMsg.MsgContent.(*jdapi.JdParamJsonObj)
+		msgID = data.BillId + ":" + data.StoreId + ":0"
 	}
 
 	return msgID
diff --git a/controllers/jd_callback.go b/controllers/jd_callback.go
index 89d304f8b..0f4f88377 100644
--- a/controllers/jd_callback.go
+++ b/controllers/jd_callback.go
@@ -249,15 +249,17 @@ func (c *DjswController) OrderInvoice() {
 func (c *DjswController) imMsg() {
 	if c.Ctx.Input.Method() == http.MethodPost {
 		var callbackResponse *jdapi.CallbackResponse
-
 		msg, url, err := jdapi.ImChatRiskMsg(getUsefulRequest(c.Ctx))
 		if err != nil {
 			callbackResponse = jdapi.Err2CallbackResponse(err, "")
 		} else {
-			globals.SugarLogger.Debugf("-----url := %s", url)
-			globals.SugarLogger.Debugf("-----msg := %s", string(msg))
-			callbackResponse = jdapi.Err2CallbackResponse(im.ReadMsgFromVendor(model.VendorIDJD, url, msg), "")
-			callbackResponse = jdapi.Err2CallbackResponse(nil, "")
+			var base *jdapi.BaseInfo
+			if utils.Map2StructByJson(msg, &base, false); err == nil {
+				globals.SugarLogger.Debugf("-----url := %s", url)
+				globals.SugarLogger.Debugf("-----msg := %s", utils.Format4Output(msg, false))
+				callbackResponse = jdapi.Err2CallbackResponse(im.ReadMsgFromVendor(model.VendorIDJD, url, []byte(base.JdParamJson)), "")
+				callbackResponse = jdapi.Err2CallbackResponse(nil, "")
+			}
 		}
 		c.Data["json"] = c.transferResponse("orderStatus", callbackResponse)
 		c.ServeJSON()