Browse Source

删除多余代码

skyline 1 năm trước cách đây
mục cha
commit
6518641135
31 tập tin đã thay đổi với 0 bổ sung1417 xóa
  1. 0 1
      car-wash-admin/src/main/java/com/kym/admin/controller/CustomController.java
  2. 0 3
      car-wash-admin/src/main/java/com/kym/admin/controller/StatController.java
  3. 0 95
      car-wash-entity/src/main/java/com/kym/entity/admin/ConnectorInfo.java
  4. 0 152
      car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java
  5. 0 60
      car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentRelation.java
  6. 0 190
      car-wash-entity/src/main/java/com/kym/entity/admin/Station.java
  7. 0 94
      car-wash-entity/src/main/java/com/kym/entity/admin/StationStatDay.java
  8. 0 111
      car-wash-entity/src/main/java/com/kym/entity/admin/StationStatMonth.java
  9. 0 170
      car-wash-entity/src/main/java/com/kym/entity/miniapp/ChargeOrder.java
  10. 0 1
      car-wash-entity/src/main/java/com/kym/entity/miniapp/other/DiscountCompute.java
  11. 0 16
      car-wash-mapper/src/main/java/com/kym/mapper/admin/ConnectorInfoMapper.java
  12. 0 16
      car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentInfoMapper.java
  13. 0 16
      car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentRelationMapper.java
  14. 0 16
      car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatDayMapper.java
  15. 0 16
      car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatMonthMapper.java
  16. 0 33
      car-wash-mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java
  17. 0 53
      car-wash-miniapp/src/main/java/com/kym/miniapp/jobs/EquipmentChargeStatusJob.java
  18. 0 24
      car-wash-service/src/main/java/com/kym/service/admin/ConnectorInfoService.java
  19. 0 16
      car-wash-service/src/main/java/com/kym/service/admin/StationStatDayService.java
  20. 0 21
      car-wash-service/src/main/java/com/kym/service/admin/StationStatMonthService.java
  21. 0 151
      car-wash-service/src/main/java/com/kym/service/admin/impl/StatementsServiceImpl.java
  22. 0 20
      car-wash-service/src/main/java/com/kym/service/admin/impl/StationStatDayServiceImpl.java
  23. 0 45
      car-wash-service/src/main/java/com/kym/service/admin/impl/StationStatMonthServiceImpl.java
  24. 0 50
      car-wash-service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java
  25. 0 9
      car-wash-service/src/main/java/com/kym/service/miniapp/DiscountService.java
  26. 0 22
      car-wash-service/src/main/java/com/kym/service/miniapp/UserStationService.java
  27. 0 7
      car-wash-service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java
  28. 0 2
      car-wash-service/src/main/java/com/kym/service/miniapp/impl/CouponDiscountHandle.java
  29. 0 2
      car-wash-service/src/main/java/com/kym/service/miniapp/impl/NoDiscountHandle.java
  30. 0 2
      car-wash-service/src/main/java/com/kym/service/miniapp/impl/RechargeRightsDiscountHandle.java
  31. 0 3
      car-wash-service/src/main/java/com/kym/service/miniapp/impl/UserStationServiceImpl.java

+ 0 - 1
car-wash-admin/src/main/java/com/kym/admin/controller/CustomController.java

@@ -5,7 +5,6 @@ import com.kym.common.R;
 import com.kym.common.annotation.SysLog;
 import com.kym.entity.admin.queryParams.CommonQueryParam;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.PayLogService;
 import com.kym.service.miniapp.UserService;
 import jakarta.servlet.http.HttpServletResponse;

+ 0 - 3
car-wash-admin/src/main/java/com/kym/admin/controller/StatController.java

@@ -1,11 +1,8 @@
 package com.kym.admin.controller;
 
 import com.kym.common.R;
-import com.kym.entity.admin.StationStatMonth;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import com.kym.service.admin.StationStatMonthService;
-import com.kym.service.miniapp.ChargeOrderService;
 import org.springframework.web.bind.annotation.*;
 
 /**

+ 0 - 95
car-wash-entity/src/main/java/com/kym/entity/admin/ConnectorInfo.java

@@ -1,95 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-
-/**
- * <p>
- * 充电桩接口(枪)信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-@Getter
-@Setter
-@TableName("t_connector_info")
-@Accessors(chain = true)
-public class ConnectorInfo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 充电桩序列号
-     */
-    private String equipmentId;
-
-    /**
-     * 充电桩接口序列号
-     */
-    private String connectorId;
-
-    /**
-     * 充电桩名称
-     */
-    private String connectorName;
-
-    /**
-     * 充电设备接口类型:1家用插座(模式2)2:交流接口插座(模式3,连接方式B)3:交流接口插头(带枪线,模式3,连接方式C)4:直流接口枪头(带枪线,模式4)5:无线充电座6:其他
-     */
-    private Integer connectorType;
-
-    /**
-     * 额定电压上限(V)
-     */
-    private Integer voltageUpperLimits;
-
-    /**
-     * 额定电压下限(V)
-     */
-    private Integer voltageLowerLimits;
-
-    /**
-     * 额定电流
-     */
-    private Integer current;
-
-    /**
-     * 额定功率
-     */
-    private Double power;
-
-    /**
-     * 停车场车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 国家标准:1:2011 2:2015
-     */
-    private Integer nationalStandard;
-
-    /**
-     * 充电设备接口状态
-     * 0:离网
-     * 1:空闲
-     * 2:占用(未充电)
-     * 3:占用(充电中)
-     * 4:占用(预约锁定)
-     * 255:故障
-     */
-    private Integer status;
-
-}

