From 59b505dd8f754182d9259473b1760d22c602e191 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 26 Jan 2022 19:20:10 +0800 Subject: [PATCH] add sale value 1 --- .../module/system/royalcanin/MemberService.java | 4 ++-- .../system/royalcanin/good/service/OrderService.java | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 980b6905..e449365b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -31,7 +31,7 @@ public class MemberService { JSONObject json = JSONObject.parseObject(jsonObject.getString("data")); String id = json.getString("id"); jsonObject.put("xaccessToken", SmartJWTUtil.generateToken(id)); - jsonObject.put(" type","1"); + jsonObject.put("type","1"); return jsonObject.toJSONString(); }else { return jsonObject.toJSONString(); @@ -57,7 +57,7 @@ public class MemberService { JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data")); String id = json.getString("id"); jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id)); - jsonObject.put(" type","2"); + jsonObject.put("type","2"); return jsonObjectResult.toJSONString(); }else { return jsonObjectResult.toJSONString(); 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 a34676c2..2352ff36 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 @@ -226,11 +226,14 @@ public class OrderService { long elapsedTime = acceptTime - startTime; JSONObject jsonObject = JSONObject.parseObject(result); String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); - OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber()); - //新增支付方式paytype com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult); JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0); - jsonObjectResult.put("paytype",orderEntity.getPayType()); + if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") { + OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber()); + //新增支付方式paytype + jsonObjectResult.put("paytype",orderEntity.getPayType()); + } + //记录服务响应时间 addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);