更新！

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceBindAreaParam.java

@@ -7,7 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 /**
- * 设备绑定区域的参数
+ * 设备编辑等参数
  *
  * @author TRX
  * @date 2024/10/10
@@ -23,6 +23,9 @@ public class DeviceBindAreaParam {
     @Schema(description = "设备名称")
     private String deviceName;
 
+    @Schema(description = "别名")
+    private String nickName;
+
     @Schema(description = "区域ID")
     private String areaId;
 

FullCardClient/src/main/java/com/zhongshu/card/client/model/devices/DeviceInfoModel.java

@@ -26,6 +26,9 @@ public class DeviceInfoModel extends SuperModel {
     @Schema(description = "设备名称")
     private String deviceName;
 
+    @Schema(description = "别名")
+    private String nickName;
+
     @Schema(description = "设备类型，如 消费机 门禁机")
     private DeviceType deviceType;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -38,6 +38,9 @@ public class DeviceInfo extends SuperMain {
     @Schema(description = "设备名称")
     private String deviceName;
 
+    @Schema(description = "别名")
+    private String nickName;
+
     @Schema(description = "关联的项目code")
     private String projectInfoCode;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/payment/ExpenseFlow.java

@@ -1,6 +1,7 @@
 package com.zhongshu.card.server.core.domain.payment;
 
 import cn.hutool.json.JSONObject;
+import com.github.microservice.models.type.DeviceType;
 import com.github.microservice.models.type.OrderFromType;
 import com.github.microservice.pay.client.model.ledger.TransactionLogModel;
 import com.github.microservice.types.OrderModeType;
@@ -109,6 +110,9 @@ public class ExpenseFlow extends SuperMain {
     @Schema(description = "消费机设备ID")
     private String deviceId;
 
+    @Schema(description = "设备类型")
+    private DeviceType deviceType;
+
     @Schema(description = "设备所属区域信息")
     private AreaSimpleModel area;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -128,6 +128,10 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
             deviceInfo.setProjectInfoName(projectInfo.getName());
         }
 
+        // 设备的别名
+        if (StringUtils.isEmpty(deviceInfo.getNickName())) {
+            deviceInfo.setNickName(deviceInfo.getDeviceName());
+        }
         deviceInfoDao.save(deviceInfo);
 
         // 修改其他的关联设备信息
@@ -419,7 +423,7 @@ public class DeviceInfoServiceImpl extends SuperService implements DeviceInfoSer
             }
         }
         deviceInfo.setAboutInfo(param.getAboutInfo());
-
+        deviceInfo.setNickName(param.getNickName());
         deviceInfoDao.save(deviceInfo);
 
         devicePermissEventService.sendDeviceChangeEvent(deviceInfo.getDeviceId(), deviceInfo.getProjectOid(), "updateDevice");

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -296,6 +296,8 @@ public class ExpenseFlowServiceImpl extends SuperService implements ExpenseFlowS
             entity.setShopOid(organization.getOid());
             // 订单关联的机构
             entity.setOid(organization.getOid());
+            // 设备类型
+            entity.setDeviceType(deviceInfo.getDeviceType());
 
             // 设备区域
             entity.setArea(areaService.toSimpleModel(deviceInfo.getArea()));