+ 0 - 152
car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentInfo.java

@@ -1,152 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.kym.entity.BaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * <p>
- * 充电桩桩体设备
- * </p>
- *
- * @author skyline
- * @since 2023-09-01
- */
-@Data
-@TableName("t_equipment_info")
-@Accessors(chain = true)
-public class EquipmentInfo extends BaseEntity {
-
-    public static int SERVICE_STATUS_离线 = 0;
-    public static int SERVICE_STATUS_空闲 = 1;
-    public static int SERVICE_STATUS_已连接 = 2;
-    public static int SERVICE_STATUS_充电中 = 3;
-    public static int SERVICE_STATUS_预约中 = 4;
-    public static int SERVICE_STATUS_故障 = 255;
-
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点编号  eg:001,002
-     */
-    @TableField(exist = false)
-    private String stationNo;
-
-    /**
-     * 站点名称
-     */
-    @TableField(exist = false)
-    private String stationName;
-
-    /**
-     * 充电桩序列号
-     */
-    private String equipmentId;
-
-    /**
-     * 充电桩短编号
-     */
-    @TableField(exist = false)
-    private String shortId;
-
-    /**
-     * 设备生产商组织机构代码
-     */
-    private String manufacturerId;
-
-    /**
-     * 设备生产商名称
-     */
-    private String manufacturerName;
-
-    /**
-     * 设备型号
-     */
-    private String equipmentModel;
-
-    /**
-     * 设备生产日期
-     */
-    private String productionDate;
-
-    /**
-     * 设备类型:1:直流设备 2:交流设备 3:交直流一体设备 4:无线设备 5:其他
-     */
-    private Integer equipmentType;
-
-    /**
-     * 车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-
-    /**
-     * 额定功率 千瓦
-     */
-    private Double power;
-
-    /**
-     * 网络状态:0-离线 1-在线
-     */
-    private Integer netStatus;
-
-    /**
-     * 服务状态:0-离网 1-空闲 2-已连接 3-充电中 4-预约中 255-故障
-     */
-    private Integer serviceStatus;
-
-
-    /**
-     * 充电接口列表
-     */
-    @TableField(exist = false)
-    private List<ConnectorInfo> connectorInfos;
-
-
-    public EquipmentInfo setStationId(String stationId) {
-        this.stationId = stationId;
-        return this;
-    }
-
-
-    public EquipmentInfo setShortId(String shortId) {
-        this.shortId = shortId;
-        if (shortId != null) {
-            setStationNo(shortId.substring(0, 3));
-        }
-        return this;
-    }
-
-    public EquipmentInfo setPower(Double power) {
-        this.power = power;
-        return this;
-    }
-
-    public EquipmentInfo setStationName(String stationName) {
-        this.stationName = stationName;
-        return this;
-    }
-}

+ 0 - 60
car-wash-entity/src/main/java/com/kym/entity/admin/EquipmentRelation.java

@@ -1,60 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author skyline
- * @since 2023-08-07
- */
-@Data
-@Accessors(chain = true)
-@TableName("t_equipment_relation")
-public class EquipmentRelation extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * EN+站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 二维码sn号
-     */
-    private String shortId;
-
-    /**
-     * EN+充电的sn号
-     */
-    private String equipmentId;
-    /**
-     * 充电枪口编号
-     */
-    private String connectorId;
-
-    /**
-     * 停车位编号
-     */
-    private String parkingNo;
-
-    /**
-     * 状态 0:启用,1:未启用
-     */
-    private Integer status;
-
-
-}

+ 0 - 190
car-wash-entity/src/main/java/com/kym/entity/admin/Station.java

