From d01b043e25102ca5dcf15ed1b830999bb3bea4f32470be009a27e0742f725a47 Mon Sep 17 00:00:00 2001
From: PC <2413103649@qq.com>
Date: Tue, 27 Jan 2026 16:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cdzy/operations/model/dto/EbikeScanOrderDto.java   |  2 +-
 .../service/impl/EbikeBikeInfoServiceImpl.java         |  3 ++-
 .../service/impl/EbikeOperatorStaffServiceImpl.java    | 10 +++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
index 9e88f43..6e12d41 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
@@ -32,7 +32,7 @@ public class EbikeScanOrderDto implements Serializable {
     /**
      * 工单类型
      */
-    private Long orderType;
+    private Integer orderType;
 
     /**
      * 工单类型
diff --git a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
index d6f50aa..cf9c290 100644
--- a/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
+++ b/ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
@@ -587,7 +587,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
                         EBIKE_BIKE_ORDER.ORDER_TYPE,
                         EBIKE_BIKE_ORDER.RECEIVER_ID,
                         EBIKE_BIKE_ORDER.BIKE_CODE,
-                        EBIKE_BIKE_ORDER.ORDER_CODE
+                        EBIKE_BIKE_ORDER.ORDER_CODE,
+                        EBIKE_BIKE_ORDER.CREATED_AT
                 )
                 .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
                 .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));
diff --git a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java
index 090d3e8..6f2a954 100644
--- a/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java
+++ b/ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java
@@ -68,7 +68,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
                 throw new EbikeException("密码错误");
             } else {
                 StpUtil.login(ebikeOperatorStaff.getStaffId());
-                StaffInfo staffInfo = getStaffInfo();
+                StaffInfo staffInfo = getStaffInfoById(ebikeOperatorStaff.getStaffId());
                 ObjectMapper objectMapper = new ObjectMapper()
                         .registerModule(new JavaTimeModule())
                         .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
@@ -88,7 +88,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
                         EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID,
                         EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME,
                         EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME,
-                        EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS,EBIKE_OPERATOR_STAFF.CONTACT_PHONE
+                        EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS, EBIKE_OPERATOR_STAFF.CONTACT_PHONE
                 )
                 .where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(loginId));
         StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class);
@@ -129,7 +129,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
                     .contactPhone(staffVo.getContactPhone())
                     .build();
             staffMapper.insert(staff);
-            if (staffVo.getRoleIds() != null && !staffVo.getRoleIds().isEmpty()){
+            if (staffVo.getRoleIds() != null && !staffVo.getRoleIds().isEmpty()) {
                 List<EbikeStaffRole> list = staffVo.getRoleIds().stream().map(roleId -> EbikeStaffRole.builder()
                         .roleId(roleId)
                         .staffId(staff.getStaffId())
@@ -159,7 +159,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
             ebikeOperatorStaff.setUpdateBy(StpUtil.getLoginIdAsLong());
             ebikeOperatorStaff.setContactPhone(staffVo.getContactPhone());
             //禁用后踢下线
-            if (staffVo.getStatus() == StaffStatus.DISABLE){
+            if (staffVo.getStatus() == StaffStatus.DISABLE) {
                 StpUtil.logout(staffVo.getStaffId());
             }
             staffMapper.update(ebikeOperatorStaff);
@@ -197,7 +197,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
                         EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID,
                         EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME,
                         EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME,
-                        EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS,EBIKE_OPERATOR_STAFF.CONTACT_PHONE
+                        EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS, EBIKE_OPERATOR_STAFF.CONTACT_PHONE
                 )
                 .where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(staffId));
         StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class);