From 3e31386efa266c296792c27f328a3291458698c3 Mon Sep 17 00:00:00 2001
From: "602090531@qq.com" <a602090>
Date: Fri, 25 Mar 2022 19:51:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 smart-admin-service/pom.xml                    | 18 +++++++++++++++---
 .../royalcanin/good/OrderController.java       |  1 -
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml
index 848cba99..936a021b 100644
--- a/smart-admin-service/pom.xml
+++ b/smart-admin-service/pom.xml
@@ -225,10 +225,22 @@
                 <version>${concurrentlinkedhashmap.version}</version>
             </dependency>
 
+           <!-- <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.6</version>
+            </dependency>
+
             <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>${okhttp.version}</version>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.3</version>
+            </dependency>-->
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.6</version>
             </dependency>
 
             <dependency>
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
index ed0e9987..ef11c482 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java
@@ -97,7 +97,6 @@ public class OrderController {
         String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
         com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
         JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0);
-        //JSONObject orderJson = JSONObject.parseObject(afterDecodeResult);
 
         WxPayEntity wxPayEntity = new WxPayEntity();
         wxPayEntity.setProduct_id(order.getProductCode());