Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

2022-11-04 10:57:31 +08:00
parent 6cc42492bf ba65210093
commit 77d3b0a899
10 changed files with 186 additions and 20 deletions
--- a/business/partner/purchase/tiktok_store/order.go
+++ b/business/partner/purchase/tiktok_store/order.go
@@ -188,9 +188,9 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode, vendorOrderID, vendorStoreID s

 	h, m, _ := order.ExpectedDeliveredTime.Clock()
 	if order.ExpectedDeliveredTime.Day() == time.Now().Day() && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) >= openTime && utils.Str2Int16(fmt.Sprintf("%d%d", h, m)) < closeTime && localStore.Status == model.StoreStatusOpened {
-		order.BusinessType = model.BusinessTypeDingshida
-	} else {
 		order.BusinessType = model.BusinessTypeImmediate
+	} else {
+		order.BusinessType = model.BusinessTypeDingshida
 	}

 	// 用户保密信息脱敏