@@ -1,190 +0,0 @@
-package com.kym.entity.admin;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.alibaba.fastjson2.annotation.JSONField;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-
-/**
- * <p>
- * 充电站信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-@Getter
-@Setter
-@TableName(value = "t_station", autoResultMap = true)
-@Accessors(chain = true)
-public class Station extends BaseEntity implements Serializable {
-
-    // 站点状态:0:未知 1:建设中 5:关闭下线 6:维护中 50:正常使用
-    public static final int STATION_STATUS_未知 = 0;
-    public static final int STATION_STATUS_建设中 = 1;
-    public static final int STATION_STATUS_关闭下线 = 5;
-    public static final int STATION_STATUS_维护中 = 6;
-    public static final int STATION_STATUS_正常使用 = 50;
-    private static final long serialVersionUID = 1L;
-
-
-    /**
-     * 电站组id
-     */
-    private Long groupId;
-
-    /**
-     * en+充电站id
-     */
-    @JSONField(name = "StationID")
-    private String stationId;
-
-    /**
-     * en+运营商id
-     */
-    @JSONField(name = "OperatorID")
-    private String operatorId;
-
-    /**
-     * 设备所属运营平台组织机构代码
-     */
-    @JSONField(name = "EquipmentOwnerID")
-    private String equipmentOwnerId;
-
-    /**
-     * 站点名称
-     */
-    @JSONField(name = "StationName")
-    private String stationName;
-
-    /**
-     * 充电桩国家代码:CN
-     */
-    @JSONField(name = "CountryCode")
-    private String countryCode;
-
-    /**
-     * 充电站省市辖区编码
-     */
-    @JSONField(name = "AreaCode")
-    private String areaCode;
-
-    /**
-     * 地址
-     */
-    @JSONField(name = "Address")
-    private String address;
-
-    /**
-     * 站点电话
-     */
-    @JSONField(name = "StationTel")
-    private String stationTel;
-
-    /**
-     * 服务电话
-     */
-    @JSONField(name = "ServiceTel")
-    private String serviceTel;
-
-    /**
-     * 站点类型:1:公共 50:个人 100:公交(专业)101:环卫(专用)102:物流(专用)103:出租车(专用)255:其他
-     */
-    @JSONField(name = "StationType")
-    private Integer stationType;
-
-    /**
-     * 站点状态:0:未知 1:建设中 5:关闭下线 6:维护中 50:正常使用
-     */
-    @JSONField(name = "StationStatus")
-    private Integer stationStatus;
-
-    /**
-     * 充电车位数量
-     */
-    @JSONField(name = "ParkNums")
-    private Integer parkingNum;
-
-    /**
-     * 充电桩位置坐标
-     * <p>
-     * FastjsonTypeHandler
-     * 支持 MVC JSON 解析
-     * 不支持 MySQL JSON 解析
-     * <p>
-     * JacksonTypeHandler
-     * 支持 MVC JSON 解析
-     * 支持 MySQL JSON 解析
-     */
-    @TableField(typeHandler = JacksonTypeHandler.class)
-    private JSONObject location;
-    /**
-     * 站点引导
-     */
-    @JSONField(name = "SiteGuide")
-    private String siteGuide;
-    /**
-     * 建设场所:1:居民区 2:公共机构 3:企事业单位 4:写字楼 5:工业园区 6:交通枢纽 7:大型文体设施 8:城市绿地 9:大型建筑配建停车场 10:路边停车位 11:城际高速服务区 255:其他
-     */
-    @JSONField(name = "Construction")
-    private Integer construction;
-    /**
-     * 站点照片
-     */
-    private String pictures;
-    /**
-     * 使用车型描述
-     */
-    @JSONField(name = "MatchCars")
-    private String matchCars;
-    /**
-     * 车位楼层及数量描述
-     */
-    @JSONField(name = "ParkInfo")
-    private String parkInfo;
-    /**
-     * 营业时间描述
-     */
-    @JSONField(name = "BusineHours")
-    private String businessHours;
-    /**
-     * 充电费描述
-     */
-    @JSONField(name = "ElectricityFee")
-    private String electricityFee;
-    /**
-     * 服务费率描述
-     */
-    @JSONField(name = "ServiceFee")
-    private String serviceFee;
-    /**
-     * 停车费
-     */
-    @JSONField(name = "ParkFee")
-    private String parkFee;
-    /**
-     * 支付方式:刷卡、线上、现金(电子钱包类卡为刷卡、身份鉴权卡、微信/支付宝、APP为线上)
-     */
-    @JSONField(name = "Payment")
-    private String payment;
-    /**
-     * 是否支持预约:0:不支持 1:支持
-     */
-    @JSONField(name = "SupportOrder")
-    private Integer supportOrder;
-    /**
-     * 备注
-     */
-    @JSONField(name = "Remark")
-    private String remark;
-
-
-}

+ 0 - 94
car-wash-entity/src/main/java/com/kym/entity/admin/StationStatDay.java

@@ -1,94 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 站点统计表-日
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Getter
-@Setter
-@TableName("t_station_stat_day")
-@Accessors(chain = true)
-public class StationStatDay extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 统计时间
-     */
-    private String statDay;
-
-    /**
-     * 充电人数
-     */
-    private Integer chargeUsers;
-
-    /**
-     * 充电有效订单数
-     */
-    private Integer validOrders;
-
-    /**
-     * 总电量
-     */
-    private Double totalPower;
-
-    /**
-     * 总充电费用
-     */
-    private Integer totalMoney;
-
-    /**
-     * 总电费
-     */
-    private Integer elecMoney;
-
-    /**
-     * 总服务费
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 服务费优惠金额
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 总优惠金额
-     */
-    private Integer discountAmount;
-
-    /**
-     * 订单平均充电量
-     */
-    private Double avgOrderElec;
-
-    /**
-     * 订单平均充电费用
-     */
-    private Integer avgOrderMoney;
-
-    /**
-     * 单枪平均日充电量
-     */
-    private Double avgConnectorElec;
-
-    /**
-     * 设备使用率
-     */
-    private Double connectorUsageRate;
-}

+ 0 - 111
car-wash-entity/src/main/java/com/kym/entity/admin/StationStatMonth.java

@@ -1,111 +0,0 @@
-package com.kym.entity.admin;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 站点统计表-月
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Getter
-@Setter
-@TableName("t_station_stat_month")
-@Accessors(chain = true)
-public class StationStatMonth extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    @TableField(exist = false)
-    private String stationName;
-
-    /**
-     * 统计时间
-     */
-    private String statMonth;
-
-    /**
-     * 充电人数
-     */
-    private Integer chargeUsers;
-
-    /**
-     * 充电有效订单数
-     */
-    private Integer validOrders;
-
-    /**
-     * 总电量
-     */
-    private Double totalPower;
-
-    /**
-     * 总充电费用
-     */
-    private Integer totalMoney;
-
-    /**
-     * 总电费
-     */
-    private Integer elecMoney;
-
-    /**
-     * 总服务费
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 服务费优惠金额
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 总优惠金额
-     */
-    private Integer discountAmount;
-
-    /**
-     * 订单平均充电量
-     */
-    private Double avgOrderElec;
-
-    /**
-     * 订单平均充电费用
-     */
-    private Integer avgOrderMoney;
-
-    /**
-     * 单枪平均日充电量
-     */
-    private Double avgConnectorElec;
-
-    /**
-     * 设备使用率
-     */
-    private Double connectorUsageRate;
-
-    /**
-     * 实际抄表电量
-     */
-    private Double actualPower;
-
-    /**
-     * 实际抄表电费金额(分)
-     */
-    private Integer actualElecMoney;
-}

