商家支出流水增加余额抵扣返回

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xy.collections.list.JArrayList;
-import com.xy.dto.DeviceAlgorithmChargingHistoryDto;
-import com.xy.dto.DeviceInfoDto;
-import com.xy.dto.MercFeeConfigDto;
-import com.xy.dto.OrderMercManageDto;
+import com.xy.dto.*;
 import com.xy.dto.be.MercDto;
 import com.xy.entity.DeviceAlgorithmChargingHistory;
 import com.xy.mapper.DeviceAlgorithmChargingHistoryMapper;
@@ -145,19 +142,13 @@ public class DeviceAlgorithmChargingHistoryServiceImpl extends ServiceImpl<Devic
         PageBean<DeviceAlgorithmChargingHistoryDto.MySpendPageVO> voPageBean = toPageBean(DeviceAlgorithmChargingHistoryDto.MySpendPageVO.class, iPage);
         List<DeviceAlgorithmChargingHistoryDto.MySpendPageVO> records = voPageBean.getRecords();
         if (Emptys.check(records)) {
-
-
-            List<Long> deviceIds = records.stream().map(DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getDeviceId).distinct().collect(Collectors.toList());
-
-            List<DeviceInfoDto.Vo> deviceList = R.feignCheckData(deviceInfoService.listCommon(new DeviceInfoDto.ListCommon().setDeviceIds(deviceIds)));
-            Map<Long, DeviceInfoDto.Vo> devcieMap = deviceList.stream().collect(Collectors.toMap(DeviceInfoDto.Vo::getDeviceId, d -> d));
+            List<OrderMercManageDto.Vo> orderMercManages = orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getOrderId))).getData();
             copy(records)
-                    .target(() -> orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getOrderId))).getData()
-                            , DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getOrderId, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles
-                    ).target(() -> mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getMercId).comparing())).getData()
+                    .target(() -> orderMercManages, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getOrderId, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles)
+                    .target(() -> orderMercManages, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getOrderId, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getBalanceMone, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getBalanceMoney)
+                    .target(() -> mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getMercId).comparing())).getData()
                             , DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getMercId, DeviceAlgorithmChargingHistoryDto.MySpendPageVO::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                     .builder();
-
         }
         return R.ok(voPageBean);
 

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

@@ -73,10 +73,6 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
 
     private FileConfig fileConfig;
 
-    private DeviceChargingConfigServiceImpl deviceChargingConfigService;
-
-    private DeviceInfoService deviceInfoService;
-
     private MercFeeConfigService mercFeeConfigService;
 
     private DeviceChargingServiceImpl deviceChargingService;
@@ -94,12 +90,12 @@ public class DeviceChargingHistoryServiceImpl extends ServiceImpl<DeviceCharging
         PageBean<DeviceChargingHistoryDto.Vo> pageBean = toPageBean(DeviceChargingHistoryDto.Vo.class, iPage);
         List<DeviceChargingHistoryDto.Vo> records = pageBean.getRecords();
         if (Emptys.check(records)) {
+            List<OrderMercManageDto.Vo> orderMercManages = orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceChargingHistoryDto.Vo::getOrderId))).getData();
+            List<MercDto.Vo> mercs = mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceChargingHistoryDto.Vo::getMercId).comparing())).getData();
             copy(records)
-                    .target(() -> orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceChargingHistoryDto.Vo::getOrderId))).getData()
-                            , DeviceChargingHistoryDto.Vo::getOrderId, DeviceChargingHistoryDto.Vo::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles
-                    )
-                    .target(() -> mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceChargingHistoryDto.Vo::getMercId).comparing())).getData(),
-                            DeviceChargingHistoryDto.Vo::getMercId, DeviceChargingHistoryDto.Vo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
+                    .target(() -> orderMercManages, DeviceChargingHistoryDto.Vo::getOrderId, DeviceChargingHistoryDto.Vo::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles)
+                    .target(() -> orderMercManages, DeviceChargingHistoryDto.Vo::getOrderId, DeviceChargingHistoryDto.Vo::getBalanceMone, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getBalanceMoney)
+                    .target(() -> mercs, DeviceChargingHistoryDto.Vo::getMercId, DeviceChargingHistoryDto.Vo::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                     .builder();
         }
         return R.ok(pageBean);

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

