未消费可分账金额

admin-web/src/views/admin/station/account/index.vue

@@ -151,7 +151,7 @@ const state = reactive({
     {label: '站点名称', width: 200,prop: 'stationName', query: true, type: 'text', resizable: true},
     {label: '可提现金额（元）', width: 180,prop: 'balance', query: true, type: '', resizable: true},
     {label: '充值未消费金额（元）', width: 180,prop: 'frozenAmount', query: true, type: '', resizable: true},
-    {label: '未消费可分账金额（元）', width: 200,prop: 'frozenSplitAmount', query: true, type: '', resizable: true},
+    {label: '未消费可分账金额（元）', width: 200,prop: 'frozenAmountSplit', query: true, type: '', resizable: true},
     {label: '创建时间', width: 180,prop: 'createTime', query: true, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
     {label: '更新时间', width: 180,prop: 'updateTime', query: true, sortable: 'custom', type: 'datetime', resizable: true, conf: {format: (val: any) => u.fmt.fmtDate(val)}},
     // {                label: '操作', prop: 'action', type: 'render', width: 180, align: 'center', fixed: 'right',

car-wash-service/src/main/java/com/kym/service/impl/StationAccountServiceImpl.java

@@ -46,10 +46,11 @@ public class StationAccountServiceImpl extends MyBaseServiceImpl<StationAccountM
                 .eq(CommUtil.isNotEmptyAndNull(params.getStationId()), StationAccount::getStationId, params.getStationId())
                 .orderByDesc(StationAccount::getId)
                 .list();
-        var voList = list().stream().map(item -> {
+        var voList = res.stream().map(item -> {
             var vo = new StationAccountVo();
             BeanUtils.copyProperties(item, vo);
             vo.setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()));
+            vo.setFrozenAmountSplit((int) (item.getFrozenAmount() * (0.3 - 0.1)));
             return vo;
         }).toList();
         return new PageBean<>(voList);