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);