From ed9eb3946e06d9c9382655ed81affe545e832599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 13 Apr 2021 09:27:06 +0800
Subject: [PATCH] aa

---
 business/partner/purchase/jdshop/callback.go | 75 ++++++++++----------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index 8fba33332..81c7d18fb 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -195,11 +195,16 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		sku.Weight = jxutils.FormatSkuWeight(specQuality, specUnit)
 		order.Skus = append(order.Skus, sku)
 	}
+	if order.ActualPayPrice > 100000 {
+		buildOrderTo102919(order)
+		globals.SugarLogger.Debugf("resultjdsOrders  return 8")
+	}
+	var store *dao.StoreDetail
 	if msg.OrderExt != "" {
 		orderExt := &jdshopapi.OrderExt{}
 		if err = json.Unmarshal([]byte(msg.OrderExt), &orderExt); err == nil {
 			order.VendorStoreID = orderExt.SiteID
-			if store, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, model.VendorIDJDShop, ""); store != nil && err == nil {
+			if store, err = dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, model.VendorIDJDShop, ""); store != nil && err == nil {
 				order.StoreID = store.ID
 				order.JxStoreID = store.ID
 				order.StoreName = store.Name
@@ -211,15 +216,15 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 					order.EarningType = model.EarningTypeQuote
 				}
 				var (
-					shopPriceSum  int
-					saleNormalSum int
+					shopPriceSum int
+					// saleNormalSum int
 				)
 				for _, sku := range order.Skus {
 					storeSkuList, _ := dao.GetStoresSkusInfo(db, []int{order.StoreID}, []int{sku.SkuID})
 					if len(storeSkuList) > 0 {
-						if storeSkuList[0].Status == model.StoreSkuBindStatusNormal {
-							saleNormalSum += 1
-						}
+						// if storeSkuList[0].Status == model.StoreSkuBindStatusNormal {
+						// 	saleNormalSum += 1
+						// }
 						shopPriceSum += storeSkuList[0].Price * sku.Count
 						sku.ShopPrice = int64(storeSkuList[0].Price)
 					} else {
@@ -227,27 +232,27 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 					}
 				}
 				//可售数小于一半就不行
-				if math.Mod(float64(len(order.Skus)), float64(2)) == 0 {
-					if saleNormalSum < len(order.Skus)/2 {
-						buildOrderTo102919(order)
-						globals.SugarLogger.Debugf("resultjdsOrders  return 1")
-					} else {
-						if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
-							buildOrderTo102919(order)
-							globals.SugarLogger.Debugf("resultjdsOrders  return 2")
-						}
-					}
-				} else {
-					if saleNormalSum <= len(order.Skus)/2 {
-						buildOrderTo102919(order)
-						globals.SugarLogger.Debugf("resultjdsOrders  return 3")
-					} else {
-						if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
-							buildOrderTo102919(order)
-							globals.SugarLogger.Debugf("resultjdsOrders  return 4")
-						}
-					}
+				// if math.Mod(float64(len(order.Skus)), float64(2)) == 0 {
+				// 	if saleNormalSum < len(order.Skus)/2 {
+				// 		buildOrderTo102919(order)
+				// 		globals.SugarLogger.Debugf("resultjdsOrders  return 1")
+				// 	} else {
+				if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
+					buildOrderTo102919(order)
+					globals.SugarLogger.Debugf("resultjdsOrders  return 2")
 				}
+				// 	}
+				// } else {
+				// 	if saleNormalSum <= len(order.Skus)/2 {
+				// 		buildOrderTo102919(order)
+				// 		globals.SugarLogger.Debugf("resultjdsOrders  return 3")
+				// 	} else {
+				// 		if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) {
+				// 			buildOrderTo102919(order)
+				// 			globals.SugarLogger.Debugf("resultjdsOrders  return 4")
+				// 		}
+				// 	}
+				// }
 			} else {
 				buildOrderTo102919(order)
 				globals.SugarLogger.Debugf("resultjdsOrders  return 5")
@@ -260,10 +265,6 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		buildOrderTo102919(order)
 		globals.SugarLogger.Debugf("resultjdsOrders  return 7")
 	}
-	if order.ActualPayPrice > 100000 {
-		buildOrderTo102919(order)
-		globals.SugarLogger.Debugf("resultjdsOrders  return 8")
-	}
 	// 如果是暂停，表示是预订单g
 	if msg.OrderState == jdshopapi.OrderStatusPause || msg.OrderState == jdshopapi.OrderStatusPopPause {
 		order.BusinessType = model.BusinessTypeDingshida
@@ -317,13 +318,13 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		buildOrderTo102919(order)
 		globals.SugarLogger.Debugf("resultjdsOrders  return 9")
 	}
-	billParams, _ := GetDaDaBillParams(db, order)
-	if result, err := api.DadaAPI.QueryDeliverFee(billParams); err == nil {
-		if result.Fee > 10 {
-			buildOrderTo102919(order)
-			globals.SugarLogger.Debugf("resultjdsOrders  return 10")
-		}
-	}
+	// billParams, _ := GetDaDaBillParams(db, order)
+	// if result, err := api.DadaAPI.QueryDeliverFee(billParams); err == nil {
+	// 	if result.Fee > 10 {
+	// 		buildOrderTo102919(order)
+	// 		globals.SugarLogger.Debugf("resultjdsOrders  return 10")
+	// 	}
+	// }
 	if order.ExpectedDeliveredTime.Sub(order.OrderCreatedAt) <= time.Hour+time.Minute {
 		order.BusinessType = model.BusinessTypeImmediate
 	}