分账等调试

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

@@ -94,7 +94,7 @@
             <template v-else-if="field.prop==='type'">
               <ext-d-label type="Object.type" :model-value="row[field.prop]"></ext-d-label>
             </template>
-            <template v-else-if="['balance','frozenAmount','frozenAmountSplit','amount'].includes(field.prop)">
+            <template v-else-if="['balance','frozenAmount','unusedAmount','frozenAmountSplit','amount'].includes(field.prop)">
               {{ u.fmt.fmtMoney(row[field.prop]) }}
             </template>
             <template v-else-if="field.prop==='idleRemainTime'||field.prop==='operationRemainTime'">
@@ -157,7 +157,8 @@ const state = reactive({
     // {label: '站点ID', width: 100,prop: 'stationId', query: true, type: 'text', resizable: true},
     {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: 180, prop: 'frozenAmount', query: true, type: '', resizable: true},
+    {label: '充值未消费金额（元）', width: 180, prop: 'unusedAmount', 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)}},

car-wash-entity/src/main/java/com/kym/entity/vo/StationAccountVo.java

@@ -33,6 +33,11 @@ public class StationAccountVo extends BaseEntity {
      */
     private Integer frozenAmount;
 
+    /**
+     * 充值未消费金额（分）
+     */
+    private Integer unusedAmount;
+
     /**
      * 未消费可分账金额（分）
      */

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

@@ -50,8 +50,9 @@ public class StationAccountServiceImpl extends MyBaseServiceImpl<StationAccountM
             var vo = new StationAccountVo();
             BeanUtils.copyProperties(item, vo);
             vo.setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()));
-            // todo 0.1为平台服务费比例
-            vo.setFrozenAmountSplit((int) (item.getFrozenAmount() * (1 - 0.1)));
+            vo.setUnusedAmount((int) (item.getFrozenAmount() / 0.3));
+            // 0.1为平台服务费比例
+            vo.setFrozenAmountSplit((int) (vo.getUnusedAmount() * (1 - 0.1)));
             return vo;
         }).toList();
         return new PageBean<>(voList);