Merge remote-tracking branch 'origin/master'

device-api-service-member/src/main/java/com/xy/controller/MemberDeviceController.java

@@ -37,10 +37,12 @@ public class MemberDeviceController {
         if (!Emptys.check(dto.getLon()) || !Emptys.check(dto.getLat())) {
             throw new CommRuntimeException("经纬度不能为空");
         }
+        String deviceName = dto.getDeviceName();
         MemberDeviceDTO.NearlyDeviceVO vo = new MemberDeviceDTO.NearlyDeviceVO();
         DeviceInfoDto.Page page = new DeviceInfoDto.Page();
         PageBean pageBean = new PageBean().setSize(-1L);
         page.setPage(pageBean);
+        page.setDeviceName(deviceName);
         page.setLimitNum(dto.getLimitNum());
         //冻结状态 1正常  2已冻结
         page.setFreezeStatus(1);

device-api-service-member/src/main/java/com/xy/dto/MemberDeviceDTO.java

@@ -17,6 +17,9 @@ public class MemberDeviceDTO {
     @Accessors(chain = true)
     public static class QueryNearlyDevice {
 
+        @ApiModelProperty(value = "设备名称", required = false)
+        private String deviceName;
+
         @NotBlank(message = "经度不能为空")
         @ApiModelProperty(value = "经度", required = true)
         private String lon;

device-api-service-merc-mini/src/main/java/com/xy/controller/MercMiniDeviceHomePageController.java

@@ -54,7 +54,7 @@ public class MercMiniDeviceHomePageController {
             day.setDayRefundMoney(todayRefundMoney);
             day.setSalesPrice(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum() - todayRefundMoney);
             day.setOrderNum(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
-            day.setRefundMoney(mercDataOneDay.stream().mapToInt(DeviceDataDto.Vo::getRefundMoney).sum());
+            day.setRefundMoney(hisRefundMoney + todayRefundMoney);
         }
         vo.setDay(day);
         //当月
@@ -66,7 +66,7 @@ public class MercMiniDeviceHomePageController {
             Integer monthRefundMoney = countByMonthVO.getMonthRefundMoney();
             month.setSalesPrice(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesMoney).sum() - monthRefundMoney);
             month.setOrderNum(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getSalesCount).sum());
-            month.setRefundMoney(mercDataOneMonth.stream().mapToInt(DeviceDataDto.Vo::getRefundMoney).sum());
+            month.setRefundMoney(hisMonthRefundMoney + monthRefundMoney);
             month.setMonthRefundMoney(monthRefundMoney);
             month.setMonthHisRefundMoney(hisMonthRefundMoney);
         }

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

@@ -85,6 +85,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
 
     private final RedisService<String> redisService;
 
+    private final GoodsService goodsService;
+
     private final String keyPrefix = "device:history:";
 
     private final FileUtils fileUtils;
@@ -581,6 +583,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             //设备销售统计
             String todayDate = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN);
             List<Long> deviceIds = deviceInfos.stream().map(DeviceInfoDto.MercHomeDeviceVo::getDeviceId).collect(Collectors.toList());
+
             //统计条件：当天
             DeviceDataDto.ListDTO deviceDataListDTO = new DeviceDataDto.ListDTO()
                     .setDeviceIds(deviceIds).setType(DictSonEnum.DEVICE_DATA_TYPE_DAY.getKey()).setDateValue(Integer.valueOf(todayDate)).setMercId(mercId);
@@ -597,7 +600,8 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
             if (CollUtil.isNotEmpty(deviceStatusList)) {
                 datdeviceStatusMap = deviceStatusList.stream().collect(Collectors.toMap(DeviceStatusDto.Vo::getDeviceId, d -> d));
             }
-
+            List<GoodsDeviceDto.Vo> goodsDeviceList = R.feignCheckData(goodsService.queryGoodsDeviceInfo(new GoodsDto.QueryGoodsDeviceInfo().setDeviceIds(deviceIds)));
+            Map<Long, GoodsDeviceDto.Vo> deviceIdGoodsMap = goodsDeviceList.stream().collect(Collectors.toMap(GoodsDeviceDto.Vo::getDeviceId, d -> d));
             for (DeviceInfoDto.MercHomeDeviceVo device : deviceInfos) {
                 Long dId = device.getDeviceId();
                 //设备类型 反显
@@ -607,15 +611,14 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 SysDictRedis dictBusyState = SysDictUtils.get(DictConsts.DEVICE_BUSY_STATUS, String.valueOf(device.getBusyState()));
                 device.setBusyStateName(dictBusyState.getMsg());
                 DeviceDataDto.Vo deviceData = dataMap.get(dId);
-
+                Integer zero = new Integer(0);
                 //今日销售、库存情况 反显
-                device.setDayOrderNum(deviceData != null ? deviceData.getSalesCount() : 0);
-                device.setDaySalesPrice(deviceData != null ? deviceData.getSalesMoney() : 0);
+                device.setDayOrderNum(deviceData != null ? deviceData.getSalesCount() : zero);
+                device.setDaySalesPrice(deviceData != null ? deviceData.getSalesMoney() : zero);
                 DeviceStatusDto.Vo deviceStatus = datdeviceStatusMap.get(device.getDeviceId());
-                Integer stock = Emptys.check(deviceStatus.getStock()) ? deviceStatus.getStock() : 0;
-                device.setOnSaleNum(stock);
-                Integer afterFillStock = Emptys.check(deviceStatus.getAfterFillStock()) ? deviceStatus.getAfterFillStock() : 0;
-                device.setFillNum(afterFillStock);
+                GoodsDeviceDto.Vo goodsDevice = deviceIdGoodsMap.get(dId);
+                device.setOnSaleNum(goodsDevice == null ? zero : goodsDevice.getStock());
+                device.setFillNum(goodsDevice == null ? zero : goodsDevice.getFillCount());
                 //联网状态
                 Integer netState = deviceStatus == null ? DeviceNetSateType.DISCONNECT.getCode() : deviceStatus.getNetState();
                 device.setNetState(netState);
@@ -980,6 +983,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
         //根据设备ID查商品id
         GoodsDeviceDto.SelectList selectList = new GoodsDeviceDto.SelectList();
         selectList.setDeviceIds(CollUtil.newArrayList(deviceId));
+        selectList.setMercId(dto.getMercId());
         R<List<GoodsDeviceDto.Vo>> r = R.feignCheck(goodsDeviceService.list(selectList));
         List<GoodsDeviceDto.Vo> goodsDeviceList = r.getData();
         goodsData.setCategoryNum(CollUtil.isNotEmpty(goodsDeviceList) ? goodsDeviceList.size() : 0);

device-api-service/src/main/resources/mapper/DeviceInfoMapper.xml

@@ -171,7 +171,7 @@
         </if>
 
         <if test="queryPage.deviceName != null and queryPage.deviceName != ''">
-            and LOCATE(#{queryPage.deviceName}, sysinfo.device_name) > 0
+            and LOCATE(#{queryPage.deviceName}, info.device_name) > 0
         </if>
         <if test="queryPage.no != null and queryPage.no != ''">
             and (