优化

car-wash-common/src/main/java/com/kym/common/handler/GlobalExceptionHandler.java

@@ -134,8 +134,8 @@ public class GlobalExceptionHandler {
 
     @ExceptionHandler(value = {Exception.class})
     public R handlerRestException(Exception e) {
-        LOGGER.info(e.getMessage(), e);
-        return R.failed();
+        LOGGER.error("系统异常: {}", e.getMessage(), e);
+        return R.failed(500, "系统繁忙，请稍后重试");  // 不暴露详细错误
     }
 
 

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

@@ -186,7 +186,7 @@ public class AdminUserServiceImpl extends MyBaseServiceImpl<AdminUserMapper, Adm
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void updateAdminUser(AdminUserVo adminUserVo) {
         AdminUser adminUser = new AdminUser();
         if (adminUserVo.getStatus() == AdminUser.STATUS_禁用) {

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

@@ -76,7 +76,7 @@ public class StationAccountServiceImpl extends MyBaseServiceImpl<StationAccountM
      * @return
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void applyWithdrawn(WithdrawnQueryParam params) {
         // 校验可提现金额
         var stationAccount = getStationAccount(params.getStationId());

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

@@ -80,9 +80,10 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
         // 校验用户是否有未完结的订单
         var unfinishedOrder = lambdaQuery()
                 .eq(WashOrder::getUserId, StpUtil.getLoginIdAsLong())
-                .eq(WashOrder::getOrderStatus, WashOrder.ORDER_STATUS_开机)
-                .or()
-                .eq(WashOrder::getPayStatus, WashOrder.PAY_STATUS_未支付)
+                .and(wrapper -> wrapper
+                        .eq(WashOrder::getOrderStatus, WashOrder.ORDER_STATUS_开机)
+                        .or()
+                        .eq(WashOrder::getPayStatus, WashOrder.PAY_STATUS_未支付))
                 .list();
         if (!unfinishedOrder.isEmpty()) {
             throw new BusinessException("您有未完结的订单！");

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

@@ -216,7 +216,7 @@ public class WxPayServiceImpl implements WxPayService {
      * JSAPI支付下单
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public PrepayWithRequestPaymentResponse wxPay(Long rechargeConfigId, String stationId) {
         // 充值配置
         var rechargeConfig = rechargeConfigService.getById(rechargeConfigId);