+ 0 - 170
car-wash-entity/src/main/java/com/kym/entity/miniapp/ChargeOrder.java

@@ -1,170 +0,0 @@
-package com.kym.entity.miniapp;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 充电订单表
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-@Getter
-@Setter
-@TableName("t_charge_order")
-@Accessors(chain = true)
-public class ChargeOrder extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    public static int ORDER_STATUS_未知 = 0;
-    public static int ORDER_STATUS_成功 = 1;
-    public static int ORDER_STATUS_失败 = 2;
-    public static int ORDER_STATUS_取消 = 3;
-
-
-    public static int CHARGE_STATUS_预约中 = 0;
-    public static int CHARGE_STATUS_启动中 = 1;
-    public static int CHARGE_STATUS_充电中 = 2;
-    public static int CHARGE_STATUS_停止中 = 3;
-    public static int CHARGE_STATUS_已结束 = 4;
-    public static int CHARGE_STATUS_已取消 = 5;
-
-
-    public static int INVOICE_STATUS_待开票 = 0;
-    public static int INVOICE_STATUS_已开票 = 1;
-    public static int INVOICE_STATUS_已作废 = 2;
-    public static int INVOICE_STATUS_开票中 = 3;
-
-
-    public static int IS_BOOKING_否 = 0;
-    public static int IS_BOOKING_是 = 1;
-
-    // 充电停止原因:0:用户手动停止,1:运营平台停止,2:BMS停止,3:充电机器设备故障,4:连接器断开
-    public static int STOP_REASON_用户手动停止 = 0;
-    public static int STOP_REASON_运营平台停止 = 1;
-    public static int STOP_REASON_BMS停止 = 2;
-    public static int STOP_REASON_充电机器设备故障 = 3;
-    public static int STOP_REASON_连接器断开 = 4;
-    public static int STOP_REASON_预约启动充电失败 = 5;
-
-    private Long userId;
-
-    private String stationId;
-
-    /**
-     * 充电订单号(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 soc;
-
-    /**
-     * 累积充电量(度)
-     */
-    private Double totalPower;
-
-    /**
-     * 累积总金额(元)
-     */
-    private Integer totalMoney;
-
-    /**
-     * 累积电费(元)
-     */
-    private Integer elecMoney;
-
-    /**
-     * 累积服务费(元)
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 实付金额(分)
-     */
-    private Integer payAmount;
-
-    /**
-     * 优惠方式:RechargeRights-充值权益 Coupon-优惠券
-     */
-    private String discountType;
-
-    /**
-     * 优惠金额(分)
-     */
-    private Integer discountAmount;
-
-    /**
-     * 服务费优惠抵扣金额(分)
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 时段数:0~32
-     */
-    private Integer sumPeriod;
-
-    /**
-     * 充电明细信息
-     */
-    private String chargeDetail;
-
-    /**
-     * 订单状态:0:未知,1:成功,2:失败
-     */
-    private Integer orderStatus;
-
-    /**
-     * 充电状态:1:启动中 2:充电中 3:停止中 4:已结束 5:未知
-     */
-    private Integer chargeStatus;
-
-    /**
-     * 充电停止原因:0:用户手动停止,1:运营平台停止,2:BMS停止,3:充电机器设备故障,4:连接器断开
-     */
-    private Integer stopReason;
-
-    /**
-     * 发票状态:0:未开票 1:已开票
-     */
-    private Integer invoiceStatus;
-
-    /**
-     * 发票id
-     */
-    private Integer invoiceId;
-}

+ 0 - 1
car-wash-entity/src/main/java/com/kym/entity/miniapp/other/DiscountCompute.java

@@ -1,7 +1,6 @@
 package com.kym.entity.miniapp.other;
 
 import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
 import lombok.Data;
 
 import java.time.LocalDateTime;

+ 0 - 16
car-wash-mapper/src/main/java/com/kym/mapper/admin/ConnectorInfoMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.ConnectorInfo;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-
-/**
- * <p>
- * 充电桩接口(枪)信息 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-public interface ConnectorInfoMapper extends MyBaseMapper<ConnectorInfo> {
-
-}

+ 0 - 16
car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentInfoMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.EquipmentInfo;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-
-/**
- * <p>
- * 充电桩桩体设备 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-public interface EquipmentInfoMapper extends MyBaseMapper<EquipmentInfo> {
-
-}

+ 0 - 16
car-wash-mapper/src/main/java/com/kym/mapper/admin/EquipmentRelationMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.admin.EquipmentRelation;
-
-/**
- * <p>
- * Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-07
- */
-public interface EquipmentRelationMapper extends MPJBaseMapper<EquipmentRelation> {
-
-}

+ 0 - 16
car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatDayMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.StationStatDay;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 站点统计表-日 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatDayMapper extends BaseMapper<StationStatDay> {
-
-}

+ 0 - 16
car-wash-mapper/src/main/java/com/kym/mapper/admin/StationStatMonthMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.StationStatMonth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 站点统计表-月 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatMonthMapper extends BaseMapper<StationStatMonth> {
-
-}

