Przeglądaj źródła

分账等调试

skyline 1 rok temu
rodzic
commit
81fefcbf6f

+ 2 - 2
car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderCloseEventHandler.java

@@ -154,7 +154,7 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setFromStationId(washOrder.getStationId())
                 .setToStationId(washOrder.getStationId())
                 .setTradeNo(washOrder.getOrderId())
-                .setAmount(unfreezeAmount)
+                .setAmount((int) (washOrder.getAmount() * 0.3))
                 .setType(SplitRecord.TYPE_UNFREEZE);
 
         // 基本户入账
@@ -162,7 +162,7 @@ public class OrderCloseEventHandler implements AwoaraEventHandler<OrderInfoObjec
                 .setFromStationId(washOrder.getStationId())
                 .setToStationId(washOrder.getStationId())
                 .setTradeNo(washOrder.getOrderId())
-                .setAmount(unfreezeAmount)
+                .setAmount(unfreezeAmount - platformAmount)
                 .setType(SplitRecord.TYPE_CONSUME);
 
         splitRecordService.saveBatch(List.of(splitRecord0, splitRecord1, splitRecord2));

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

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