充电代码清理等

car-wash-admin/src/main/java/com/kym/admin/controller/WashStationController.java

@@ -28,16 +28,6 @@ public class WashStationController {
         this.washStationService = stationService;
     }
 
-    @SysLog("充电站数据统计")
-    @GetMapping("/stationStatusDetail")
-    R<?> stationStatusDetail(@RequestParam("stationId") String stationId,
-                             @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String startTime,
-                             @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") String endTime) {
-        // 请求en+接口
-//        var response = stationService.stationStats(stationId, startTime, endTime);
-        return R.success();
-    }
-
     @SaCheckPermission("washStation.list")
     @SysLog("站点列表")
     @PostMapping("list")

car-wash-admin/src/main/resources/application-dev.yml

@@ -1,24 +1,3 @@
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: 5009db3dc1e94ea8
-  # 消息密钥
-  dataSecret: 8c15f5bf050948ba
-  # 消息密钥初始化向量
-  dataSecretIv: 915bea94fa13461d
-  # 签名密钥
-  sigSecret: 46050b0bb5b7415c
-  # 最小充电余额（分）
-  chargeMinAmount: 200
-  # 接口地址
-  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1//MA5HJNDG1/
-  # sass配置
-  sass: https://dev.en-plus.cn/Charge/op/login?username=快与慢&password=Admin123
-  # sass结算订单
-  sassClose: https://dev.en-plus.cn/Charge/op/analyze/order/close?orderCode=
-
 # 微信支付
 wechat:
   payment:

car-wash-admin/src/main/resources/application-prod.yml

@@ -1,24 +1,3 @@
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: c7fd9b753a9f434e
-  # 消息密钥
-  dataSecret: 5cb7e12da198420a
-  # 消息密钥初始化向量
-  dataSecretIv: 8a6ac88326bc4d3f
-  # 签名密钥
-  sigSecret: 2365b20f69e44817
-  # 最小充电余额（分）
-  chargeMinAmount: 200
-  # 接口地址
-  apiDomain: https://api.en-plus.cn:8080/Charge/evcs/v1//MA5HJNDG1/
-  # sass配置
-  sass: https://api.en-plus.cn:8080/Charge/op/login?username=快与慢工程&password=Kuaiyuman2o22
-  # sass结算订单
-  sassClose: https://api.en-plus.cn:8080/Charge/op/analyze/order/close?orderCode=
-
 # 微信支付
 wechat:
   payment:

car-wash-common/src/main/java/com/kym/common/constant/ResponseEnum.java

