From 505bf618ac6a196525e4f9d9b52e328716f9df30 Mon Sep 17 00:00:00 2001
From: Carl <376654749@qq.com>
Date: Fri, 28 Jan 2022 16:23:11 +0800
Subject: [PATCH] fix without basePoint and paytype

---
 .../royalcanin/good/service/OrderService.java | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

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 7434a4fc..eafefa42 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
@@ -227,14 +227,19 @@ public class OrderService {
         JSONObject jsonObject = JSONObject.parseObject(result);
         String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
         com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
-        JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0);
-        if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") {
-            OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
-            //新增支付方式paytype
-            jsonObjectResult.put("paytype",orderEntity.getPayType());
-            jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
-        }
+        for (int i = 0; i < jsonArray.size();i++){
+            JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
+                OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber"));
+                if (orderEntity == null){
+                    jsonObjectResult.put("paytype","0");
+                    jsonObjectResult.put("basePoint","0");
+                }else {
+                    //新增支付方式paytype
+                    jsonObjectResult.put("paytype",orderEntity.getPayType());
+                    jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
+                }
 
+        }
         //记录服务响应时间
         addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);