+ 0 - 33
car-wash-mapper/src/main/java/com/kym/mapper/miniapp/ChargeOrderMapper.java

@@ -1,33 +0,0 @@
-package com.kym.mapper.miniapp;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.entity.admin.queryParams.StatQueryParam;
-import com.kym.entity.admin.vo.CustomOrderVo;
-import com.kym.entity.admin.vo.StationStatVo;
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 充电订单表 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-public interface ChargeOrderMapper extends MyBaseMapper<ChargeOrder> {
-
-    List<CustomOrderVo> listChargeOrders(@Param("params") CustomChargeOrdersQueryParam params);
-
-    Map<String, Object> statChargeOrders(@Param("params") CustomChargeOrdersQueryParam params);
-
-    List<StationStatVo> stationStat(@Param("params") StatQueryParam params);
-
-    Map<String, Object> stationTodayStat(@Param("stationId") String stationId);
-
-}

+ 0 - 53
car-wash-miniapp/src/main/java/com/kym/miniapp/jobs/EquipmentChargeStatusJob.java

@@ -1,53 +0,0 @@
-package com.kym.miniapp.jobs;
-
-import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.kym.common.utils.CommUtil;
-import com.kym.entity.common.RedisKeys;
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.service.miniapp.ChargeOrderService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-
-/**
- * @author skyline
- * 设备充电状态信息(订单信息)更新定时任务
- * 2024-08-12
- */
-@Component
-@Slf4j
-public class EquipmentChargeStatusJob {
-
-    private final StringRedisTemplate redisTemplate;
-    private final ChargeOrderService chargeOrderService;
-
-    public EquipmentChargeStatusJob(StringRedisTemplate redisTemplate, ChargeOrderService chargeOrderService) {
-        this.redisTemplate = redisTemplate;
-        this.chargeOrderService = chargeOrderService;
-    }
-
-    // 每5分钟执行一次
-//    @Scheduled(cron = "0 0/5 * * * ?")
-    public void executeMpUserRelationJob() {
-        log.info("设备充电状态信息(订单信息)更新定时任务启动...");
-        var orders = redisTemplate.opsForHash().values(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS);
-        if (CommUtil.isNotEmptyAndNull(orders)) {
-            var orderList = new ArrayList<ChargeOrder>();
-            orders.forEach(order -> {
-                var chargeOrder = JSONObject.parseObject(order.toString(), ChargeOrder.class);
-                orderList.add(chargeOrder);
-                if (chargeOrder.getChargeStatus().equals(ChargeOrder.CHARGE_STATUS_停止中) || chargeOrder.getChargeStatus().equals(ChargeOrder.CHARGE_STATUS_已结束)) {
-                    redisTemplate.opsForHash().delete(RedisKeys.CHARGE_ORDER_EQUIP_CHARGE_STATUS, chargeOrder.getStartChargeSeq());
-                }
-            });
-            chargeOrderService.updateBatchByQueryWrapper(orderList, order ->
-                    new QueryWrapper<ChargeOrder>().eq("start_charge_seq", order.getStartChargeSeq()));
-        }
-        log.info("设备充电状态信息(订单信息)更新定时任务结束...");
-    }
-
-}

+ 0 - 24
car-wash-service/src/main/java/com/kym/service/admin/ConnectorInfoService.java