@@ -30,35 +30,9 @@ public enum ResponseEnum implements BusinessExceptionAssert {
     // 微信支付
     WX_PAY_AMOUNT_ERROR(300001,"微信支付金额异常"),
 
-
     // 登录 权限
     LOGIN_FAILED(10001, "用户名或密码错误"),
-    NO_PERMISSION(10002, "无访问权限"),
-    UNLOGIN(10003, "用户名未登录"),
-
-    // 订单
-    EQUIP_CONNECTOR_ID_ERROR(20000, "设备编码错误"),
-    ORDER_IN_PROGRESS(20001, "用户有进行中的订单"),
-    NO_ORDER_IN_PROGRESS(20002, "用户无进行中的订单"),
-    INSUFFICIENT_USER_BALANCE(20003, "用户余额不足"),
-    EN_PLUS_EQUIP_AUTH_FAIL(20004, "设备认证失败"),
-    EN_PLUS_EQUIP_NOT_CONNECTED(20005, "设备未连接"),
-    EN_PLUS_ORDER_IS_PARKING(20006, "此订单为停车中"),
-    EN_PLUS_ORDER_CLOSED(20007, "此订单已关闭"),
-    EN_PLUS_EQUIP_CHECK_FAIL(20008, "设备检测失败"),
-    EN_PLUS_EQUIP_START_FAIL(20009, "设备启动充电失败"),
-    EN_PLUS_EQUIP_NOT_EXIST(20010, "设备不存在"),
-    EN_PLUS_EQUIP_OFFLINE(20011, "设备离线"),
-    EN_PLUS_EQUIP_STOP_FAIL(20012, "设备停止充电失败"),
-    EN_PLUS_EQUIP_EXIST_ORDER_UNFINISHED(20013, "设备存在未完成的订单"),
-    ORDER_IN_BOOKING(20014, "用户有预约中的订单"),
-
-
-    // EN+
-    EN_PLUS_API_EXCEPTION(90000, "接口数据异常"),
-    EN_PLUS_QUERY_TOKEN_ERROR(90001, "TOKEN获取异常"),
-    EN_PLUS_PUSH_SIGN_FAIL(90002, "EN+推送数据验签失败"),
-    EN_PLUS_TOKEN_EXCEPTION(90003,"EN+TOKEN过期");
+    NO_PERMISSION(10002, "无访问权限");
 
     private final Integer code;
     private final String message;

car-wash-common/src/main/java/com/kym/common/exception/EnPushException.java

@@ -1,22 +0,0 @@
-package com.kym.common.exception;
-
-import com.kym.common.constant.IResponseCode;
-import lombok.Getter;
-
-/**
- * @author skyline
- * @description EN+推送数据数据异常
- * @date 2023-08-04 13:36
- */
-@Getter
-public class EnPushException extends RuntimeException {
-    Integer code;
-    String message;
-    Object data;
-
-    public EnPushException(IResponseCode responseEnum, Object data) {
-        this.code = responseEnum.getCode();
-        this.message = responseEnum.getMessage();
-        this.data = data;
-    }
-}

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

@@ -6,7 +6,6 @@ import cn.dev33.satoken.exception.NotRoleException;
 import com.kym.common.R;
 import com.kym.common.exception.BaseException;
 import com.kym.common.exception.BusinessException;
-import com.kym.common.exception.EnPushException;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.ConstraintViolationException;
 import jakarta.validation.ValidationException;
@@ -96,20 +95,6 @@ public class GlobalExceptionHandler {
         return R.failed(LOGIN_FAILED.getCode(), message);
     }
 
-
-    /**
-     * 处理EN+推送返回异常
-     *
-     * @param e
-     * @return
-     */
-    @ExceptionHandler(value = EnPushException.class)
-    @ResponseBody
-    public Object handleEnPushException(EnPushException e) {
-        return e.getData();
-    }
-
-
     /**
      * 校验异常处理
      *

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

@@ -34,7 +34,7 @@ public class ResponseResultHandler implements ResponseBodyAdvice {
     public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType,
                                   Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 
-        // 响应给en+,微信的信息不做处理
+        // 响应微信的信息不做处理
         if (body instanceof R<?> || body instanceof ResponseEntity) {
             return body;
         } else if (body == null) {

car-wash-entity/src/main/java/com/kym/entity/delay/DelayChargeOrder.java

@@ -1,53 +0,0 @@
-package com.kym.entity.delay;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 延迟队列使用充电订单对象
- *
- * @author skyline
- * @since 2023-08-08
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-public class DelayChargeOrder implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    private Long userId;
-
-    /**
-     * 充电订单号（EN+）
-     */
-    private String startChargeSeq;
-
-    /**
-     * 充电设备接口编码（EN+）
-     */
-    private String connectorId;
-
-    /**
-     * 充电开始时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
-
-    /**
-     * 充电结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime endTime;
-
-    /**
-     * 充电状态：1：启动中 2：充电中 3：停止中 4：已结束 5：未知
-     */
-    private Integer chargeStatus;
-
-}

car-wash-entity/src/main/java/com/kym/entity/queryParams/CommonQueryParam.java

