优化

haha-entity/src/main/java/com/haha/entity/Order.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.haha.common.constant.OrderConstants;
 import lombok.Data;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -13,24 +12,6 @@ import java.time.LocalDateTime;
 @TableName("t_order")
 public class Order implements Serializable {
 
-    // ==================== 支付状态常量（已废弃，请使用 OrderConstants） ====================
-    @Deprecated
-    public static final String PAY_STATUS_未支付 = OrderConstants.PAY_STATUS_UNPAID;
-    @Deprecated
-    public static final String PAY_STATUS_已支付 = OrderConstants.PAY_STATUS_PAID;
-    @Deprecated
-    public static final String PAY_STATUS_已退款 = OrderConstants.PAY_STATUS_REFUND;
-
-    // ==================== 订单状态常量（已废弃，请使用 OrderConstants） ====================
-    @Deprecated
-    public static final int ORDER_STATUS_已取消 = OrderConstants.STATUS_CANCELLED;
-    @Deprecated
-    public static final int ORDER_STATUS_待支付 = OrderConstants.STATUS_PENDING_PAYMENT;
-    @Deprecated
-    public static final int ORDER_STATUS_已完成 = OrderConstants.STATUS_COMPLETED;
-    @Deprecated
-    public static final int ORDER_STATUS_已关闭 = OrderConstants.STATUS_CLOSED;
-
     private static final long serialVersionUID = 1L;
 
     @TableId(type = IdType.AUTO)

haha-miniapp/src/main/java/com/haha/miniapp/controller/CallbackController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaIgnore;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.haha.common.constant.OrderConstants;
 import com.haha.entity.Order;
 import com.haha.service.OrderService;
 import lombok.extern.slf4j.Slf4j;
@@ -368,7 +369,7 @@ public class CallbackController {
             Order localOrder = orderService.lambdaQuery()
                 .eq(Order::getUserId, Long.parseLong(userId))
                 .eq(Order::getDeviceId, deviceId)
-                .eq(Order::getStatus, Order.ORDER_STATUS_待支付)
+                .eq(Order::getStatus, OrderConstants.STATUS_PENDING_PAYMENT)
                 .orderByDesc(Order::getCreateTime)
                 .last("LIMIT 1")
                 .one();

haha-sdk/README.md

@@ -158,21 +158,6 @@ System.out.println("摄像头: " + status.get("camera_status"));   // 0-异常,
 System.out.println("网络: " + status.get("network_status"));    // 0-断开, 1-连接
 ```
 
-#### 1.7 刷卡开门验证
-
-```java
-String cardNo = "1234567890";
-int cardType = 1; // 1-IC卡, 2-身份证, 3-其他
-
-Map<String, Object> verifyResult = client.getDeviceApi()
-    .cardVerify("device001", cardNo, cardType);
-
-boolean canOpen = (boolean) verifyResult.get("can_open");
-if (canOpen) {
-    System.out.println("验证通过，可以开门");
-}
-```
-
 ---
 
 ### 2. 商品管理
@@ -455,7 +440,6 @@ try {
 | `getOnlineStatus` | 查询在线状态 |
 | `setVolume` | 设置音量 |
 | `getDeviceStatus` | 查询设备和锁状态 |
-| `cardVerify` | 刷卡开门验证 |
 
 ### 商品接口（10个）
 

haha-sdk/src/main/java/com/haha/sdk/api/DeviceApi.java

@@ -161,22 +161,4 @@ public class DeviceApi extends BaseApi {
         throw new HahaException("查询设备状态失败：返回数据格式错误");
     }
     
-    /**
-     * 刷卡开门验证
-     * 由API商家提供给哈哈刷卡开门时调用
-     * 注意：这是一个由商户提供的接口，不是调用哈哈的接口
-     * 
-     * @param cardNo 卡id
-     * @param machineNo 设备编号
-     * @param timestamp 请求时间戳(毫秒)
-     * @param sign 请求参数签名
-     * @return 验证结果
-     * @throws HahaException 调用失败时抛出
-     */
-    @Deprecated
-    public Map<String, Object> cardVerify(String cardNo, String machineNo, String timestamp, String sign) throws HahaException {
-        // 注意：这个接口是由商户提供给哈哈调用的，不是商户调用哈哈的
-        // 此方法不应该在SDK中实现，标记为已废弃
-        throw new HahaException("此接口由商户提供给哈哈调用，不需要在SDK中实现");
-    }
 }

haha-service/src/main/java/com/haha/service/impl/DashboardServiceImpl.java

@@ -1,6 +1,7 @@
 package com.haha.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.haha.common.constant.OrderConstants;
 import com.haha.entity.Device;
 import com.haha.entity.Order;
 import com.haha.entity.User;
@@ -51,7 +52,7 @@ public class DashboardServiceImpl implements DashboardService {
 
         // 今日销售额和订单量
         LambdaQueryWrapper<Order> todayWrapper = new LambdaQueryWrapper<>();
-        todayWrapper.eq(Order::getPayStatus, Order.PAY_STATUS_已支付)
+        todayWrapper.eq(Order::getPayStatus, OrderConstants.PAY_STATUS_PAID)
                      .ge(Order::getPayTime, todayStart)
                      .le(Order::getPayTime, todayEnd);
         
@@ -75,7 +76,7 @@ public class DashboardServiceImpl implements DashboardService {
 
         // 昨日同时段销售额和订单量
         LambdaQueryWrapper<Order> yesterdayWrapper = new LambdaQueryWrapper<>();
-        yesterdayWrapper.eq(Order::getPayStatus, Order.PAY_STATUS_已支付)
+        yesterdayWrapper.eq(Order::getPayStatus, OrderConstants.PAY_STATUS_PAID)
                         .ge(Order::getPayTime, yesterdayStart)
                         .le(Order::getPayTime, yesterdayEnd);
         
@@ -106,7 +107,7 @@ public class DashboardServiceImpl implements DashboardService {
         // 待处理事项统计
         // 未支付订单数
         long unpaidOrders = orderService.lambdaQuery()
-                .eq(Order::getStatus, Order.ORDER_STATUS_待支付)
+                .eq(Order::getStatus, OrderConstants.STATUS_PENDING_PAYMENT)
                 .count();
         result.put("unpaidOrders", unpaidOrders);
 
@@ -161,7 +162,7 @@ public class DashboardServiceImpl implements DashboardService {
 
         // 查询订单数据
         LambdaQueryWrapper<Order> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(Order::getPayStatus, Order.PAY_STATUS_已支付)
+        wrapper.eq(Order::getPayStatus, OrderConstants.PAY_STATUS_PAID)
                .ge(Order::getPayTime, startTime)
                .le(Order::getPayTime, endTime);
         
@@ -183,7 +184,7 @@ public class DashboardServiceImpl implements DashboardService {
 
         // 查询对比期数据
         LambdaQueryWrapper<Order> compareWrapper = new LambdaQueryWrapper<>();
-        compareWrapper.eq(Order::getPayStatus, Order.PAY_STATUS_已支付)
+        compareWrapper.eq(Order::getPayStatus, OrderConstants.PAY_STATUS_PAID)
                       .ge(Order::getPayTime, compareStartTime)
                       .le(Order::getPayTime, compareEndTime);
         
@@ -324,7 +325,7 @@ public class DashboardServiceImpl implements DashboardService {
 
         // 未支付订单数
         long unpaidOrders = orderService.lambdaQuery()
-                .eq(Order::getStatus, Order.ORDER_STATUS_待支付)
+                .eq(Order::getStatus, OrderConstants.STATUS_PENDING_PAYMENT)
                 .count();
         result.put("unpaidOrders", unpaidOrders);
 

haha-service/src/main/java/com/haha/service/impl/DeviceServiceImpl.java

@@ -12,9 +12,9 @@ import com.haha.entity.Device;
 import com.haha.entity.Order;
 import com.haha.entity.Shop;
 import com.haha.mapper.DeviceMapper;
+import com.haha.mapper.ShopMapper;
 import com.haha.service.DeviceService;
 import com.haha.service.OrderService;
-import com.haha.service.ShopService;
 import com.haha.common.utils.OrderUtils;
 import com.haha.common.vo.OpenDoorVO;
 import com.haha.sdk.HahaClient;
@@ -37,7 +37,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
 
     private final HahaClient hahaClient;
     private final OrderService orderService;
-    private final ShopService shopService;
+    private final ShopMapper shopMapper;
 
     @Override
     public IPage<Device> getPage(int page, int pageSize, String deviceId, Long shopId, Integer status) {
@@ -272,7 +272,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
         
         // 填充门店信息
         if (device.getShopId() != null && device.getShopName() == null) {
-            Shop shop = shopService.getById(device.getShopId());
+            Shop shop = shopMapper.selectById(device.getShopId());
             if (shop != null) {
                 device.setShopName(shop.getName());
                 if (device.getAddress() == null) {