From 0cc7a0a91d924306ad6f206352e2542263892330 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 27 May 2026 15:19:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=8C=87=E7=BA=B9=E5=94=AF=E4=B8=80=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/order/HardAfterSaleServiceImpl.java  |  4 +--
 .../thirdparty/dto/DeviceVerifyDTO.java       |  7 ++++--
 .../thirdparty/dto/ThirdIsVerifyDeviceTo.java |  4 +--
 .../controller/ThirdPartyOAth2Cotroller.java  | 25 +++++++++++--------
 .../UserTrustedDeviceController.java          | 11 ++++----
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
index 8366fde9d..0ffccd67d 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardAfterSaleServiceImpl.java
@@ -641,12 +641,12 @@ public class HardAfterSaleServiceImpl extends ServiceImpl<HardAfterSaleMapper, H
             ).toList();
             hardOrderService.fastenerInventory(order, carList, YesNoEnum.NO);
         }
-        // 执行退款
-        getSelf().refund(saveObj.getId());
         // 退优惠券
         if (ObjectUtil.isAllNotEmpty(order.getCouponPrice(), order.getCouponRecordId())) {
             actCouponCancelService.remoteReturn(Long.valueOf(order.getCouponRecordId()));
         }
+        // 执行退款
+        getSelf().refund(saveObj.getId());
         return true;
     }
 
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/DeviceVerifyDTO.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/DeviceVerifyDTO.java
index 06c501d13..01fc5bd3b 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/DeviceVerifyDTO.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/DeviceVerifyDTO.java
@@ -5,9 +5,12 @@ import lombok.Data;
 @Data
 public class DeviceVerifyDTO {
 
-
     private String code;
 
-
     private String mobilePhone;
+
+    /**
+     * 设备唯一值
+     */
+    private String deviceUniqueCode;
 }
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/ThirdIsVerifyDeviceTo.java b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/ThirdIsVerifyDeviceTo.java
index 2d9237a90..9e6db695f 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/ThirdIsVerifyDeviceTo.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-api/src/main/java/com/bsd/pjcloud/thirdparty/dto/ThirdIsVerifyDeviceTo.java
@@ -16,9 +16,9 @@ public class ThirdIsVerifyDeviceTo {
     private Long userId;
 
     /**
-     * 唯一值,小程序是openId
+     * 设备唯一值
      */
-    private String uniqueCode;
+    private String deviceUniqueCode;
 
     /**
      * 设备信息
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
index 90ee95020..723a7fba8 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/controller/ThirdPartyOAth2Cotroller.java
@@ -136,8 +136,7 @@ public class ThirdPartyOAth2Cotroller {
                 need.put("bindSessionId", bindSessionId);
                 need.put("displayName", StringUtils.defaultIfBlank(zzdUserDTO.getNickName(), zzdUserDTO.getUsername()));
                 return R.ok(need);
-            }
-            catch (JsonProcessingException e) {
+            } catch (JsonProcessingException e) {
                 return R.failed("创建绑定会话失败");
             }
         }
@@ -195,8 +194,7 @@ public class ThirdPartyOAth2Cotroller {
             out.put("refreshToken", r.getData().get("refreshToken"));
             out.put("accessToken", r.getData().get("accessToken"));
             return R.ok(out);
-        }
-        catch (JsonProcessingException e) {
+        } catch (JsonProcessingException e) {
             return R.failed("保存绑定信息失败");
         }
     }
@@ -348,7 +346,12 @@ public class ThirdPartyOAth2Cotroller {
         redisTemplate.delete(redisKey);
         // 2. 记录信任设备
         //查询之前的是否有过期的数据，有就更新
-        String generate = DeviceFingerprintUtil.generate(httpServletRequest);
+
+        String generate = dto.getDeviceUniqueCode();
+        if (ObjectUtil.isEmpty(generate)) {
+            generate = DeviceFingerprintUtil.generate(httpServletRequest);
+        }
+
         R<UserTrustedDeviceEntity> userTrustedDeviceR = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(dto.getMobilePhone(), generate, MINI_MAP_APP_DEVICE_NAME);
         if (userTrustedDeviceR.getData() != null) {
             userTrustedDeviceR.getData().setExpireTime(LocalDateTime.now().plusMonths(3));
@@ -377,9 +380,14 @@ public class ThirdPartyOAth2Cotroller {
                 throw new RuntimeException("手机号和登录的账号不一致");
             }
         }
-        String generate = DeviceFingerprintUtil.generate(httpServletRequest);
+
+        String generate = body.getDeviceUniqueCode();
+        if (ObjectUtil.isEmpty(generate)) {
+            generate = DeviceFingerprintUtil.generate(httpServletRequest);
+        }
+
         UserTrustedDeviceEntity userTrustedDevice = remoteUserTrustedDeviceService.getUserTrustedDeviceByIdAndMD5(body.getMobile(), generate, MINI_MAP_APP_DEVICE_NAME).getData();
-        return R.ok(ObjectUtil.isNotEmpty(userTrustedDevice));
+        return R.ok(ObjectUtil.isNotEmpty(userTrustedDevice) && userTrustedDevice.getExpireTime().isAfter(LocalDateTime.now()));
     }
 
 
@@ -415,7 +423,4 @@ public class ThirdPartyOAth2Cotroller {
     }
 
 
-
-
-
 }
diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/UserTrustedDeviceController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/UserTrustedDeviceController.java
index 0a674d082..b444cf9f6 100644
--- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/UserTrustedDeviceController.java
+++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/UserTrustedDeviceController.java
@@ -2,6 +2,7 @@ package com.bsd.pjcloud.admin.controller;
 
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,16 +40,14 @@ public class UserTrustedDeviceController {
 
     /**
      * 分页查询
-     *
-     * @param page              分页对象
-     * @param userTrustedDevice 设备指纹
-     * @return
      */
     @Operation(summary = "分页查询", description = "分页查询")
     @GetMapping("/page")
     @PreAuthorize("@pms.hasPermission('admin_userTrustedDevice_view')")
-    public R getUserTrustedDevicePage(@ParameterObject Page page, @ParameterObject UserTrustedDeviceEntity userTrustedDevice) {
-        LambdaQueryWrapper<UserTrustedDeviceEntity> wrapper = Wrappers.lambdaQuery();
+    public R getUserTrustedDevicePage(@ParameterObject Page page, @ParameterObject UserTrustedDeviceEntity dto) {
+        LambdaQueryWrapper<UserTrustedDeviceEntity> wrapper = new LambdaQueryWrapper<UserTrustedDeviceEntity>()
+                .like(ObjectUtil.isNotEmpty(dto.getMobilePhone()), UserTrustedDeviceEntity::getMobilePhone, dto.getMobilePhone())
+                .like(ObjectUtil.isNotEmpty(dto.getDeviceName()), UserTrustedDeviceEntity::getDeviceName, dto.getDeviceName());
         return R.ok(userTrustedDeviceService.page(page, wrapper));
     }