@@ -14,6 +14,7 @@ import com.xy.collections.list.JList;
 import com.xy.config.DeviceThreadPoolConfig;
 import com.xy.config.FileConfig;
 import com.xy.device.EnumSimConfig;
+import com.xy.dto.DeviceAlgorithmChargingHistoryDto;
 import com.xy.dto.DeviceSimChargeDto;
 import com.xy.dto.MercFeeConfigDto;
 import com.xy.dto.OrderMercManageDto;
@@ -208,10 +209,11 @@ public class DeviceSimChargeServiceImpl extends ServiceImpl<DeviceSimChargeMappe
         List<DeviceSimChargeDto.MySpendPageVO> records = voPageBean.getRecords();
 
         if (Emptys.check(records)) {
+            List<OrderMercManageDto.Vo> orderMercManages = orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceSimChargeDto.MySpendPageVO::getOrderId))).getData();
             copy(records)
-                    .target(() -> orderMercManageService.list(new OrderMercManageDto.SelectList().setId(new JArrayList<>(records).getProperty(DeviceSimChargeDto.MySpendPageVO::getOrderId))).getData()
-                            , DeviceSimChargeDto.MySpendPageVO::getOrderId, DeviceSimChargeDto.MySpendPageVO::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles
-                    ).target(() -> mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceSimChargeDto.MySpendPageVO::getMercId).comparing())).getData()
+                    .target(() -> orderMercManages, DeviceSimChargeDto.MySpendPageVO::getOrderId, DeviceSimChargeDto.MySpendPageVO::getFiles, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getFiles)
+                    .target(() -> orderMercManages, DeviceSimChargeDto.MySpendPageVO::getOrderId, DeviceSimChargeDto.MySpendPageVO::getBalanceMone, OrderMercManageDto.Vo::getId, OrderMercManageDto.Vo::getBalanceMoney)
+                    .target(() -> mercService.list(new MercDto.SelectList().setMercIds(new JArrayList<>(records).getProperty(DeviceSimChargeDto.MySpendPageVO::getMercId).comparing())).getData()
                             , DeviceSimChargeDto.MySpendPageVO::getMercId, DeviceSimChargeDto.MySpendPageVO::getMercName, MercDto.Vo::getId, MercDto.Vo::getName)
                     .builder();
             List<String> simIds = records.stream().map(DeviceSimChargeDto.MySpendPageVO::getSimId).collect(Collectors.toList());

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

@@ -86,6 +86,9 @@ public class DeviceAlgorithmChargingHistoryDto {
         @ApiModelProperty(value = "附件")
         private String files;
 
+        @ApiModelProperty(value = "余额抵扣")
+        private Integer balanceMone;
+
     }
 
     @Data

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

@@ -268,11 +268,14 @@ public class DeviceChargingHistoryDto {
         @ApiModelProperty(value = "备注")
         private String note;
 
+        @ApiModelProperty(value = "商户名称")
+        private String mercName;
+
         @ApiModelProperty(value = "附件")
         private String files;
 
-        @ApiModelProperty(value = "商户名称")
-        private String mercName;
+        @ApiModelProperty(value = "余额抵扣")
+        private Integer balanceMone;
     }
 
     @Data

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

@@ -203,13 +203,14 @@ public class DeviceSimChargeDto {
         @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime updateTime;
 
-        @ApiModelProperty(value = "附件")
-        private String files;
-
         @ApiModelProperty(value = "商户名称")
         private String mercName;
 
+        @ApiModelProperty(value = "附件")
+        private String files;
 
+        @ApiModelProperty(value = "余额抵扣")
+        private Integer balanceMone;
     }