From 777ce0a0363c50d2178fdf493ded58a1bd7fd642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 12 Apr 2021 11:52:51 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jd/order.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/business/partner/purchase/jd/order.go b/business/partner/purchase/jd/order.go
index 056acd813..087241234 100644
--- a/business/partner/purchase/jd/order.go
+++ b/business/partner/purchase/jd/order.go
@@ -60,10 +60,15 @@ var (
 )
 
 func (c *PurchaseHandler) OnOrderMsg(a *jdapi.API, msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
+	primaryID := msg.BillID
+	if code, err := dao.GetVendorOrgCodeByKey(dao.GetDB(), model.VendorIDJD, a.GetAppKey()); err == nil && code != nil {
+		primaryID += code.VendorOrgCode
+	}
+	// primaryID += msg.BillID
 	jxutils.CallMsgHandler(func() {
 		globals.SugarLogger.Debugf("jd deliverOrder 3.7 ")
 		retVal = c.onOrderMsg(a, msg)
-	}, jxutils.ComposeUniversalOrderID(msg.BillID, model.VendorIDJD))
+	}, primaryID)
 	return retVal
 }