@@ -1,24 +0,0 @@
-package com.kym.service.admin;
-
-import com.kym.entity.admin.ConnectorInfo;
-import com.kym.entity.admin.queryParams.EquipmentQueryParam;
-import com.kym.entity.admin.vo.ConnectorInfoVo;
-import com.kym.entity.common.PageBean;
-import com.kym.service.mybatisplus.MyBaseService;
-
-import java.util.Map;
-
-/**
- * <p>
- * 充电桩接口(枪)信息 服务类
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-public interface ConnectorInfoService extends MyBaseService<ConnectorInfo> {
-    PageBean<ConnectorInfoVo> listConnectors(EquipmentQueryParam params);
-
-    Map<Integer, Long> statConnectorStatus(String stationId);
-
-}

+ 0 - 16
car-wash-service/src/main/java/com/kym/service/admin/StationStatDayService.java

@@ -1,16 +0,0 @@
-package com.kym.service.admin;
-
-import com.kym.entity.admin.StationStatDay;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 站点统计表-日 服务类
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatDayService extends IService<StationStatDay> {
-
-}

+ 0 - 21
car-wash-service/src/main/java/com/kym/service/admin/StationStatMonthService.java

@@ -1,21 +0,0 @@
-package com.kym.service.admin;
-
-import com.kym.entity.admin.StationStatMonth;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import com.kym.entity.common.PageBean;
-
-/**
- * <p>
- * 站点统计表-月 服务类
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-public interface StationStatMonthService extends IService<StationStatMonth> {
-
-    PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params);
-
-    void modifyStationStatMonth(StationStatMonth stationStatMonth);
-}

+ 0 - 151
car-wash-service/src/main/java/com/kym/service/admin/impl/StatementsServiceImpl.java

@@ -1,151 +0,0 @@
-package com.kym.service.admin.impl;
-
-
-import com.github.pagehelper.PageHelper;
-import com.github.yulichang.base.MPJBaseServiceImpl;
-import com.github.yulichang.toolkit.JoinWrappers;
-import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.kym.common.exception.BusinessException;
-import com.kym.common.utils.CommUtil;
-import com.kym.entity.admin.*;
-import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import com.kym.entity.admin.vo.StatementsVo;
-import com.kym.entity.common.PageBean;
-import com.kym.mapper.admin.StatementsMapper;
-import com.kym.service.admin.AdminUserRoleService;
-import com.kym.service.admin.InvestorInfoService;
-import com.kym.service.admin.StatementsService;
-import com.kym.service.admin.StationStatMonthService;
-import com.kym.service.cache.KymCache;
-import org.springframework.beans.BeanUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * <p>
- * 客户对账单 服务实现类
- * </p>
- *
- * @author skyline
- * @since 2023-12-27
- */
-@Service
-public class StatementsServiceImpl extends MPJBaseServiceImpl<StatementsMapper, Statements> implements StatementsService {
-
-    private final InvestorInfoService investorInfoService;
-
-    private final StationStatMonthService stationStatMonthService;
-
-    private final AdminUserRoleService adminUserRoleService;
-
-    public StatementsServiceImpl(InvestorInfoService investorInfoService, StationStatMonthService stationStatMonthService, AdminUserRoleService adminUserRoleService) {
-        this.investorInfoService = investorInfoService;
-        this.stationStatMonthService = stationStatMonthService;
-        this.adminUserRoleService = adminUserRoleService;
-    }
-
-    @Override
-    @Transactional
-    public void createStatements(String statMonthId) {
-        // 站点统计信息
-        var statMonthInfo = stationStatMonthService.lambdaQuery()
-                .eq(StationStatMonth::getId, statMonthId)
-                .one();
-
-        // 校验站点月统计信息已填写实际抄表电量和实际抄表电费金额
-        if (statMonthInfo.getActualPower() == null || statMonthInfo.getActualElecMoney() == null) {
-            throw new BusinessException("请先完善月统计实际抄表电量和实际抄表电费金额");
-        }
-
-        // 站点关联客户和物业信息
-        var investorInfoList = investorInfoService.lambdaQuery()
-                .eq(InvestorInfo::getStationId, statMonthInfo.getStationId())
-                .eq(InvestorInfo::getStatus, InvestorInfo.STATUS_有效)
-                .list();
-
-        if (CommUtil.isEmptyOrNull(investorInfoList)) {
-            throw new BusinessException("请先完善站点相关投资者/物业信息");
-        }
-
-        // 创建客户对账单
-        var res = investorInfoList.stream().map(investorInfo -> {
-            // 实际参与分成的服务费=总服务费-优惠金额-电损电费
-            var actualServiceMoney = statMonthInfo.getServiceMoney() - statMonthInfo.getDiscountAmount();
-            // 总电损电费
-            var elecLossMoney = statMonthInfo.getActualElecMoney() - statMonthInfo.getElecMoney();
-            var elecLossAmount = (int) (elecLossMoney * investorInfo.getElecLossProportion());
-            // 分成金额 = 实际参与分成的服务费 * 分成比例 - 电损金额 * 电损承担比例
-            var splittingAmount = (int) (actualServiceMoney * investorInfo.getSplittingProportion()) - elecLossAmount;
-            return new Statements()
-                    .setAdminUserId(investorInfo.getAdminUserId())
-                    .setAdminUserName(investorInfo.getAdminUserName())
-                    .setStationId(investorInfo.getStationId())
-                    .setStationName(KymCache.INSTANCE.getStationNameById(investorInfo.getStationId()))
-                    .setStatMonth(statMonthInfo.getStatMonth())
-                    .setTotalPower(statMonthInfo.getTotalPower())
-                    .setActualPower(statMonthInfo.getActualPower()) // 实际抄表电量
-                    .setElecLossPower(statMonthInfo.getActualPower() - statMonthInfo.getTotalPower()) // 电损电量
-                    .setTotalMoney(statMonthInfo.getTotalMoney())
-                    .setElecMoney(statMonthInfo.getElecMoney())
-                    .setActualElecMoney(statMonthInfo.getActualElecMoney())// 实际抄表电费
-                    .setElecLossMoney(elecLossMoney) // 电损电费(分)
-                    .setServiceMoney(statMonthInfo.getServiceMoney())
-                    .setDiscountAmount(statMonthInfo.getDiscountAmount())
-                    .setServiceMoneyDiscount(statMonthInfo.getServiceMoneyDiscount())
-                    .setActualServiceMoney(actualServiceMoney) // 实际参与分成的服务费(分)
-                    .setSplittingProportion(investorInfo.getSplittingProportion()) // 分成比例 0.45表示45%
-                    .setSplittingAmount(splittingAmount)  // 分成金额(分)
-                    .setElecLossProportion(investorInfo.getElecLossProportion()) // 电损承担比例
-                    .setElecLossAmount((int) (elecLossMoney * investorInfo.getElecLossProportion()))    // 电损承担金额
-                    .setVatRate(investorInfo.getVatRate()) // 增值税率 0.06表示6%
-                    .setVatAmount((int) (splittingAmount / (1 + investorInfo.getVatRate()) * investorInfo.getVatRate() * 1.12)) // 增值税额(分)
-                    .setActualSplittingAmount(splittingAmount - (int) (splittingAmount / (1 + investorInfo.getVatRate()) * investorInfo.getVatRate() * 1.12)); // 实际分成金额(分)
-        }).toList();
-        // 删除之前生成的对账单(投资者/物业 - 站点 - 月份)
-        var oldData = lambdaQuery()
-                .eq(Statements::getStatMonth, statMonthInfo.getStatMonth())
-                .eq(Statements::getStationId, statMonthInfo.getStationId())
-                .in(Statements::getAdminUserId, investorInfoList.stream().map(InvestorInfo::getAdminUserId).toList())
-                .list().stream().map(Statements::getId).toList();
-        removeBatchByIds(oldData);
-        saveBatch(res);
-    }
-
-    @Override
-    public PageBean<Statements> listStatements(StatementsQueryParam params) {
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var res = lambdaQuery()
-                .eq(!CommUtil.isEmptyOrNull(params.getStationId()), Statements::getStationId, params.getStationId())
-                .eq(!CommUtil.isEmptyOrNull(params.getStatMonth()), Statements::getStatMonth, params.getStatMonth())
-                .like(!CommUtil.isEmptyOrNull(params.getAdminUserName()), Statements::getAdminUserName, params.getAdminUserName())
-                .orderByDesc(Statements::getCreateTime)
-                .list();
-        return new PageBean<>(res);
-    }
-
-    @Override
-    public StatementsVo preview(String statId) {
-        var statements = getById(statId);
-        var investorInfo = investorInfoService.lambdaQuery()
-                .eq(InvestorInfo::getAdminUserId, statements.getAdminUserId())
-                .eq(InvestorInfo::getStationId, statements.getStationId())
-                .one();
-        // 查询角色
-        MPJLambdaWrapper<AdminUserRole> wrapper = JoinWrappers.lambda(AdminUserRole.class)
-                .select(Role::getRoleName, Role::getRoleDesc)
-                .leftJoin(Role.class, Role::getId, AdminUserRole::getRoleId)
-                .eq(AdminUserRole::getAdminUserId, statements.getAdminUserId());
-        var res = adminUserRoleService.selectJoinMap(wrapper);
-
-        if (CommUtil.isEmptyOrNull(res)) {
-            throw new BusinessException("请先完善站点相关投资者/物业客户账号信息关联之后重新生成账单");
-        }
-
-        var statementsVo = new StatementsVo();
-        statementsVo.setRoleName(res.get("role_name").toString());
-        statementsVo.setRoleDesc(res.get("role_desc").toString());
-        BeanUtils.copyProperties(statements, statementsVo);
-        BeanUtils.copyProperties(investorInfo, statementsVo);
-        return statementsVo;
-    }
-}

