#MOD 设备冗余商户名称

device-api-service/src/main/java/com/xy/entity/DeviceInfo.java

@@ -120,4 +120,10 @@ public class DeviceInfo {
      * 更新时间
      */
     private LocalDateTime updateTime;
+
+    /**
+     * 商户名称
+     */
+    private String mercName;
+
 }

device-api-service/src/main/java/com/xy/entity/DeviceStatus.java

@@ -160,4 +160,14 @@ public class DeviceStatus {
      * 更新时间
      */
     private LocalDateTime updateTime;
+
+    /**
+     * 设备商品在售库存数
+     */
+    private Integer stock;
+
+    /**
+     * 最近一次补货后的库存数
+     */
+    private Integer afterFillStock;
 }

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -252,6 +252,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         Long mercId = auth.getMercId();
         String mercCode = auth.getMercCode();
         Long algorithmId = auth.getAlgorithmId();
+        String mercName = auth.getMercName();
         //商户最终设备列表
         List<Long> deviceIds = auth.getDeviceIds();
         List<DeviceInfo> devices = getDevicesByMercId(mercId);
@@ -266,7 +267,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         List<DeviceInfo> deviceInfos = this.listByIds(deviceIds);
         deviceInfos.forEach(deviceInfo -> {
             //绑定关系
-            deviceInfo.setMercId(mercId).setMercCode(mercCode).setAlgorithmId(algorithmId);
+            deviceInfo.setMercId(mercId).setMercCode(mercCode).setAlgorithmId(algorithmId).setMercName(mercName);
         });
         updateBatchById(deviceInfos);
         //原来存在的设备关系，不在最终设备列表中的移除
@@ -423,6 +424,10 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             vo.setPlaceLineId(v.getPlaceLineId());
             //线路下的设备列表
             List<DeviceInfoDto.MercHomeDeviceVo> deviceInfos = Beans.copy(DeviceInfoDto.MercHomeDeviceVo.class, deviceMap.get(placeLineId));
+//            deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId);
+            //状态信息
+//            DeviceStatusDto.Vo deviceStatus = deviceStatusService.obj(new DeviceStatusDto.Vo().setDeviceId(deviceInfo.getDeviceId())).getData();
+//            deviceStatusService.listByIds()
             deviceInfos.forEach(device -> {
                 //设备类型 反显
                 SysDictRedis dictDeviceType = SysDictUtils.get(DictConsts.DEVICE_TYPE, String.valueOf(device.getDeviceType()));
@@ -433,6 +438,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 //初始化数字
                 device.setDayOrderNum(0).setOnSaleNum(0).setFillNum(0).setDaySalesPrice("0");
                 //TODO: 数字统计
+                //可售库存
+
             });
             vo.setDeviceInfos(deviceInfos);
             dataList.add(vo);

device-api/src/main/java/com/xy/dto/DeviceInfoDto.java

@@ -392,13 +392,17 @@ public class DeviceInfoDto {
         @ApiModelProperty(value = "对应商户的全量设备ID(传空则取消商户所有机器)", required = false)
         private List<Long> deviceIds;
 
-        @ApiModelProperty(value = "商户ID")
+        @NotNull(message = "商户ID不可为空")
+        @ApiModelProperty(value = "商户ID", required = true)
         private Long mercId;
 
-        @ApiModelProperty(value = "商户编码", required = true)
+        @ApiModelProperty(value = "商户名称", required = false)
+        private String mercName;
+
+        @ApiModelProperty(value = "商户编码", required = false)
         private String mercCode;
 
-        @ApiModelProperty(value = "算法ID")
+        @ApiModelProperty(value = "算法ID", required = false)
         private Long algorithmId;
     }
 
@@ -438,7 +442,7 @@ public class DeviceInfoDto {
     @Data
     @Accessors(chain = true)
     public static class MercHomeQueryDTO {
-        
+
         @ApiModelProperty(value = "商户id")
         private Long mercId;
 

device-api/src/main/java/com/xy/dto/DeviceStatusDto.java

@@ -124,6 +124,18 @@ public class DeviceStatusDto {
         @ApiModelProperty("更新时间")
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
+
+        /**
+         * 设备商品在售库存数
+         */
+        @ApiModelProperty("可售库存")
+        private Integer stock;
+
+        /**
+         * 最近一次补货后的库存数
+         */
+        @ApiModelProperty("上次补货后库存")
+        private Integer afterFillStock;
     }
 
 }