From 33b7e15b09623b8cff60e50a729294c7f8f6adb9 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Tue, 10 Dec 2024 21:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AsDeviceServiceImpl.java     | 27 ++++++++++---------
 .../system/service/impl/WxPayService.java     |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
index fba86cb..48c3627 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java
@@ -49,6 +49,7 @@ import java.util.List;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
+import static com.ruoyi.common.constant.HttpStatus.ERROR_CODE_DEVICE_ALREADY_EXISTS_MSG;
 import static com.ruoyi.common.utils.SecurityUtils.getUsername;
 
 /**
@@ -2824,20 +2825,20 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         if(StringUtils.isNotNull(device)){
             throw new ServiceException("该MAC号已经存在");
         }else{
-            // 调用onenet接口
-            CreateDeviceVo createDeviceVo = new CreateDeviceVo();
-            createDeviceVo.setDevice_name(asDevice.getMac());
-            createDeviceVo.setProduct_id(productId);
-            String result = HttpUtils.sendPostWithToken(deviceUrl+"/create",JSON.toJSONString(createDeviceVo), Token.getToken());
-            log.info("【sn和mac号绑定】===>IOT请求调用结果:【{}】",result);
-            JSONObject paramsObj = JSON.parseObject(result);
-            String code = paramsObj.getString("code");
-            //记录命令
-            if (!HttpStatus.IOT_SUCCESS.equals(code))
-            {
-                throw new ServiceException(code+"-----"+ paramsObj.getString("msg"));
-            }
             try{
+                // 调用onenet接口
+                CreateDeviceVo createDeviceVo = new CreateDeviceVo();
+                createDeviceVo.setDevice_name(asDevice.getMac());
+                createDeviceVo.setProduct_id(productId);
+                String result = HttpUtils.sendPostWithToken(deviceUrl+"/create",JSON.toJSONString(createDeviceVo), Token.getToken());
+                log.info("【sn和mac号绑定】===>IOT请求调用结果:【{}】",result);
+                JSONObject paramsObj = JSON.parseObject(result);
+                String code = paramsObj.getString("code");
+                //记录命令
+                if (!HttpStatus.IOT_SUCCESS.equals(code) && !ERROR_CODE_DEVICE_ALREADY_EXISTS_MSG.equals(code))
+                {
+                    throw new ServiceException(code+"-----"+ paramsObj.getString("msg"));
+                }
                 int insert = asDeviceMapper.insert(asDevice);
                 if(insert==0){
                     throw new ServiceException("该SN已经存在，请勿重复绑定！");
diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
index 2cc3c22..7471b01 100644
--- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
+++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java
@@ -173,7 +173,7 @@ public class WxPayService implements IWxPayService {
 
                     if(StrUtil.isNotBlank(order.getOutTradeNo())){
                         // 关闭订单
-                        tmPayService.closeOrder(channelVO,order.getOutTradeNo());
+                        TmPayService.closeOrder(channelVO,order.getOutTradeNo());
                     }
                     Payable payable = new Payable();
                     payable.setAmount(order.getPayFee().multiply(new BigDecimal(100)).longValue());