+ 0 - 20
car-wash-service/src/main/java/com/kym/service/admin/impl/StationStatDayServiceImpl.java

@@ -1,20 +0,0 @@
-package com.kym.service.admin.impl;
-
-import com.kym.entity.admin.StationStatDay;
-import com.kym.mapper.admin.StationStatDayMapper;
-import com.kym.service.admin.StationStatDayService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 站点统计表-日 服务实现类
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Service
-public class StationStatDayServiceImpl extends ServiceImpl<StationStatDayMapper, StationStatDay> implements StationStatDayService {
-
-}

+ 0 - 45
car-wash-service/src/main/java/com/kym/service/admin/impl/StationStatMonthServiceImpl.java

@@ -1,45 +0,0 @@
-package com.kym.service.admin.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageHelper;
-import com.kym.common.utils.CommUtil;
-import com.kym.entity.admin.StationStatMonth;
-import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import com.kym.entity.common.PageBean;
-import com.kym.mapper.admin.StationStatMonthMapper;
-import com.kym.service.admin.StationStatMonthService;
-import com.kym.service.cache.KymCache;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 站点统计表-月 服务实现类
- * </p>
- *
- * @author skyline
- * @since 2023-12-04
- */
-@Service
-public class StationStatMonthServiceImpl extends ServiceImpl<StationStatMonthMapper, StationStatMonth> implements StationStatMonthService {
-
-    @Override
-    public PageBean<StationStatMonth> listStatMonth(StatementsQueryParam params) {
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var res = lambdaQuery()
-                .eq(!CommUtil.isEmptyOrNull(params.getStationId()), StationStatMonth::getStationId, params.getStationId())
-                .eq(!CommUtil.isEmptyOrNull(params.getStatMonth()), StationStatMonth::getStatMonth, params.getStatMonth())
-                .orderByDesc(StationStatMonth::getStatMonth)
-                .list();
-        var page = new PageBean<>(res);
-        page.setList(res.stream().peek(item -> item.setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()))).toList());
-        return page;
-    }
-
-    @Override
-    public void modifyStationStatMonth(StationStatMonth stationStatMonth) {
-        lambdaUpdate().eq(StationStatMonth::getId, stationStatMonth.getId())
-                .set(CommUtil.isNotEmptyAndNull(stationStatMonth.getActualPower()), StationStatMonth::getActualPower, stationStatMonth.getActualPower())
-                .set(CommUtil.isNotEmptyAndNull(stationStatMonth.getActualElecMoney()), StationStatMonth::getActualElecMoney, stationStatMonth.getActualElecMoney())
-                .update();
-    }
-}

+ 0 - 50
car-wash-service/src/main/java/com/kym/service/miniapp/ChargeOrderService.java

