京东商城定时达订单

platformapi/dadaapi/dadaapi_test.go

@@ -26,10 +26,10 @@ func init() {
 	baseapi.Init(sugarLogger)
 
 	// sandbox
-	dadaapi = New("dada9623324449cd250", "30c2abbfe8a8780ad5aace46300c64b9", "73753", "http://callback.jxc4.com/dada/order", false)
+	// dadaapi = New("dada9623324449cd250", "30c2abbfe8a8780ad5aace46300c64b9", "73753", "http://callback.jxc4.com/dada/order", false)
 
 	// prod
-	// dadaapi = New("dada147f7a190ce7b3c", "2c717ad914767d6e2beb3f743db9e477", "6660", "http://callback.jxc4.com/dada/order", true)
+	dadaapi = New("dada147f7a190ce7b3c", "2c717ad914767d6e2beb3f743db9e477", "6660", "http://callback.jxc4.com/dada/order", true)
 
 	// prod
 	testOrder = &OperateOrderParams{

platformapi/dadaapi/order_test.go

@@ -40,7 +40,7 @@ func TestAddOrderAfterQuery(t *testing.T) {
 }
 
 func TestCancel(t *testing.T) {
-	cancelResponse, err := dadaapi.CancelOrder("91BBFE1626E011EAA059186590E02977", ReasonIDOther, "test")
+	cancelResponse, err := dadaapi.CancelOrder("124651497574002", ReasonIDOther, "test")
 	if err != nil {
 		t.Fatal(err)
 	}

platformapi/jdapi/jdapi_test.go

@@ -21,9 +21,9 @@ func init() {
 	baseapi.Init(sugarLogger)
 
 	// sandbox
-	api = New("594ab45a-9a73-4a43-82b0-a64cbd55d883", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84")
+	// api = New("594ab45a-9a73-4a43-82b0-a64cbd55d883", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84")
 	// prod
-	// api = New("77e703b7-7997-441b-a12a-2e522efb117a", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
+	api = New("77e703b7-7997-441b-a12a-2e522efb117a", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
 	// 天天果园
 	// api = New("84541069-fbe2-424b-b625-9b2ba1d4c9e6", "5d5577a2506f41b8b4ec520ba83490f5", "0b01b9eeb15b41dab1c3d05d95c17a26")
 

platformapi/jdapi/promotion_sku_test.go

@@ -35,6 +35,13 @@ func TestCreatePromotionSingle(t *testing.T) {
 	}
 }
 
+func TestConfirmPromotionSingle(t *testing.T) {
+	err := api.ConfirmPromotionSingle(326890763, "", "")
+	if err != nil {
+		t.Fatal(err)
+	}
+}
+
 func TestCreatePromotionLimitTime(t *testing.T) {
 	infoId, err := api.CreatePromotionInfosLimitTime("测试1", time.Now(), time.Now().Add(24*time.Hour), "", "", "")
 	if err != nil {
@@ -78,7 +85,7 @@ func TestCreatePromotionSkuLimitTime(t *testing.T) {
 }
 
 func TestCancelPromotion(t *testing.T) {
-	err := api.CancelPromotionSingle(334831149, "", utils.GetUUID())
+	err := api.CancelPromotionSingle(334829148, "", utils.GetUUID())
 	if err != nil {
 		t.Fatal(err)
 	}

platformapi/jdshopapi/store_page.go

@@ -421,7 +421,7 @@ func (a *API) OrderDetail(orderId string) (orderDetailResult *OrderDetailResult,
 			}
 		}
 		if len(expectedDeliveredTime) > 0 {
-			orderDetailResult.ExpectedDeliveredTime = expectedDeliveredTime[1][:strings.LastIndex(expectedDeliveredTime[1], "-")] + ":00"
+			orderDetailResult.ExpectedDeliveredTime = expectedDeliveredTime[1][strings.LastIndex(expectedDeliveredTime[1], "-")+1:] + ":00"
 		} else {
 			expectedDeliveredTime2 := regexpOrderDetailDay2.FindStringSubmatch(body)
 			if len(expectedDeliveredTime2) > 0 {

platformapi/jdshopapi/store_page_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"strings"
 	"testing"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -59,9 +60,9 @@ func Test11(t *testing.T) {
 
 func TestAllOrders(t *testing.T) {
 	result, err := api.AllOrders(&AllOrdersParam{
-		Current:              1,
-		PageSize:             999,
-		OrderCreateDateRange: []string{"2020-06-17 00:00:00", "2020-06-17 23:59:59"},
+		Current:  1,
+		PageSize: 1,
+		OrderID:  "118793082128",
 	})
 	if err != nil {
 		t.Fatal(err)
@@ -102,8 +103,8 @@ func TestTryGetCookie(t *testing.T) {
 }
 
 func TestAAADS(t *testing.T) {
-	//c5MSDWxbgDc698slnUlR1w==
-	fmt.Println(DecryptDESECB([]byte("Av3VLNsKfmmGw70Wiw7Qdw=="), []byte(JdsMobileKey)))
+	str := "16:00-17:00"
+	fmt.Println(str[strings.LastIndex(str, "-")+1:])
 }
 
 func DecryptDESECB(d, key []byte) string {