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

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

@@ -17,6 +17,7 @@ import com.xy.dto.*;
 import com.xy.dto.be.MercDto;
 import com.xy.dto.common.MercPlaceDto;
 import com.xy.entity.*;
+import com.xy.enums.LogEnum;
 import com.xy.enums.MercStatus;
 import com.xy.service.*;
 import com.xy.service.be.MercFeignService;
@@ -89,7 +90,7 @@ public class MercMiniDeviceController {
         redisService.remove("device:auth:code:" + deviceId);
     }
 
-    @LogOperate
+    @LogOperate(logType = LogEnum.LogType.V2, optType = LogEnum.OptType.V2, logContent = "解绑商户")
     @ApiOperation("解绑商户")
     @PostMapping("unBindMercDevice")
     R<Boolean> unBindMercDevice(@RequestBody @Validated DeviceInfoDto.MercDeviceUnBindDto dto) {
@@ -102,7 +103,7 @@ public class MercMiniDeviceController {
         return R.ok(deviceInfoService.unBindDeviceByMerc(dto)).setLogMsg(log);
     }
 
-    @LogOperate
+    @LogOperate(logType = LogEnum.LogType.V2, optType = LogEnum.OptType.V2, logContent = "商户设备授权")
     @ApiOperation("商户设备授权")
     @PostMapping("deviceAuth")
     public R mercDeviceAuth(@RequestBody @Validated DeviceInfoDto.MercDeviceAuthDto auth) {

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

@@ -90,7 +90,7 @@ public class MercFeeCountDayJob {
             return R.ok();
         }
 
-
+        List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
         for (MercDto.Vo merc : approvedMercList) {
             Long parentMercId = merc.getId();
             List<Long> mercIds = R.feignCheckData(mercService.getChildMercIds(new MercDto.QuerySubDTO().setParentMercID(parentMercId)));
@@ -112,7 +112,6 @@ public class MercFeeCountDayJob {
                             .collect(Collectors.groupingBy(DeviceChargingHistoryDto.PageVo::getMercId,
                                     Collectors.summingInt(DeviceChargingHistoryDto.PageVo::getAgentMoney)));
                     Set<Long> subMercIdSet = devicePayMoneyMap.keySet();
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : subMercIdSet) {
                         Integer payMoney = devicePayMoneyMap.get(mercId);
                         Integer brokerage = deviceAgentMoneyMap.get(mercId);
@@ -127,10 +126,8 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 } else {
                     // 没有费用的也要记录，为了前端收益概览的展示
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : mercIds) {
 
                         MercFeeCountDay deviceDayFee = new MercFeeCountDay();
@@ -144,7 +141,6 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 }
             } else if (type == 2) {
                 //~~~~~~~~~~~~~2设备激活费
@@ -160,7 +156,6 @@ public class MercFeeCountDayJob {
                             .collect(Collectors.groupingBy(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getMercId,
                                     Collectors.summingInt(DeviceAlgorithmChargingHistoryDto.PageByTopMercVO::getAgentMoney)));
                     Set<Long> subMercIdSet = devicePayMoneyMap.keySet();
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : subMercIdSet) {
                         Integer payMoney = devicePayMoneyMap.get(mercId);
                         Integer brokerage = deviceAgentMoneyMap.get(mercId);
@@ -175,10 +170,8 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 } else {
                     // 没有费用的也要记录，为了前端收益概览的展示
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : mercIds) {
 
                         MercFeeCountDay deviceDayFee = new MercFeeCountDay();
@@ -192,7 +185,6 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 }
 
             } else if (type == 3) {
@@ -209,7 +201,6 @@ public class MercFeeCountDayJob {
                             .collect(Collectors.groupingBy(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getMercId,
                                     Collectors.summingInt(MercDeviceAlgorithmChargingDto.PageByTopMercVO::getFee)));
                     Set<Long> subMercIdSet = devicePayMoneyMap.keySet();
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : subMercIdSet) {
                         Integer payMoney = devicePayMoneyMap.get(mercId);
                         Integer brokerage = deviceAgentMoneyMap.get(mercId);
@@ -224,10 +215,8 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 } else {
                     // 没有费用的也要记录，为了前端收益概览的展示
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : mercIds) {
 
                         MercFeeCountDay deviceDayFee = new MercFeeCountDay();
@@ -241,7 +230,6 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 }
 
             } else if (type == 4) {
@@ -258,7 +246,6 @@ public class MercFeeCountDayJob {
                             .collect(Collectors.groupingBy(DeviceSimChargeDto.PageByTopMercVO::getMercId,
                                     Collectors.summingInt(DeviceSimChargeDto.PageByTopMercVO::getAgentMoney)));
                     Set<Long> subMercIdSet = devicePayMoneyMap.keySet();
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : subMercIdSet) {
                         Integer payMoney = devicePayMoneyMap.get(mercId);
                         Integer brokerage = deviceAgentMoneyMap.get(mercId);
@@ -273,10 +260,8 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 } else {
                     // 没有费用的也要记录，为了前端收益概览的展示
-                    List<MercFeeCountDay> saveMercFeeCountList = new ArrayList<>();
                     for (Long mercId : mercIds) {
 
                         MercFeeCountDay deviceDayFee = new MercFeeCountDay();
@@ -290,12 +275,11 @@ public class MercFeeCountDayJob {
                         deviceDayFee.setParentMercId(parentMercId);
                         saveMercFeeCountList.add(deviceDayFee);
                     }
-                    return R.ok(saveMercFeeCountList);
                 }
 
             }
         }
-        return R.ok();
+        return R.ok(saveMercFeeCountList);
     }