From 30fdd63443a8a391e5b373d79adfa00663b485ec Mon Sep 17 00:00:00 2001 From: "602090531@qq.com" Date: Mon, 21 Mar 2022 16:11:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E5=88=B0=E7=94=9F?= =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E4=BC=98=E6=83=A0=E5=88=B8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/royalcanin/good/service/OrderService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 63fb97bf..7eb064e6 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -471,6 +471,7 @@ public class OrderService { }else{//没有优惠券的计算总价逻辑 Map resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee); total_fee = new BigDecimal(ordersEntity.getOrderAmount()); + orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson"); } ordersEntity.setMemberId(memberId); @@ -581,6 +582,7 @@ public class OrderService { }else{//没有优惠券的计算总价逻辑 Map resultMap = addOrdersEntityInfo(ordersEntityList, ordersEntity, couponJson, total_fee); total_fee = new BigDecimal(ordersEntity.getOrderAmount()); + orderDatilListJson = (JSONArray) resultMap.get("orderDatilListJson"); } ordersEntity.setMemberId(memberId); @@ -631,7 +633,6 @@ public class OrderService { productCodes = couponJson.getString("productCodes").toString().split(","); } - for (OrdersEntity order : ordersEntityList) { //从crm获取商品的json数据信息 JSONObject goodsObject = gainGoodsObject(order);