京东门店修改日志+京东门店自送骑手同步+三方门店商品对比

business/partner/purchase/jd/callback.go

@@ -2,6 +2,8 @@ package jd
 
 import (
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
+	"git.rosy.net.cn/baseapi/utils"
+	"git.rosy.net.cn/jx-callback/globals"
 )
 
 func OnOrderMsg(msg *jdapi.CallbackOrderMsg, a *jdapi.API) (retVal *jdapi.CallbackResponse) {
@@ -20,7 +22,9 @@ func OnWaybillMsg(msg *jdapi.CallbackDeliveryStatusMsg) (retVal *jdapi.CallbackR
 
 func OnStoreMsg(msg *jdapi.CallbackOrderMsg) (retVal *jdapi.CallbackResponse) {
 	if CurPurchaseHandler != nil {
+		globals.SugarLogger.Debugf("==========msg := %s", utils.Format4Output(msg, false))
 		retVal = CurPurchaseHandler.OnStoreMsg(AppKey2OrgCode(msg.AppKey), msg)
+		globals.SugarLogger.Debugf("==========retVal := %s", utils.Format4Output(retVal, false))
 	}
 	return retVal
 }

business/partner/purchase/jd/jd.go

@@ -2,6 +2,7 @@ package jd
 
 import (
 	"encoding/json"
+	"git.rosy.net.cn/baseapi/utils"
 	"net/url"
 
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -179,5 +180,52 @@ func OnTokenChange(values url.Values) {
 }
 
 func (p *PurchaseHandler) GetOrderRider(vendorOrgCode, vendorStoreID string, param map[string]interface{}) (err error) {
+	logisticInfo := jdapi.ReceiveLogisticInfo{
+		OrderId:          param["order_id"].(string),
+		DeliveryInfoList: nil,
+	}
+	deliveryInfoList := make([]jdapi.DeliveryInfo, 0, 0)
+	deliverInfo := jdapi.DeliveryInfo{
+		DeliveryManName:  "暂无",
+		DeliveryManPhone: "",
+
+		DeliveryCarrierNo:      "9966", // 暂时未获取到写死
+		DeliveryCarrierName:    "达达配送", // 暂时未获取到写死
+		DeliveryCarrierOrderNo: param["order_id"].(string),
+
+		FailReason:  "",
+		OperateTime: utils.GetCurTimeStr(),
+		Operator:    jxcontext.AdminCtx.GetUserName(),
+	}
+	switch param["logistics_status"].(int) {
+	case 0:
+		deliverInfo.DeliveryStatus = jdapi.JdDeliveryStatusNew
+	case 10:
+		// 接单、更换骑手、骑手到店、骑手取货 都需要填加：骑手姓名和电话
+		deliverInfo.DeliveryStatus = jdapi.JdDeliveryStatusRiderTaking
+		deliverInfo.DeliveryManName = param["courier_name"].(string)
+		deliverInfo.DeliveryManPhone = param["courier_phone"].(string)
+	case 15:
+		deliverInfo.DeliveryStatus = jdapi.JdDeliveryStatusToStore
+		deliverInfo.DeliveryManName = param["courier_name"].(string)
+		deliverInfo.DeliveryManPhone = param["courier_phone"].(string)
+	case 20:
+		deliverInfo.DeliveryStatus = jdapi.JdDeliveryStatusDelivering
+		deliverInfo.DeliveryManName = param["courier_name"].(string)
+		deliverInfo.DeliveryManPhone = param["courier_phone"].(string)
+	case 40:
+		// 完成和取消状态不通过此接口发送通知消息
+		return nil
+	case 100:
+		// 完成和取消状态不通过此接口发送通知消息
+		return nil
+	case 22:
+		deliverInfo.DeliveryStatus = jdapi.JdDeliveryStatusFail
+	}
+
+	deliveryInfoList = append(deliveryInfoList, deliverInfo)
+	logisticInfo.DeliveryInfoList = deliveryInfoList
+
+	getAPI(vendorOrgCode).ReceiveLogisticInfoForOpenApiPlatform(logisticInfo)
 	return nil
 }

business/partner/purchase/jd/store.go

@@ -350,9 +350,6 @@ func (c *PurchaseHandler) OnStoreMsg(vendorOrgCode string, msg *jdapi.CallbackOr
 			}
 		}
 	}
-	if err != nil {
-		globals.SugarLogger.Debugf("OnStoreMsg==============%v", err)
-	}
 	return jdapi.Err2CallbackResponse(err, "")
 }