From da1b0b17522c8137d8f492a324941efd36429f3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Thu, 3 Sep 2020 18:15:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/basesch/basesch_ext.go | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index 1910c6492..c6668a142 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -6,7 +6,6 @@ import ( "time" "git.rosy.net.cn/baseapi/platformapi/dingdingapi" - "git.rosy.net.cn/baseapi/platformapi/jdshopapi" "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/baseapi/utils/errlist" "git.rosy.net.cn/jx-callback/business/jxstore/cms" @@ -214,33 +213,6 @@ func (c *BaseScheduler) AgreeOrRefuseRefund(ctx *jxcontext.Context, afsOrderID s flag = model.AfsOrderFlagRefuseUserRefund afsOrder.RefuseReason = reason partner.CurOrderManager.UpdateAfsOrderFields(afsOrder, []string{"RefuseReason"}) - } else { - if order, _ := partner.CurOrderManager.LoadOrder(afsOrder.VendorOrderID, afsOrder.VendorID); order != nil { - //如果是扣点的单需要修改totalShopMoney等 - skuMap := make(map[int]*model.OrderSku) - db := dao.GetDB() - for _, sku := range order.Skus { - skuMap[sku.SkuID] = sku - } - if err == nil && order.EarningType == model.EarningTypePoints { - var diff int64 - origin := float64(order.TotalShopMoney) / jdshopapi.JdsPayPercentage - for _, sku := range afsOrder.Skus { - if skuMap[sku.SkuID] != nil { - diff += skuMap[sku.SkuID].SalePrice * int64(sku.Count) - } - } - order.TotalShopMoney = utils.Float64TwoInt64((origin - float64(diff)) * jdshopapi.JdsPayPercentage) - storeDetail, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID) - wayBills, _ := dao.GetWaybills(db, order.VendorOrderID) - if len(wayBills) > 0 { - jxutils.RefreshOrderEarningPrice3(order, storeDetail.PayPercentage, wayBills[0]) - } else { - jxutils.RefreshOrderEarningPrice2(order, storeDetail.PayPercentage) - } - dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice") - } - } } dao.SetAfsOrderFlag(dao.GetDB(), ctx.GetUserName(), afsOrderID, vendorID, flag) }