From aa38e02e2b970070b85855a203dc1d157c3f0fc9 Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Mon, 25 Jul 2022 14:09:29 +0800 Subject: [PATCH 1/2] 1 --- .../main/java/com/hai/service/impl/ApiProductServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java index e9201c6f..2e1a1c8a 100644 --- a/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/ApiProductServiceImpl.java @@ -394,7 +394,7 @@ public class ApiProductServiceImpl implements ApiProductService { List apiKfcStores = apiKfcStoresMapper.selectByExample(example); if (apiKfcStores.size() > 0) { - apiKfcStores.get(0); + return apiKfcStores.get(0); } return null; } From 0d5625397e764582fd87b43058f5b9792d3e3f6d Mon Sep 17 00:00:00 2001 From: Sum1Dream <418471657@qq.com> Date: Mon, 25 Jul 2022 14:33:21 +0800 Subject: [PATCH 2/2] 1 --- .../main/java/com/hai/service/impl/HighOrderServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java index 18eb196b..009c756f 100644 --- a/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java +++ b/hai-service/src/main/java/com/hai/service/impl/HighOrderServiceImpl.java @@ -2297,7 +2297,7 @@ public class HighOrderServiceImpl implements HighOrderService { updateOrder(order); HighGasOrderPush orderPush = new HighGasOrderPush(); - JSONObject returnObject = new JSONObject(); + JSONObject returnObject; for (HighChildOrder childOrder : order.getHighChildOrderList()) { childOrder.setChildOrdeStatus(2); @@ -2343,7 +2343,7 @@ public class HighOrderServiceImpl implements HighOrderService { // 退还积分 - if (order.getPayGold() > 0) { + if (order.getPayGold() != null) { highUserService.goldHandle(order.getMemId(), order.getPayGold(), 1, 3, order.getId()); if (order.getPayRealPrice().compareTo(new BigDecimal(0)) == 0) { order.setOrderStatus(4);