1

platformapi/jdapi/jdapi_test.go

@@ -35,7 +35,7 @@ func init() {
 	// 381564
 	//api = New("8d9e4443-3536-41ae-b6c7-677f90f1978b", "d2d1e2e3213d4320bc2712a684307831", "1750f5b9848d4a6492c1c20b487074da")
 	// 384633
-	api = New("02a3f772-89f3-46f1-bbd5-74be346cba54", "e496a0f9b88a407297fea283b8dc9e29", "9bb82ffbec144c4b8fc8d627e5ca6a35")
+	///api = New("02a3f772-89f3-46f1-bbd5-74be346cba54", "e496a0f9b88a407297fea283b8dc9e29", "9bb82ffbec144c4b8fc8d627e5ca6a35")
 
 	// 京东超市 359459
 	//api = New("21ff22c5-0716-4c05-9468-8e4dde2b1cd6", "21b627c23ea04c69b64b48d0b361213e", "51cd27a748e64c829b4b7f83f4844610")

platformapi/jdapi/order.go

@@ -830,3 +830,39 @@ func (a *API) ComplaintDadaDeliver(orderID string, resonID int) (err error) {
 	_, err = a.AccessAPINoPage("order/complaintDadaDeliverForPlatForm", jdParams, nil, nil, nullResultParser)
 	return err
 }
+
+// ReceiveLogisticInfoForOpenApiPlatform 京东商家自配送同步骑手状态
+// https://opendj.jd.com/staticnew/widgets/resources.html?groupid=169&apiid=e6feb2ab829e4aa7963bacd04d9434b2
+func (a *API) ReceiveLogisticInfoForOpenApiPlatform(parma ReceiveLogisticInfo) (err error) {
+	jdParams := utils.Struct2Map(parma, "", false)
+	_, err = a.AccessAPINoPage("ThirdPartyLogisticsService/receiveLogisticInfosForOpenApiPlatform", jdParams, nil, nil, nullResultParser)
+	return err
+}
+
+// ReceiveLogisticInfo 自配送骑手状态通知
+type ReceiveLogisticInfo struct {
+	OrderId          string         `json:"orderId"`          // 到家订单号
+	DeliveryInfoList []DeliveryInfo `json:"deliveryInfoList"` // 物流配送信息，仅支持传入单个元素，如传入多个元素底层服务获取第一个
+}
+
+// DeliveryInfo 物流配送信息，仅支持传入单个元素，如传入多个元素底层服务获取第一个
+type DeliveryInfo struct {
+	DeliveryStatus         string `json:"deliveryStatus"`         // 配送状态，10010-待接单，10020-配送员接单，10022-更换配送员，10023-配送员已到店，10025-取货失败，10030-配送员已取货【接单、更换骑手、骑手到店、骑手取货 都需要填加：骑手姓名和电话】
+	DeliveryManName        string `json:"deliveryManName"`        // 配送员姓名
+	DeliveryManPhone       string `json:"deliveryManPhone"`       // 配送员手机号
+	DeliveryCarrierNo      string `json:"deliveryCarrierNo"`      // 承运商编号
+	DeliveryCarrierOrderNo string `json:"deliveryCarrierOrderNo"` // 运单号
+	DeliveryCarrierName    string `json:"deliveryCarrierName"`    // 承运商名称
+	FailReason             string `json:"failReason"`             // 失败原因
+	OperateTime            string `json:"operateTime"`            // 操作时间格式【yyy-MM-dd HH:mm:ss】
+	Operator               string `json:"operator"`               // 操作人
+}
+
+const (
+	JdDeliveryStatusNew         = "10010" // 待接单
+	JdDeliveryStatusRiderTaking = "10020" // 接单
+	JdDeliveryStatusChangeRider = "10022" // 更换配送员
+	JdDeliveryStatusToStore     = "10023" // 到店
+	JdDeliveryStatusFail        = "10025" // 取货失败
+	JdDeliveryStatusDelivering  = "10030" // 配送中
+)

platformapi/jdapi/order_test.go

@@ -147,7 +147,7 @@ func TestOrderQuery2(t *testing.T) {
 }
 
 func TestGetByOrderNoForOaos(t *testing.T) {
-	orderList, err := api.GetByOrderNoForOaos("2320085686000392")
+	orderList, err := api.GetByOrderNoForOaos("2407496361004521")
 	t.Log(utils.Format4Output(orderList, false))
 	if err != nil {
 		t.Fatal(err.Error())

platformapi/mtwmapi/mtwmapi_test.go

@@ -26,7 +26,7 @@ func init() {
 	//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")
 
 	//商超
-	api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_tpzEJ-tqm6pxzVtD_t5L0g") //token_n4TwqCntWWuvQwAawzxC0w
+	api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_n5zAb432R4VRR6GB1CNCuA") //token_n4TwqCntWWuvQwAawzxC0w
 	cookieStr := `
 		acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1;
 	`

platformapi/mtwmapi/retail.go

@@ -251,8 +251,8 @@ func (a *API) RetailList(poiCode string, offset, limit int) (foodList []*AppFood
 
 func (a *API) RetailListAll(poiCode string, offset int) (foodList []*AppFood, err error) {
 	data := make([]*AppFood, 0, 0)
-	offset = offset * GeneralMaxLimit
+	offset = offset * 1
-	batchList, err2 := a.RetailList(poiCode, offset, GeneralMaxLimit) // GeneralMaxLimit
+	batchList, err2 := a.RetailList(poiCode, offset, 1) // GeneralMaxLimit
 	if err = err2; err == nil {
 		data = append(data, batchList...)
 	}

platformapi/mtwmapi/retail_test.go

@@ -132,9 +132,9 @@ func TestRetailListCase(t *testing.T) {
 			if err := json.Unmarshal([]byte(result.Skus), &nowSkus); err != nil {
 				return
 			}
-			for _, ns := range nowSkus {
+			//for _, ns := range nowSkus {
-				ns.Price = fmt.Sprintf("%.2f", utils.Str2Float64(ns.Price)+utils.Str2Float64(ns.Price)*0.1)
+			//	//ns.Price = fmt.Sprintf("%.2f", utils.Str2Float64(ns.Price)+utils.Str2Float64(ns.Price)*0.1)
-			}
+			//}
 			time.Sleep(time.Millisecond * 200)
 			skuInfo.Skus = nowSkus
 			if skuInfo.Skus[0].SkuID == "" || len(skuInfo.Skus) == 0 {
@@ -249,21 +249,34 @@ func TestRetailDelete(t *testing.T) {
 				Skus: []*BareStoreSkuInfo{
 					&BareStoreSkuInfo{
 						SkuID: fl.AppFoodCode,
-						Stock: "999999",
+						Stock: "99999",
 					},
 				},
 			})
 		}
 		i++
 
-		result, err := api.RetailSkuStock(utils.GetUUID(), testPoiCode, stockList)
+		result, err := api.RetailSkuStock(utils.GetUUID(), poiCode, stockList)
 		globals.SugarLogger.Debugf("===result :-%s", utils.Format4Output(result, false))
 		globals.SugarLogger.Debugf("===result :-%v", err)
 	}
 }
 
 func TestMap(t *testing.T) {
-	fmt.Println(16&4 != 0)
+	poiCode := "20802261"
+	stockList := make([]*BareStoreFoodInfo, 0, 100)
+	stockList = append(stockList, &BareStoreFoodInfo{
+		AppFoodCode: "mtcode_1772876609364365327",
+		Skus: []*BareStoreSkuInfo{
+			&BareStoreSkuInfo{
+				SkuID: "21761610084",
+				Stock: "99999",
+			},
+		},
+	})
+	result, err := api.RetailSkuStock(utils.GetUUID(), poiCode, stockList)
+	globals.SugarLogger.Debugf("===result :-%s", utils.Format4Output(result, false))
+	globals.SugarLogger.Debugf("===result :-%v", err)
 }
 
 func TestRetailDat(t *testing.T) {
@@ -365,7 +378,7 @@ func TestRetailSkuStock(t *testing.T) {
 			Skus: []*BareStoreSkuInfo{
 				&BareStoreSkuInfo{
 					SkuID: "2212",
-					Price: "1.2",
+					//Price: "1.2",
 					Stock: "123",
 				},
 			},
@@ -393,7 +406,7 @@ func TestRetailSkuSellStatus(t *testing.T) {
 			Skus: []*BareStoreSkuInfo{
 				&BareStoreSkuInfo{
 					SkuID: "23841",
-					Price: "1.2",
+					//Price: "1.2",
 					Stock: "123",
 				},
 			},