Merge remote-tracking branch 'origin/master' into test

device-api-service/src/main/java/com/xy/job/MercFeeCountDayJob.java

@@ -89,7 +89,7 @@ public class MercFeeCountDayJob {
         if (StrUtil.isNotEmpty(date)) {
             queryDay = date;
 
-            //指定日期需要判断是否重复执行
+            // 指定日期需要判断是否重复执行
             MercFeeCountDayDto.SelectList selectList = new MercFeeCountDayDto.SelectList();
             selectList.setDateValue(Integer.valueOf(queryDay));
             List<MercFeeCountDayDto.Vo> vos = R.feignCheckData(mercFeeCountDayService.list(selectList));
@@ -116,18 +116,18 @@ public class MercFeeCountDayJob {
             Long parentMercId = merc.getId();
             List<Long> mercIds = R.feignCheckData(mercService.getChildMercIds(new MercDto.QuerySubDTO().setParentMercID(parentMercId)));
             if (CollUtil.isEmpty(mercIds)) {
-                //子商户都没有，就不用查分佣收益了
+                // 子商户都没有，就不用查分佣收益了
                 continue;
             }
             //~~~~~~~~~~~~~1设备管理费
             PageBean<DeviceChargingHistoryDto.PageVo> pageVoPageBean = getDeviceManagerFeeMerc(parentMercId, beginTime, endTime);
             List<DeviceChargingHistoryDto.PageVo> records = pageVoPageBean == null ? null : pageVoPageBean.getRecords();
             if (CollUtil.isNotEmpty(records)) {
-                //根据设备分组获取，每台设备缴费金额
+                // 根据设备分组获取，每台设备缴费金额
                 Map<Long, Integer> devicePayMoneyMap = records.stream()
                         .collect(Collectors.groupingBy(DeviceChargingHistoryDto.PageVo::getMercId,
                                 Collectors.summingInt(DeviceChargingHistoryDto.PageVo::getChargingMoney)));
-                //根据设备分组获取，每台设备佣金金额
+                // 根据设备分组获取，每台设备佣金金额
                 Map<Long, Integer> deviceAgentMoneyMap = records.stream()
                         .collect(Collectors.groupingBy(DeviceChargingHistoryDto.PageVo::getMercId,
                                 Collectors.summingInt(DeviceChargingHistoryDto.PageVo::getAgentMoney)));
@@ -149,7 +149,7 @@ public class MercFeeCountDayJob {
                 }
                 mercFeeCountDayService.saveBatch(saveMercFeeCountList);
             } else {
-                //没有费用的也要记录，为了前端收益概览的展示
+                // 没有费用的也要记录，为了前端收益概览的展示
                 List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                 for (Long mercId : mercIds) {
 
@@ -173,11 +173,11 @@ public class MercFeeCountDayJob {
             PageBean<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> deviceActiveFeeByMerc = getDeviceActiveFeeByMerc(parentMercId, beginTime, endTime);
             List<DeviceAlgorithmChargingHistoryDto.PageByTopMercVO> deviceActiveFeeList = deviceActiveFeeByMerc == null ? null : deviceActiveFeeByMerc.getRecords();
             if (CollUtil.isNotEmpty(deviceActiveFeeList)) {
-                //根据设备分组获取，每台设备缴费金额
+                // 根据设备分组获取，每台设备缴费金额
                 Map<Long, Integer> devicePayMoneyMap = deviceActiveFeeList.stream()
                         .collect(Collectors.groupingBy(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getMercId,
                                 Collectors.summingInt(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getChargingMoney)));
-                //根据设备分组获取，每台设备佣金金额
+                // 根据设备分组获取，每台设备佣金金额
                 Map<Long, Integer> deviceAgentMoneyMap = deviceActiveFeeList.stream()
                         .collect(Collectors.groupingBy(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getMercId,
                                 Collectors.summingInt(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getAgentMoney)));
@@ -199,7 +199,7 @@ public class MercFeeCountDayJob {
                 }
                 mercFeeCountDayService.saveBatch(saveMercFeeCountList);
             } else {
-                //没有费用的也要记录，为了前端收益概览的展示
+                // 没有费用的也要记录，为了前端收益概览的展示
                 List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                 for (Long mercId : mercIds) {
 
@@ -223,14 +223,14 @@ public class MercFeeCountDayJob {
             PageBean<MercDeviceAlgorithmChargingDto.PageByTopMercVO> deviceAgFeeByMerc = getDeviceAgFeeByMerc(parentMercId, beginTime, endTime);
             List<MercDeviceAlgorithmChargingDto.PageByTopMercVO> deviceAgFeeList = deviceAgFeeByMerc == null ? null : deviceAgFeeByMerc.getRecords();
             if (CollUtil.isNotEmpty(deviceAgFeeList)) {
-                //根据设备分组获取，每台设备缴费金额
+                // 根据设备分组获取，每台设备缴费金额
                 Map<Long, Integer> devicePayMoneyMap = deviceAgFeeList.stream()
                         .collect(Collectors.groupingBy(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getMercId,
                                 Collectors.summingInt(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getFeeBalance)));
-                //根据设备分组获取，每台设备佣金金额
+                // 根据设备分组获取，每台设备佣金金额
                 Map<Long, Integer> deviceAgentMoneyMap = deviceAgFeeList.stream()
                         .collect(Collectors.groupingBy(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getMercId,
-                                Collectors.summingInt(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getAgentMoney)));
+                                Collectors.summingInt(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getFee)));
                 Set<Long> subMercIdSet = devicePayMoneyMap.keySet();
                 List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                 for (Long mercId : subMercIdSet) {
@@ -240,6 +240,7 @@ public class MercFeeCountDayJob {
                     deviceDayFee.setFeeType(EnumMercFeeType.T3.getIntCode());
                     deviceDayFee.setParentMercId(parentMercId);
                     deviceDayFee.setDateValue(dateValue);
+                    deviceDayFee.setMonthValue(Integer.valueOf(monthValue));
                     deviceDayFee.setPayMoney(payMoney);
                     deviceDayFee.setBrokerage(brokerage);
                     deviceDayFee.setMercId(mercId);
@@ -248,7 +249,7 @@ public class MercFeeCountDayJob {
                 }
                 mercFeeCountDayService.saveBatch(saveMercFeeCountList);
             } else {
-                //没有费用的也要记录，为了前端收益概览的展示
+                // 没有费用的也要记录，为了前端收益概览的展示
                 List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                 for (Long mercId : mercIds) {
 
@@ -271,11 +272,11 @@ public class MercFeeCountDayJob {
             PageBean<DeviceSimChargeDto.PageByTopMercVO> simFeeByMerc = getSimFeeByMerc(parentMercId, beginTime, endTime);
             List<DeviceSimChargeDto.PageByTopMercVO> simFeeList = simFeeByMerc == null ? null : simFeeByMerc.getRecords();
             if (CollUtil.isNotEmpty(simFeeList)) {
-                //根据设备分组获取，每台设备缴费金额
+                // 根据设备分组获取，每台设备缴费金额
                 Map<Long, Integer> devicePayMoneyMap = simFeeList.stream()
                         .collect(Collectors.groupingBy(DeviceSimChargeDto.PageByTopMercVO::getMercId,
                                 Collectors.summingInt(DeviceSimChargeDto.PageByTopMercVO::getMoney)));
-                //根据设备分组获取，每台设备佣金金额
+                // 根据设备分组获取，每台设备佣金金额
                 Map<Long, Integer> deviceAgentMoneyMap = simFeeList.stream()
                         .collect(Collectors.groupingBy(DeviceSimChargeDto.PageByTopMercVO::getMercId,
                                 Collectors.summingInt(DeviceSimChargeDto.PageByTopMercVO::getAgentMoney)));
@@ -288,6 +289,7 @@ public class MercFeeCountDayJob {
                     deviceDayFee.setFeeType(EnumMercFeeType.T4.getIntCode());
                     deviceDayFee.setParentMercId(parentMercId);
                     deviceDayFee.setDateValue(dateValue);
+                    deviceDayFee.setMonthValue(Integer.valueOf(monthValue));
                     deviceDayFee.setPayMoney(payMoney);
                     deviceDayFee.setBrokerage(brokerage);
                     deviceDayFee.setMercId(mercId);
@@ -296,7 +298,7 @@ public class MercFeeCountDayJob {
                 }
                 mercFeeCountDayService.saveBatch(saveMercFeeCountList);
             } else {
-                //没有费用的也要记录，为了前端收益概览的展示
+                // 没有费用的也要记录，为了前端收益概览的展示
                 List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                 for (Long mercId : mercIds) {
 

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

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -54,14 +55,17 @@ public class DeviceConfigServiceImpl extends ServiceImpl<DeviceConfigMapper, Dev
     @ApiOperation("批量更新")
     public R batchUpdate(@RequestBody @Validated DeviceConfigDto.BatchUpdate batchUpdate) {
         List<Long> deviceIds = batchUpdate.getDeviceIds();
-        List<DeviceConfig> deviceConfigs = this.listByIds(deviceIds);
-        if (CollUtil.isNotEmpty(deviceConfigs)) {
-            deviceConfigs.forEach(d -> {
-                d.setTempMin(batchUpdate.getTempMin());
-                d.setTempMax(batchUpdate.getTempMax());
-                d.setStockOutGoodsNum(batchUpdate.getStockOutGoodsNum());
-                d.setStockOutRate(batchUpdate.getStockOutRate());
-                d.setUpdateTime(LocalDateTime.now());
+        List<DeviceConfig> deviceConfigs = new ArrayList<>();
+        if (CollUtil.isNotEmpty(deviceIds)) {
+            deviceIds.forEach(d -> {
+                DeviceConfig deviceConfig = new DeviceConfig();
+                deviceConfig.setDeviceId(d);
+                deviceConfig.setTempMin(batchUpdate.getTempMin());
+                deviceConfig.setTempMax(batchUpdate.getTempMax());
+                deviceConfig.setStockOutGoodsNum(batchUpdate.getStockOutGoodsNum());
+                deviceConfig.setStockOutRate(batchUpdate.getStockOutRate());
+                deviceConfig.setUpdateTime(LocalDateTime.now());
+                deviceConfigs.add(deviceConfig);
             });
             this.saveOrUpdateBatch(deviceConfigs);
         }