订单更新、结算调试

car-wash-service/src/main/java/com/kym/service/awoara/event/handle/OrderUpdateEventHandler.java

@@ -1,5 +1,6 @@
 package com.kym.service.awoara.event.handle;
 
+import com.alibaba.fastjson2.JSON;
 import com.kym.entity.awoara.MessageBody;
 import com.kym.entity.awoara.OrderInfoObject;
 import com.kym.entity.WashOrder;
@@ -50,7 +51,7 @@ public class OrderUpdateEventHandler implements AwoaraEventHandler<OrderInfoObje
                 .set(WashOrder::getDiscountMoney, orderInfo.getDiscount_money())
                 .set(WashOrder::getOperationRemainTime, orderInfo.getOperation_remain_time())
                 .set(WashOrder::getIdleRemainTime, orderInfo.getIdle_remain_time())
-                .set(WashOrder::getDetail, orderInfo.getDetail())
+                .set(WashOrder::getDetail, JSON.toJSONString(orderInfo.getDetail()))
                 .eq(WashOrder::getOrderId, orderInfo.getOrder_id())
                 .update();
 

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

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