@@ -24,6 +24,11 @@ public class CommonQueryParam extends PageParams {
      * 归属站点id
      */
     private String stationId;
+
+    public void setMobilePhone(String mobilePhone) {
+        this.mobilePhone = mobilePhone.replace(" ", "");
+    }
+
     /**
      * 手机号
      */

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

@@ -1,113 +0,0 @@
-package com.kym.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * @author skyline
- * @description 充电订单视图对象
- * @date 2023-10-20 14:50
- */
-@Data
-@Accessors(chain = true)
-public class ChargeOrderVo {
-
-    private Long userId;
-
-    private String stationId;
-
-    private String stationName;
-
-    /**
-     * 充电订单号（EN+）
-     */
-    private String startChargeSeq;
-
-    /**
-     * 充电设备接口编码（EN+）
-     */
-    private String connectorId;
-
-    /**
-     * 是否为预约订单：0-否 1-是
-     */
-    private Integer isBooking;
-
-    /**
-     * 充电开始时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime startTime;
-
-    /**
-     * 充电结束时间
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private LocalDateTime endTime;
-
-    /**
-     * 累积充电量（度）
-     */
-    private Double totalPower;
-
-    /**
-     * 累积总金额（元）
-     */
-    private Integer totalMoney;
-
-    /**
-     * 累积电费（元）
-     */
-    private Integer elecMoney;
-
-    /**
-     * 累积服务费（元）
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 实付金额（分）
-     */
-    private Integer payAmount;
-
-    /**
-     * 优惠金额（分）
-     */
-    private Integer discountAmount;
-
-    /**
-     * 服务费优惠抵扣金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 实付服务费金额（分）
-     */
-    private Integer payServiceAmount;
-
-    /**
-     * 优惠描述
-     */
-    private String rightsDesc;
-
-    /**
-     * 充电状态：1：启动中 2：充电中 3：停止中 4：已结束 5：未知
-     */
-    private Integer chargeStatus;
-
-    /**
-     * 发票状态：0：未开票 1：已开票
-     */
-    private Integer invoiceStatus;
-
-    /**
-     * 发票id
-     */
-    private Integer invoiceId;
-
-    private String discountType;
-
-}

car-wash-miniapp/src/main/resources/application-dev.yml

@@ -1,24 +1,3 @@
-# EN+充电配置
-en-plus:
-  # 运营商ID
-  operatorId: MA5HJNDG1
-  # 运营商密钥
-  operatorSecret: 5009db3dc1e94ea8
-  # 消息密钥
-  dataSecret: 8c15f5bf050948ba
-  # 消息密钥初始化向量
-  dataSecretIv: 915bea94fa13461d
-  # 签名密钥
-  sigSecret: 46050b0bb5b7415c
-  # 最小充电余额（分）
-  chargeMinAmount: 200
-  # 接口地址
-  apiDomain: https://dev.en-plus.cn/Charge/evcs/v1/MA5HJNDG1/
-  # sass配置
-  sass: https://dev.en-plus.cn/Charge/op/login?username=快与慢&password=Admin123
-  # sass结算订单
-  sassClose: https://dev.en-plus.cn/Charge/op/analyze/order/close?orderCode=
-
 # 微信支付
 wechat:
   payment:

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

@@ -132,7 +132,7 @@ public class StatServiceImpl implements StatService {
         // 截止到现在今日的所有洗车订单
         var todayOrders = washOrderService.lambdaQuery()
                 .eq(WashOrder::getStationId, stationId)
-                .lt(WashOrder::getStartTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
+                .ge(WashOrder::getStartTime, LocalDateTime.of(LocalDate.now(), LocalTime.MIN))
                 .list();
 
         // 今日概要

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

@@ -259,7 +259,7 @@ public class UserServiceImpl extends MPJBaseServiceImpl<UserMapper, User> implem
             params.setStationId(adminStationIds.get(0));
         }
         List<Long> userIds = lambdaQuery()
-                .eq(CommUtil.isNotEmptyAndNull(params.getMobilePhone()), User::getMobilePhone, params.getMobilePhone().replace(" ", ""))
+                .eq(CommUtil.isNotEmptyAndNull(params.getMobilePhone()), User::getMobilePhone, params.getMobilePhone())
                 .eq(CommUtil.isNotEmptyAndNull(params.getStationId()), User::getStationId, params.getStationId())
                 .eq(CommUtil.isNotEmptyAndNull(params.getStatus()), User::getStatus, params.getStatus())
                 .list().stream().map(User::getId)