From 1a105e761c04662cbbadfaec06e7031cde41ced8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 18 Sep 2020 11:50:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=AC=E4=B8=9C=E5=95=86=E5=9F=8E=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/partner/purchase/jdshop/callback.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/business/partner/purchase/jdshop/callback.go b/business/partner/purchase/jdshop/callback.go index 3f9ff36f0..dc8315258 100644 --- a/business/partner/purchase/jdshop/callback.go +++ b/business/partner/purchase/jdshop/callback.go @@ -163,8 +163,10 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err ) for _, sku := range order.Skus { storeSkuList, _ := dao.GetStoresSkusInfo(dao.GetDB(), []int{order.StoreID}, []int{sku.SkuID}) - if len(storeSkuList) > 0 && storeSkuList[0].Status == model.StoreSkuBindStatusNormal { - saleNormalSum += 1 + if len(storeSkuList) > 0 { + if storeSkuList[0].Status == model.StoreSkuBindStatusNormal { + saleNormalSum += 1 + } shopPriceSum += storeSkuList[0].Price * sku.Count } } @@ -174,7 +176,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err buildOrderTo102919(order) continue } else { - if order.EarningType == model.EarningTypeQuote && utils.Int2Float64(shopPriceSum+700) > float64(order.TotalShopMoney)*jdshopapi.JdsPayPercentage { + if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) { buildOrderTo102919(order) continue } @@ -184,7 +186,7 @@ func result2Orders(msg *jdshopapi.CallBackResult) (order *model.GoodsOrder, err buildOrderTo102919(order) continue } else { - if order.EarningType == model.EarningTypeQuote && utils.Int2Float64(shopPriceSum+700) > float64(order.TotalShopMoney)*jdshopapi.JdsPayPercentage { + if order.EarningType == model.EarningTypeQuote && shopPriceSum+700 > int(order.TotalShopMoney) { buildOrderTo102919(order) continue }