From e885b0e055cecd5d7a67a321496b348a7ba61632 Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Tue, 22 Jun 2021 09:33:47 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jdshop/order.go | 30 +++++++++++++++--------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/business/partner/purchase/jdshop/order.go b/business/partner/purchase/jdshop/order.go
index ce435362d..ea05d6b24 100644
--- a/business/partner/purchase/jdshop/order.go
+++ b/business/partner/purchase/jdshop/order.go
@@ -3,7 +3,6 @@ package jdshop
 import (
 	"fmt"
 	"net/http"
-	"regexp"
 	"strings"
 	"time"
 
@@ -38,6 +37,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
 		BuyerComment:     jdsOrder.UserRemark,
 		PickDeadline:     utils.DefaultTimeValue,
 		OriginalData:     string(utils.MustMarshal(jdsOrder)),
+		Status:           status2Jxstatus(jdsOrder.OrderStatus),
 	}
 	return order
 }
@@ -51,10 +51,13 @@ func (p *PurchaseHandler) GetOrder(vendorOrgCode, vendorOrderID, vendorStoreID s
 }
 func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
 	//jdsOrder, err := GetJdsOrder(vendorOrderID, vendorOrgCode)
-	jdsOrder, err := GetJdsOrder2(vendorOrderID, vendorOrgCode)
-	r := regexp.MustCompile(`"orderState":"(.*)","orderType`)
-	if len(r.FindStringSubmatch(jdsOrder)) > 0 {
-		return status2Jxstatus(r.FindStringSubmatch(jdsOrder)[1]), err
+	//jdsOrder, err := GetJdsOrder2(vendorOrderID, vendorOrgCode)
+	//r := regexp.MustCompile(`"orderState":"(.*)","orderType`)
+	//if len(r.FindStringSubmatch(jdsOrder)) > 0 {
+	//	return status2Jxstatus(r.FindStringSubmatch(jdsOrder)[1]), err
+	//}
+	if order, err := p.GetOrder(vendorOrgCode, vendorOrderID, ""); err == nil && order != nil {
+		return order.Status, err
 	}
 	return 0, err
 }
@@ -212,12 +215,19 @@ func (p *PurchaseHandler) OrderTransfer(ctx *jxcontext.Context, vendorOrderID, v
 	return err
 }
 
-func status2Jxstatus(status string) (statusJx int) {
-	if status == jdshopapi.OrderStatusPopPause || status == jdshopapi.OrderStatusPause {
-		statusJx = model.OrderStatusNew
-	} else if status == jdshopapi.OrderStatusWait {
+func status2Jxstatus(status int) (statusJx int) {
+	//if status == jdshopapi.OrderStatusPopPause || status == jdshopapi.OrderStatusPause {
+	//	statusJx = model.OrderStatusNew
+	//} else if status == jdshopapi.OrderStatusWait {
+	//	statusJx = model.OrderStatusAccepted
+	//} else if status == jdshopapi.OrderStatusCancel {
+	//	statusJx = model.OrderStatusCanceled
+	//}
+	if status == jdshopapi.OrderStatusFinishedPickup {
 		statusJx = model.OrderStatusAccepted
-	} else if status == jdshopapi.OrderStatusCancel {
+	} else if status == jdshopapi.OrderStatusNew {
+		statusJx = model.OrderStatusNew
+	} else if status == jdshopapi.OrderStatusCancelm2 {
 		statusJx = model.OrderStatusCanceled
 	}
 	return statusJx