From c7557fec8b801580c12971c5f93ced291c207e64 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, 15 Sep 2020 09:42:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/partner/purchase/jdshop/callback.go | 64 +++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go
index cf0d39d2a..8db21adc9 100644
--- a/business/partner/purchase/jdshop/callback.go
+++ b/business/partner/purchase/jdshop/callback.go
@@ -67,11 +67,11 @@ func SaveJdsOrders(msg *jdshopapi.CallBackResult) (err error) {
 	if err != nil || order == nil {
 		return err
 	}
-	order.StoreID = 102919
-	order.JxStoreID = 102919
-	order.StoreName = "商城模板(成都发货)"
-	order.VendorStoreID = model.JdShopMainVendorStoreID
-	order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
+	// order.StoreID = 102919
+	// order.JxStoreID = 102919
+	// order.StoreName = "商城模板(成都发货)"
+	// order.VendorStoreID = model.JdShopMainVendorStoreID
+	// order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
 	partner.CurOrderManager.OnOrderNew(order, model.Order2Status(order))
 	noticeMsg := fmt.Sprintf("京东商城新订单，订单号：[%v] ,将要发到的门店id：[%v] , 门店名：[%v]", order.VendorOrderID, order.StoreID, order.StoreName)
 	ddmsg.SendUserMessage(dingdingapi.MsgTyeText, "DDC5657B43EE11E9A9FF525400E86DC0", "京东商城来新订单了！", noticeMsg)
@@ -142,31 +142,35 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err
 		return order, err
 	}
 	if len(storeList) > 0 {
-		// for _, store := range storeList {
-		// order.StoreID = store.ID
-		// order.JxStoreID = store.ID
-		// order.StoreName = store.Name
-		// globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
-		// //结算类型
-		// storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop)
-		// if storeDetail != nil {
-		// 	if storeDetail.PayPercentage < 50 {
-		// 		order.EarningType = model.EarningTypePoints
-		// 	} else {
-		// 		order.EarningType = model.EarningTypeQuote
-		// 	}
-		// }
-		// if order.EarningType == model.EarningTypeQuote {
-		// 	var shopPriceSum int
-		// 	storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs)
-		// 	for _, storeSku := range storeSkuList {
-		// 		shopPriceSum += storeSku.Price
-		// 	}
-		// 	if shopPriceSum+700 > int(order.TotalShopMoney) {
-
-		// 	}
-		// }
-		// }
+		for _, store := range storeList {
+			order.StoreID = store.ID
+			order.JxStoreID = store.ID
+			order.StoreName = store.Name
+			globals.SugarLogger.Debugf("jds GetStoreListByLocation, orderID: %v storeID :%v", order.VendorOrderID, order.StoreID)
+			//结算类型
+			storeDetail, _ := dao.GetStoreDetail(dao.GetDB(), order.StoreID, model.VendorIDJDShop)
+			if storeDetail != nil {
+				if storeDetail.PayPercentage < 50 {
+					order.EarningType = model.EarningTypePoints
+				} else {
+					order.EarningType = model.EarningTypeQuote
+				}
+			}
+			if order.EarningType == model.EarningTypeQuote {
+				var shopPriceSum int
+				storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, skuIDs)
+				for _, storeSku := range storeSkuList {
+					shopPriceSum += storeSku.Price
+				}
+				if shopPriceSum+700 > int(order.TotalShopMoney) {
+					order.StoreID = 102919
+					order.JxStoreID = 102919
+					order.StoreName = "商城模板(成都发货)"
+					order.VendorStoreID = model.JdShopMainVendorStoreID
+					order.DeliveryFlag = model.OrderDeliveryFlagMaskScheduleDisabled
+				}
+			}
+		}
 	} else {
 		order.StoreID = 102919
 		order.JxStoreID = 102919