liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
suyl
2021-06-22 09:33:47 +08:00
parent bfd2f930c1
commit e885b0e055
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
business/partner/purchase/jdshop/order.go
View File

@@ -3,7 +3,6 @@ package jdshop
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"regexp"
"strings" "strings"
"time" "time"
@@ -38,6 +37,7 @@ func (p *PurchaseHandler) Map2Order(orderData map[string]interface{}) (order *mo
BuyerComment: jdsOrder.UserRemark, BuyerComment: jdsOrder.UserRemark,
PickDeadline: utils.DefaultTimeValue, PickDeadline: utils.DefaultTimeValue,
OriginalData: string(utils.MustMarshal(jdsOrder)), OriginalData: string(utils.MustMarshal(jdsOrder)),
Status: status2Jxstatus(jdsOrder.OrderStatus),
} }
return order 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) { func (p *PurchaseHandler) GetOrderStatus(vendorOrgCode, vendorOrderID string) (status int, err error) {
//jdsOrder, err := GetJdsOrder(vendorOrderID, vendorOrgCode) //jdsOrder, err := GetJdsOrder(vendorOrderID, vendorOrgCode)
jdsOrder, err := GetJdsOrder2(vendorOrderID, vendorOrgCode) //jdsOrder, err := GetJdsOrder2(vendorOrderID, vendorOrgCode)
r := regexp.MustCompile(`"orderState":"(.*)","orderType`) //r := regexp.MustCompile(`"orderState":"(.*)","orderType`)
if len(r.FindStringSubmatch(jdsOrder)) > 0 { //if len(r.FindStringSubmatch(jdsOrder)) > 0 {
return status2Jxstatus(r.FindStringSubmatch(jdsOrder)[1]), err // 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 return 0, err
} }
@@ -212,12 +215,19 @@ func (p *PurchaseHandler) OrderTransfer(ctx *jxcontext.Context, vendorOrderID, v
return err return err
} }
func status2Jxstatus(status string) (statusJx int) { func status2Jxstatus(status int) (statusJx int) {
if status == jdshopapi.OrderStatusPopPause || status == jdshopapi.OrderStatusPause { //if status == jdshopapi.OrderStatusPopPause || status == jdshopapi.OrderStatusPause {
statusJx = model.OrderStatusNew // statusJx = model.OrderStatusNew
} else if status == jdshopapi.OrderStatusWait { //} else if status == jdshopapi.OrderStatusWait {
// statusJx = model.OrderStatusAccepted
//} else if status == jdshopapi.OrderStatusCancel {
// statusJx = model.OrderStatusCanceled
//}
if status == jdshopapi.OrderStatusFinishedPickup {
statusJx = model.OrderStatusAccepted statusJx = model.OrderStatusAccepted
} else if status == jdshopapi.OrderStatusCancel { } else if status == jdshopapi.OrderStatusNew {
statusJx = model.OrderStatusNew
} else if status == jdshopapi.OrderStatusCancelm2 {
statusJx = model.OrderStatusCanceled statusJx = model.OrderStatusCanceled
} }
return statusJx return statusJx