@@ -1,50 +0,0 @@
-package com.kym.service.miniapp;
-
-import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
-import com.kym.entity.admin.queryParams.StatQueryParam;
-import com.kym.entity.admin.vo.CustomOrderVo;
-import com.kym.entity.admin.vo.StationStatVo;
-import com.kym.entity.common.PageBean;
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.entity.miniapp.queryParams.OrderQueryParams;
-import com.kym.entity.miniapp.vo.ChargeOrderVo;
-import com.kym.service.mybatisplus.MyBaseService;
-import jakarta.servlet.http.HttpServletResponse;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * 充电订单表 服务类
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-public interface ChargeOrderService extends MyBaseService<ChargeOrder> {
-
-    ChargeOrder getChargingOrderByUserId(Long userId);
-
-    ChargeOrder getChargingOrderByStartChargeSeq(String startChargeSeq);
-
-    PageBean<CustomOrderVo> customChargeOrders(CustomChargeOrdersQueryParam params);
-
-    ChargeOrderVo orderDetailForApp(String startChargeSeq);
-
-    PageBean<StationStatVo> stationStat(StatQueryParam params);
-
-    Map<String, Object> stationTodayStat(String stationId);
-
-    List<ChargeOrder> getChargeOrdersBySeqs(String[] startChargeSeqs);
-
-    void exportCustomChargeOrders(CustomChargeOrdersQueryParam params, HttpServletResponse response);
-
-    PageBean<ChargeOrderVo> listUserChargeOrders(OrderQueryParams params);
-
-    Map<String, ?> stationStatDetail(StatQueryParam params);
-
-    Object orderDiscountDetail(String startChargeSeq, String discountType);
-
-    void closeChargeOrder(String startChargeSeq);
-}

+ 0 - 9
car-wash-service/src/main/java/com/kym/service/miniapp/DiscountService.java

@@ -1,9 +0,0 @@
-package com.kym.service.miniapp;
-
-import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
-
-public interface DiscountService {
-
-    void computeDiscount(ChargeOrder chargeOrder, Account account);
-}

+ 0 - 22
car-wash-service/src/main/java/com/kym/service/miniapp/UserStationService.java

@@ -1,22 +0,0 @@
-package com.kym.service.miniapp;
-
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.entity.miniapp.UserStation;
-import com.kym.service.mybatisplus.MyBaseService;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * <p>
- * 用户所属站点表 服务类
- * </p>
- *
- * @author skyline
- * @since 2024-08-19
- */
-public interface UserStationService extends MyBaseService<UserStation> {
-
-    @Transactional
-    void initUserStation();
-
-    void updateUserStation(ChargeOrder chargeOrder);
-}

+ 0 - 7
car-wash-service/src/main/java/com/kym/service/miniapp/impl/ChargeOrderServiceImpl.java

@@ -8,23 +8,16 @@ import com.kym.common.exception.BusinessException;
 import com.kym.common.utils.CommUtil;
 import com.kym.common.utils.HttpUtil;
 import com.kym.entity.admin.Activity;
-import com.kym.entity.admin.StationStatDay;
-import com.kym.entity.admin.StationStatMonth;
 import com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam;
 import com.kym.entity.admin.queryParams.StatQueryParam;
 import com.kym.entity.admin.vo.CustomOrderVo;
 import com.kym.entity.admin.vo.StationStatVo;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.common.RedisKeys;
-import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.queryParams.OrderQueryParams;
 import com.kym.entity.miniapp.vo.ChargeOrderVo;
-import com.kym.mapper.miniapp.ChargeOrderMapper;
 import com.kym.service.admin.ExportService;
-import com.kym.service.admin.StationStatDayService;
-import com.kym.service.admin.StationStatMonthService;
 import com.kym.service.cache.KymCache;
-import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.UserCouponService;
 import com.kym.service.miniapp.UserRechargeRightsService;
 import com.kym.service.mybatisplus.MyBaseServiceImpl;

+ 0 - 2
car-wash-service/src/main/java/com/kym/service/miniapp/impl/CouponDiscountHandle.java

@@ -2,11 +2,9 @@ package com.kym.service.miniapp.impl;
 
 import com.kym.entity.admin.Coupon;
 import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.OrderCoupon;
 import com.kym.entity.miniapp.UserCoupon;
 import com.kym.service.admin.CouponService;
-import com.kym.service.miniapp.DiscountService;
 import com.kym.service.miniapp.OrderCouponService;
 import com.kym.service.miniapp.UserCouponService;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 2
car-wash-service/src/main/java/com/kym/service/miniapp/impl/NoDiscountHandle.java

@@ -1,8 +1,6 @@
 package com.kym.service.miniapp.impl;
 
 import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
-import com.kym.service.miniapp.DiscountService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

+ 0 - 2
car-wash-service/src/main/java/com/kym/service/miniapp/impl/RechargeRightsDiscountHandle.java

@@ -1,10 +1,8 @@
 package com.kym.service.miniapp.impl;
 
 import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.OrderRechargeRights;
 import com.kym.entity.miniapp.UserRechargeRights;
-import com.kym.service.miniapp.DiscountService;
 import com.kym.service.miniapp.OrderRechargeRightsService;
 import com.kym.service.miniapp.UserRechargeRightsService;
 import lombok.extern.slf4j.Slf4j;

+ 0 - 3
car-wash-service/src/main/java/com/kym/service/miniapp/impl/UserStationServiceImpl.java

@@ -1,13 +1,10 @@
 package com.kym.service.miniapp.impl;
 
 import cn.hutool.core.date.StopWatch;
-import com.kym.entity.miniapp.ChargeOrder;
 import com.kym.entity.miniapp.User;
 import com.kym.entity.miniapp.UserStation;
 import com.kym.mapper.miniapp.UserStationMapper;
-import com.kym.service.miniapp.ChargeOrderService;
 import com.kym.service.miniapp.UserService;
-import com.kym.service.miniapp.UserStationService;
 import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;