From ca63f38c482b9246c6bac06cbb35747b87172be7 Mon Sep 17 00:00:00 2001 From: chenlin Date: Fri, 20 Sep 2024 14:24:33 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BC=98=E5=8C=96=E9=9B=B6=E5=94=AE?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E5=8D=95=E5=8F=8D=E5=AE=A1=E6=A0=B8=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98=EF=BC=9B=202=E3=80=81=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E9=9B=B6=E5=94=AE=E9=80=80=E8=B4=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8B=86=E5=88=86=E9=9D=9E=E4=B8=B2=E7=A0=81=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5=E6=8B=86=E5=88=86=E9=80=80?= =?UTF-8?q?=E8=B4=A7=E6=95=B0=E9=87=8F=E5=92=8C=E9=80=80=E8=B4=A7=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E5=AD=97=E6=AE=B5=EF=BC=9B=E9=9B=B6=E5=94=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=90=88=E5=B9=B6=E9=9D=9E=E4=B8=B2=E7=A0=81=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F=E5=92=8C=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5=EF=BC=9B=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=90=8E=E8=A7=A3=E5=86=B3=E5=95=86=E5=93=81=E9=9B=B6=E5=94=AE?= =?UTF-8?q?=E6=AF=9B=E5=88=A9=E6=B1=87=E6=80=BB=E9=80=80=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E7=9B=B8=E5=90=8C=E9=9D=9E=E4=B8=B2=E7=A0=81?= =?UTF-8?q?=E5=95=86=E5=93=81=E9=80=80=E8=B4=A7=E9=87=91=E9=A2=9D=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/erpordermanage/erp_order.go | 1 + app/admin/models/erp_order.go | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/admin/apis/erpordermanage/erp_order.go b/app/admin/apis/erpordermanage/erp_order.go index 9ba1973..ac9ff3e 100644 --- a/app/admin/apis/erpordermanage/erp_order.go +++ b/app/admin/apis/erpordermanage/erp_order.go @@ -207,6 +207,7 @@ func ErpOrderAudit(c *gin.Context) { } var checkReq model.ErpOrderCreateReq + checkReq.StoreId = erpOrder.StoreId checkReq.ErpOrderCommodities = commodity err = model.CheckOrderCommodityStock(&checkReq) if err != nil { diff --git a/app/admin/models/erp_order.go b/app/admin/models/erp_order.go index 5442e15..bdd9883 100644 --- a/app/admin/models/erp_order.go +++ b/app/admin/models/erp_order.go @@ -1402,6 +1402,8 @@ func mergeOrderCommodities(orderCommodities []ErpOrderCommodity) []ErpOrderCommo existingCommodity.SaleDiscount += commodity.SaleDiscount existingCommodity.MemberDiscount += commodity.MemberDiscount existingCommodity.ReceivedAmount += commodity.ReceivedAmount + existingCommodity.RejectedCount += commodity.RejectedCount + existingCommodity.RejectedAmount += commodity.RejectedAmount stockCommodityID, _ := tools.StringToInt(commodity.ErpStockCommodityID) if stockCommodityID > 0 { existingCommodity.ErpStockCommodityID = strings.Join([]string{existingCommodity.ErpStockCommodityID, commodity.ErpStockCommodityID}, ",") @@ -5403,10 +5405,12 @@ func checkOrderData(req *ErpOrderCreateReq, c *gin.Context) (*ErpOrder, error) { //// 单个商品退货金额 //req.ErpOrderCommodities[i].RejectedAmount = req.ErpOrderCommodities[i].RejectedAmount / float64(req.ErpOrderCommodities[i].RejectedCount) - for j := 0; j < int(req.ErpOrderCommodities[i].Count); j++ { + for j := 0; j < int(req.ErpOrderCommodities[i].RejectedCount); j++ { stockIdList, _ := stringToIntArray(req.ErpOrderCommodities[i].ErpStockCommodityID) temp := req.ErpOrderCommodities[i] + temp.RejectedAmount = req.ErpOrderCommodities[i].RejectedAmount / float64(req.ErpOrderCommodities[i].RejectedCount) temp.Count = 1 + temp.RejectedCount = 1 if len(stockIdList) > j { temp.ErpStockCommodityID = fmt.Sprintf("%d", stockIdList[j]) }