Merge remote-tracking branch 'origin/mark' into yonghui

business/partner/purchase/jd/order.go

@@ -27,8 +27,8 @@ var (
 		jdapi.OrderStatusFinishedPickup: model.OrderStatusFinishedPickup,
 		jdapi.OrderStatusDelivering:     model.OrderStatusDelivering,
 		jdapi.OrderStatusDelivered:      model.OrderStatusFinished,
-		// jdapi.OrderStatusFinished:       model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思
-		jdapi.OrderStatusCanceled: model.OrderStatusCanceled,
+		jdapi.OrderStatusFinished:       model.OrderStatusFinished, // todo 这个状态不是真正都完成的意思?
+		jdapi.OrderStatusCanceled:       model.OrderStatusCanceled,
 
 		jdapi.OrderStatusAdjust:          model.OrderStatusAdjust,
 		jdapi.OrderStatusUserApplyCancel: model.OrderStatusApplyCancel,
@@ -147,6 +147,14 @@ func (c *PurchaseHandler) GetOrder(vendorOrgCode, orderID string) (order *model.
 	return order, err
 }
 
+func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
+	order, err := getAPI(vendorOrgCode).QuerySingleOrder2(vendorOrderID)
+	if err == nil {
+		status = p.getStatusFromVendorStatus(utils.Int2Str(order.OrderStatus))
+	}
+	return status, err
+}
+
 func (c *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *model.GoodsOrder) {
 	result := orderData
 	orderID := utils.Int64ToStr(utils.MustInterface2Int64(result["orderId"]))

business/partner/purchase/jd/order_test.go

@@ -32,6 +32,14 @@ func TestGetOrder(t *testing.T) {
 	}
 }
 
+func TestGetOrderStatus(t *testing.T) {
+	status, err := CurPurchaseHandler.GetOrderStatus("", "929203144000041")
+	if err != nil {
+		t.Fatal(err.Error())
+	}
+	t.Log(status)
+}
+
 func TestListOrders(t *testing.T) {
 	result, err := CurPurchaseHandler.ListOrders(jxcontext.AdminCtx, "", nil, time.Now(), "")
 	if err != nil {

business/partner/purchase/jd/sku_test.go

@@ -23,20 +23,6 @@ func TestCreateSku(t *testing.T) {
 	// }
 }
 
-func TestUpdateSku(t *testing.T) {
-	// t.Log(beego.BConfig.RunMode)
-	db := dao.GetDB()
-	skuID := 21741
-	sku := &model.Sku{}
-	sku.ID = skuID
-	dao.GetEntity(db, sku)
-
-	err := CurPurchaseHandler.UpdateSku(db, sku, "autotest")
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-}
-
 func TestGetAllCategories(t *testing.T) {
 	result, err := CurPurchaseHandler.GetAllCategories(jxcontext.AdminCtx, "")
 	if err != nil || len(result) == 0 {