清理充电相关代码

admin-web-new/src/views/admin/investor/dialog.vue

@@ -134,9 +134,6 @@ defineExpose({ open });
       <el-form-item label="增值税率" prop="vatRate">
         <el-input v-model="state.ruleForm.vatRate" placeholder="增值税率 (0.06表示6%)" clearable />
       </el-form-item>
-      <el-form-item label="电损承担比例" prop="elecLossProportion">
-        <el-input v-model="state.ruleForm.elecLossProportion" placeholder="电损承担比例 (0.30表示30%)" clearable />
-      </el-form-item>
       <el-form-item label="分成比例" prop="splittingProportion">
         <el-input v-model="state.ruleForm.splittingProportion" placeholder="分成比例 (0.45表示45%)" clearable />
       </el-form-item>

admin-web-new/src/views/admin/investor/index.vue

@@ -35,7 +35,6 @@ const state = reactive({
       { label: "电话号码", prop: "telephone" },
       { label: "站点", prop: "stationId" },
       { label: "分成比例", prop: "splittingProportion", width: 90 },
-      { label: "电损承担比例", prop: "elecLossProportion", width: 120 },
       { label: "增值税率", prop: "vatRate", width: 90 },
       { label: "账户名", prop: "accountName" },
       { label: "银行卡号", prop: "bankCardNo", width: 180 },

admin-web-new/src/views/admin/station/device-upload.vue

@@ -14,8 +14,8 @@ const fieldList = [
   { label: "站点ID", value: "stationId" },
   { label: "站点名称", value: "stationName" },
   { label: "设备短编号", value: "shortId" },
-  { label: "充电桩SN", value: "equipmentId" },
-  { label: "充电口SN", value: "connectorId" },
+  { label: "设备SN", value: "equipmentId" },
+  { label: "设备编号", value: "connectorId" },
   { label: "车位编号", value: "parkingNo" }
 ];
 

admin-web-new/src/views/admin/station/upload.vue

@@ -14,8 +14,8 @@ const fieldList = [
   { label: "站点ID", value: "stationId" },
   { label: "站点名称", value: "stationName" },
   { label: "设备短编号", value: "shortId" },
-  { label: "充电桩SN", value: "equipmentId" },
-  { label: "充电口SN", value: "connectorId" },
+  { label: "设备SN", value: "equipmentId" },
+  { label: "设备编号", value: "connectorId" },
   { label: "车位编号", value: "parkingNo" }
 ];
 

admin-web/src/stores/themeConfig.ts

@@ -106,7 +106,7 @@ export const useThemeConfig = defineStore('themeConfig', {
             // 是否开启水印
             isWartermark: false,
             // 水印文案
-            wartermarkText: 'K7充电',
+            wartermarkText: '洗车管理系统',
 
             /**
              * 其它设置

admin-web/src/views/admin/index.vue

@@ -273,22 +273,6 @@ const initLineChart = (dataList: Array<any>) => {
                 ]),
               },
             },
-            {
-              name: '电费',
-              type: 'line',
-              symbolSize: 6,
-              symbol: 'circle',
-              smooth: true,
-              data: dataList.map(k=>u.fmt.fmtMoney(k.elecMoney)),
-              lineStyle: {color: '#b5fe8b'},
-              itemStyle: {color: '#b5fe8b', borderColor: '#b5fe8b'},
-              areaStyle: {
-                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-                  {offset: 0, color: '#b5fe8b'},
-                  {offset: 1, color: '#fe9a8b03'},
-                ]),
-              },
-            },*/
       {
         name: '总金额',
         type: 'line',
@@ -500,7 +484,7 @@ onMounted(() => {
   //今日统计数据
   loadStationStatToday();
 
-  //加载洗车桩状态
+  //加载设备状态
   loadCurrentEquipmentStatus();
 
   mittBus.on('stationChangeRefresh', (stationId) => {

admin-web/src/views/admin/investor/dialog.vue

@@ -126,15 +126,6 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item label="电损承担比例 (0.30表示30%)" prop="elecLossProportion">
-          <el-input
-              v-model="state.ruleForm.elecLossProportion"
-              placeholder="电损承担比例 0.30表示30%"
-              clearable
-              class="wd200">
-          </el-input>
-        </el-form-item>
-
         <el-form-item label="分成比例 （0.45表示45%）" prop="splittingProportion">
           <el-input
               v-model="state.ruleForm.splittingProportion"

admin-web/src/views/admin/investor/index.vue

@@ -172,7 +172,6 @@ const state = reactive({
       {label: '电话号码', prop: 'telephone', resizable: true},
       {label: '站点', prop: 'stationId', resizable: true},
       {label: '分成比例', prop: 'splittingProportion', resizable: true, width: 90},
-      {label: '电损承担比例', prop: 'elecLossProportion', resizable: true, width: 120},
       {label: '增值税率', prop: 'vatRate', resizable: true, width: 90},
       {label: '账户名', prop: 'accountName', resizable: true},
       {label: '银行卡号', prop: 'bankCardNo', resizable: true, width: 180},

admin-web/src/views/admin/station/device/upload.vue

@@ -168,8 +168,8 @@ const initState = () => ({
     {label: '站点ID', value: 'stationId'},
     {label: '站点名称', value: 'stationName'},
     {label: '设备短编号', value: 'shortId'},
-    {label: '充电桩SN', value: 'equipmentId'},
-    {label: '充电口SN', value: 'connectorId'},
+    {label: '设备SN', value: 'equipmentId'},
+    {label: '设备编号', value: 'connectorId'},
     {label: '车位编号', value: 'parkingNo'},
   ]
 })

admin-web/src/views/admin/station/list/upload.vue

@@ -170,8 +170,8 @@ const initState = () => ({
     {label: '站点ID', value: 'stationId'},
     {label: '站点名称', value: 'stationName'},
     {label: '设备短编号', value: 'shortId'},
-    {label: '充电桩SN', value: 'equipmentId'},
-    {label: '充电口SN', value: 'connectorId'},
+    {label: '设备SN', value: 'equipmentId'},
+    {label: '设备编号', value: 'connectorId'},
     {label: '车位编号', value: 'parkingNo'},
   ]
 })

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
- * 充电站信息 前端控制器
+ * 洗车站点信息 前端控制器
  * </p>
  *
  * @author skyline

car-wash-entity/src/main/java/com/kym/entity/MonitorLog.java

@@ -33,7 +33,7 @@ public class MonitorLog extends BaseEntity {
     private String stationId;
 
     /**
-     * 类型：0未知 1网关 2充电桩
+     * 类型：0未知 1网关 2设备
      */
     private Integer type;
 
@@ -48,7 +48,7 @@ public class MonitorLog extends BaseEntity {
     private LocalDateTime offlineTime;
 
     /**
-     * 离线原因状态 充电桩0-离网
+     * 离线原因状态 0-离网
      */
     private Integer offlineStatus;
 

car-wash-entity/src/main/java/com/kym/entity/OrderCoupon.java

@@ -46,7 +46,7 @@ public class OrderCoupon extends BaseEntity {
     private Long userId;
 
     /**
-     * 充电订单号
+     * 订单号
      */
     private String startChargeSeq;
 

car-wash-entity/src/main/java/com/kym/entity/Statements.java

@@ -1,149 +0,0 @@
-package com.kym.entity;
-
-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-27
- */
-@Getter
-@Setter
-@TableName("t_statements")
-@Accessors(chain = true)
-public class Statements extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户用户id
-     */
-    private Long adminUserId;
-
-    /**
-     * 客户姓名
-     */
-    private String adminUserName;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 统计时间（月）
-     */
-    private String statMonth;
-
-    /**
-     * 订单电量
-     */
-    private Double totalPower;
-
-    /**
-     * 实际抄表电量
-     */
-    private Double actualPower;
-
-    /**
-     * 电损电量
-     */
-    private Double elecLossPower;
-
-    /**
-     * 订单金额（分）
-     */
-    private Integer totalMoney;
-
-    /**
-     * 订单电费金额（分）
-     */
-    private Integer elecMoney;
-
-    /**
-     * 实际抄表电费金额（分）
-     */
-    private Integer actualElecMoney;
-
-    /**
-     * 电损电费金额（分）
-     */
-    private Integer elecLossMoney;
-
-    /**
-     * 服务费金额（分）
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 优惠金额（分）
-     */
-    private Integer discountAmount;
-
-    /**
-     * 服务费优惠金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 实际参与分成的服务费（分）
-     */
-    private Integer actualServiceMoney;
-
-    /**
-     * 分成比例 0.45表示45%
-     */
-    private Double splittingProportion;
-
-    /**
-     * 分成金额（分）
-     */
-    private Integer splittingAmount;
-
-    /**
-     * 电损承担比例 0.30代表30%
-     */
-    private Double elecLossProportion;
-
-    /**
-     * 电损承担金额（分）
-     */
-    private Integer elecLossAmount;
-
-    /**
-     * 增值税率 0.06表示6%
-     */
-    private Double vatRate;
-
-    /**
-     * 增值税额（分）
-     */
-    private Integer vatAmount;
-
-    /**
-     * 实际分成金额
-     */
-    private Integer actualSplittingAmount;
-
-    /**
-     * 状态：0-无效，1-有效
-     */
-    private Byte status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-}

car-wash-entity/src/main/java/com/kym/entity/UserStation.java

@@ -35,7 +35,7 @@ public class UserStation extends BaseEntity {
     private String mobilePhone;
 
     /**
-     * 用户在该站点的充电量
+     * 用户在该站点的消费总量
      */
     private Double totalPower;
 }

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

@@ -1,60 +0,0 @@
-package com.kym.entity.queryParams;
-
-import lombok.Data;
-
-/**
- * @author skyline
- * @description
- * @date 2023-09-21 17:12
- */
-@Data
-public class ApplyInvoiceParams {
-    /**
-     * 订单号
-     */
-    private String[] startChargeSeqs;
-    /**
-     * 接收发票邮箱
-     */
-    private String email;
-    /**
-     * 公司电话
-     */
-    private String phone;
-
-    /**
-     * 发票类型:INDIVIDUAL-个人 ORGANIZATION-企业
-     */
-    private String invoiceType;
-
-    /**
-     * 发票抬头
-     */
-    private String invoiceTitle;
-
-    /**
-     * 公司税号
-     */
-    private String taxId;
-
-    /**
-     * 公司地址
-     */
-    private String address;
-
-    /**
-     * 开户银行
-     */
-    private String bankName;
-
-    /**
-     * 银行账户
-     */
-    private String bankAccount;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-}

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

@@ -1,84 +0,0 @@
-package com.kym.entity.queryParams;
-
-import com.kym.entity.common.PageParams;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-
-
-/**
- * @author skyline
- * @description 用户订单查询参数
- * @date 2023-08-22 18:56
- */
-@Data
-public class CustomChargeOrdersQueryParam extends PageParams {
-    /**
-     * 用户id
-     */
-    private Long userId;
-    /**
-     * 充电订单号
-     */
-    private String startChargeSeq;
-    /**
-     * 手机号
-     */
-    private String mobilePhone;
-    /**
-     * 用户名
-     */
-    private String username;
-    /**
-     * 站点id
-     */
-    private String stationId;
-    /**
-     * 充电桩序列号
-     */
-    private String connectorId;
-    /**
-     * 充电状态
-     */
-    private Integer chargeStatus;
-    /**
-     * 订单状态
-     */
-    private Integer orderStatus;
-    /**
-     * 支付状态
-     */
-    private Integer payStatus;
-
-
-    public void setStartDate(LocalDate startDate) {
-        this.startDate = LocalDateTime.of(startDate, LocalTime.MIN);
-    }
-
-    /**
-     * 查询开始日期
-     */
-    private LocalDateTime startDate;
-
-    public void setEndDate(LocalDate endDate) {
-        this.endDate =  LocalDateTime.of(endDate, LocalTime.MAX);
-    }
-
-    /**
-     * 查询结束日期
-     */
-    private LocalDateTime endDate;
-
-    /**
-     * 发票状态
-     */
-    private Integer invoiceStatus;
-
-    /**
-     * 停止原因
-     */
-    private Integer stopReason;
-
-}

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

@@ -1,29 +0,0 @@
-package com.kym.entity.queryParams;
-
-import com.kym.entity.common.PageParams;
-import lombok.Data;
-
-/**
- * @author skyline
- * @description 查询参数
- * @date 2023-08-22 18:56
- */
-@Data
-public class StatementsQueryParam extends PageParams {
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 统计月份
-     */
-    private String statMonth;
-
-    /**
-     * 投资者/物业名称
-     */
-    private String adminUserName;
-
-}

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

@@ -1,99 +0,0 @@
-package com.kym.entity.vo;
-
-import com.kym.entity.BaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * <p>
- * 充电桩接口（枪）信息
- * </p>
- *
- * @author skyline
- * @since 2023-08-05
- */
-@Data
-@Accessors(chain = true)
-public class ConnectorInfoVo extends BaseEntity implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点编号
-     */
-    private String stationNo;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 充电桩接口短编号
-     */
-    private String shortId;
-    /**
-     * 充电桩序列号
-     */
-    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;
-
-    public ConnectorInfoVo setShortId(String shortId) {
-        this.shortId = shortId;
-        this.stationNo = shortId.substring(0, 3);
-        return this;
-    }
-
-}

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

@@ -1,50 +0,0 @@
-package com.kym.entity.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-
-/**
- * 充电设备信息
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-public class ConnectorVo implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 充电站id
-     */
-    private String stationId;
-
-    /**
-     * 充电站名称
-     */
-    private String stationName;
-
-    /**
-     * 充电设备id
-     */
-    private String equipmentId;
-
-    /**
-     * 充电设备接口id
-     */
-    private String connectorId;
-
-    /**
-     * 充电设备接口短编号
-     */
-    private String shortId;
-
-    /**
-     * 车位编号
-     */
-    private String parkingNo;
-
-
-}

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

@@ -1,44 +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-08-30 18:55
- */
-@Data
-@Accessors(chain = true)
-public class CustomOrderVo {
-    private Long userId;
-    private String mobilePhone;
-    private String startChargeSeq;
-    private String stationId;
-    private String stationName;
-    private String connectorId;
-    private String shortId;
-    @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 Integer orderStatus;
-    private Integer chargeStatus;
-    private Integer stopReason;
-    private Integer invoiceStatus;
-    private Integer invoiceId;
-}

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

@@ -1,182 +0,0 @@
-package com.kym.entity.vo;
-
-import com.kym.entity.BaseEntity;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 客户对账单vo
- * </p>
- *
- * @author skyline
- * @since 2023-12-27
- */
-@Getter
-@Setter
-@Accessors(chain = true)
-public class StatementsVo extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户用户id
-     */
-    private Long adminUserId;
-
-    /**
-     * 客户姓名
-     */
-    private String adminUserName;
-
-    /**
-     * 角色名
-     */
-    private String roleName;
-
-    /**
-     * 角色描述
-     */
-    private String roleDesc;
-
-    /**
-     * 站点id
-     */
-    private String stationId;
-
-    /**
-     * 站点名称
-     */
-    private String stationName;
-
-    /**
-     * 统计时间（月）
-     */
-    private String statMonth;
-
-    /**
-     * 订单电量
-     */
-    private Double totalPower;
-
-    /**
-     * 实际抄表电量
-     */
-    private Double actualPower;
-
-    /**
-     * 电损电量
-     */
-    private Double elecLossPower;
-
-    /**
-     * 订单金额（分）
-     */
-    private Integer totalMoney;
-
-    /**
-     * 订单电费金额（分）
-     */
-    private Integer elecMoney;
-
-    /**
-     * 实际抄表电费金额（分）
-     */
-    private Integer actualElecMoney;
-
-    /**
-     * 电损电费金额（分）
-     */
-    private Integer elecLossMoney;
-
-    /**
-     * 服务费金额（分）
-     */
-    private Integer serviceMoney;
-
-    /**
-     * 优惠金额（分）
-     */
-    private Integer discountAmount;
-
-    /**
-     * 服务费优惠金额（分）
-     */
-    private Integer serviceMoneyDiscount;
-
-    /**
-     * 实际参与分成的服务费（分）
-     */
-    private Integer actualServiceMoney;
-
-    /**
-     * 分成比例 0.45表示45%
-     */
-    private Double splittingProportion;
-
-    /**
-     * 分成金额（分）
-     */
-    private Integer splittingAmount;
-
-    /**
-     * 电损承担比例 0.30代表30%
-     */
-    private Double elecLossProportion;
-
-    /**
-     * 电损承担金额（分）
-     */
-    private Integer elecLossAmount;
-
-    /**
-     * 增值税率 0.06表示6%
-     */
-    private Double vatRate;
-
-    /**
-     * 增值税额（分）
-     */
-    private Integer vatAmount;
-
-    /**
-     * 实际分成金额
-     */
-    private Integer actualSplittingAmount;
-
-    /**
-     * 状态：0-无效，1-有效
-     */
-    private Integer status;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 账户名
-     */
-    private String accountName;
-
-    /**
-     * 电话号码
-     */
-    private String telephone;
-
-    /**
-     * 开户行名称
-     */
-    private String bankName;
-
-    /**
-     * 银行卡号
-     */
-    private String bankCardNo;
-
-    /**
-     * 纳税人识别号
-     */
-    private String taxNo;
-}

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

@@ -1,25 +0,0 @@
-package com.kym.entity.vo;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-/**
- * @author skyline
- * @description
- * @date 2023-09-02 10:36
- */
-@Data
-public class StationStatVo {
-    private String stationId;
-    private String statTime;
-    private Integer totalOrders;
-    private Double totalPower;
-    private Integer totalMoney;
-    private Integer elecMoney;
-    private BigDecimal elecMoneyPercent;
-    private Integer serviceMoney;
-    private Integer payServiceAmount;
-    private BigDecimal serviceMoneyPercent;
-
-}

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

@@ -1,122 +0,0 @@
-package com.kym.entity.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
-import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import com.kym.entity.BaseEntity;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * <p>
- * 用户订单优惠券
- * </p>
- *
- * @author skyline
- * @since 2024-04-29
- */
-@Data
-@Accessors(chain = true)
-public class UserOrderCouponVo extends BaseEntity {
-
-
-    /**
-     * 优惠券id
-     */
-    private Long couponId;
-
-    /**
-     * 优惠券名称
-     */
-    private String couponName;
-
-    /**
-     * 主活动id
-     */
-    private Long activityId;
-
-    /**
-     * 主活动名称
-     */
-    private String activityName;
-
-    /**
-     * 用户id
-     */
-    private Long userId;
-
-    /**
-     * 开始时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime startTime;
-
-    /**
-     * 结束时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonDeserialize(using = LocalDateTimeDeserializer.class)
-    private LocalDateTime endTime;
-
-    /**
-     * 有效期（天）
-     */
-    private Integer validity;
-
-    /**
-     * 领取方式：Release-系统发放，Collect-主动领取
-     */
-    private String receiveType;
-
-    /**
-     * 券种：折扣券、满减券
-     */
-    private String couponType;
-
-    /**
-     * 折扣：100代表无折扣，75代表75折；折扣金额（分）
-     */
-    private Integer discount;
-
-    /**
-     * 使用门槛：最小服务费金额（分）
-     */
-    private Integer minServiceMoney;
-
-    /**
-     * 优惠允许叠加：0-不允许，1-允许
-     */
-    private Integer allowStacke;
-
-    /**
-     * 状态：0-无效，1-有效
-     */
-    private Integer status;
-
-    /**
-     * 使用状态：0-未使用，1-已使用
-     */
-    private Integer usageStatus;
-
-    /**
-     * 备注
-     */
-    private String remark;
-
-    /**
-     * 订单号
-     */
-    private String startChargeSeq;
-
-    /**
-     * 订单优惠金额（分）
-     */
-    private Integer orderDiscountAmount;
-}

car-wash-mapper/src/main/java/com/kym/mapper/StatementsMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper;
-
-import com.github.yulichang.base.MPJBaseMapper;
-import com.kym.entity.Statements;
-
-/**
- * <p>
- * 客户对账单 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-12-27
- */
-public interface StatementsMapper extends MPJBaseMapper<Statements> {
-
-}

car-wash-mp/src/pages-order/pay/index.vue

@@ -72,8 +72,6 @@ const MENU_TEMPLATE = [
     value: "",
   },
   // {
-  //   title: "充电卡",
-  //   key: "",
   //   value: "",
   // },
 ];

car-wash-mp/src/pages-user/contact/index.vue

@@ -72,8 +72,6 @@ const MENU_TEMPLATE = [
     value: "",
   },
   // {
-  //   title: "充电卡",
-  //   key: "",
   //   value: "",
   // },
 ];

car-wash-mp/src/pages-user/wallet/refund.vue

@@ -76,10 +76,10 @@ const reasonText = ref("");
 const reason = ref(-1);
 const reasons = ref([
   "不常住该小区",
-  "充电故障",
+  "设备故障",
   "下次使用再充值",
-  "充电费用贵",
-  "很难充上电",
+  "费用较高",
+  "设备体验不佳",
   "其他原因",
 ]);
 const success = ref(true);

car-wash-mp/src/pages/map/index.vue

@@ -87,7 +87,7 @@ const initState = () => ({
       status: 1,
       total: 7,
       idle: 2,
-      funs: ['清洁', '泡沫', '吸尘', '消毒', '充电'],
+      funs: ['清洁', '泡沫', '吸尘', '消毒', '吹干'],
       address: '深圳市宝安区河源路12345号',
       tips: '半小时内免停车费，超时领取停车券免费',
     },
@@ -97,7 +97,7 @@ const initState = () => ({
       status: 1,
       total: 17,
       idle: 5,
-      funs: ['清洁', '泡沫', '吸尘', '消毒', '充电'],
+      funs: ['清洁', '泡沫', '吸尘', '消毒', '吹干'],
       address: '深圳市宝安区创业二路88号',
       tips: '半小时内免停车费，超时领取停车券免费',
     }

car-wash-service/src/main/java/com/kym/service/StatementsService.java

@@ -1,24 +0,0 @@
-package com.kym.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.kym.entity.Statements;
-import com.kym.entity.queryParams.StatementsQueryParam;
-import com.kym.entity.vo.StatementsVo;
-import com.kym.entity.common.PageBean;
-
-/**
- * <p>
- * 客户对账单 服务类
- * </p>
- *
- * @author skyline
- * @since 2023-12-27
- */
-public interface StatementsService extends IService<Statements> {
-
-    void createStatements(String statMonthId);
-
-    PageBean<Statements> listStatements(StatementsQueryParam params);
-
-    StatementsVo preview(String statId);
-}

car-wash-service/src/main/java/com/kym/service/UserCouponService.java

@@ -5,7 +5,6 @@ import com.kym.entity.queryParams.CouponQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.UserCoupon;
 import com.kym.entity.vo.UserCouponVo;
-import com.kym.entity.vo.UserOrderCouponVo;
 
 import java.util.List;
 import java.util.Map;
@@ -24,8 +23,6 @@ public interface UserCouponService extends IService<UserCoupon> {
 
     void collectCoupon(Long couponId);
 
-    UserOrderCouponVo getUserOrderCoupon(String startChargeSeq);
-
     List<UserCoupon> listStationAvailableCoupons(Map<String, ?> params);
 
 }

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

@@ -121,7 +121,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
     @Override
     public PageBean<Coupon> listAvailableCoupons(CouponQueryParam params) {
         if (CommUtil.isEmptyOrNull(params.getStationId())) {
-            throw new BusinessException("请选择充电站点");
+            throw new BusinessException("请选择洗车站点");
         }
         PageHelper.startPage(params.getPageNum(), params.getPageSize());
         MPJLambdaWrapper<Coupon> wrapper = JoinWrappers.lambda(Coupon.class)

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

@@ -13,11 +13,9 @@ import com.kym.entity.Coupon;
 import com.kym.entity.queryParams.CouponQueryParam;
 import com.kym.entity.common.PageBean;
 import com.kym.entity.common.RedisKeys;
-import com.kym.entity.OrderCoupon;
 import com.kym.entity.User;
 import com.kym.entity.UserCoupon;
 import com.kym.entity.vo.UserCouponVo;
-import com.kym.entity.vo.UserOrderCouponVo;
 import com.kym.mapper.UserCouponMapper;
 import com.kym.service.ActivityService;
 import com.kym.service.CouponService;
@@ -152,26 +150,6 @@ public class UserCouponServiceImpl extends MPJBaseServiceImpl<UserCouponMapper,
         // todo 优惠券活动终止时处理redis数据，优惠券失效或者使用之后该做什么操作？
     }
 
-    /**
-     * 通过订单号查询订单使用的优惠券信息
-     *
-     * @param startChargeSeq
-     * @return
-     */
-    @Override
-    public UserOrderCouponVo getUserOrderCoupon(String startChargeSeq) {
-        var userId = StpUtil.getLoginIdAsLong();
-        MPJLambdaWrapper<UserCoupon> wrapper = JoinWrappers.lambda(UserCoupon.class)
-                .selectAsClass(UserCoupon.class, UserOrderCouponVo.class)
-                .selectAs(OrderCoupon::getStartChargeSeq, UserOrderCouponVo::getStartChargeSeq)
-                .selectAs(OrderCoupon::getDiscountAmount, UserOrderCouponVo::getOrderDiscountAmount)
-                .rightJoin(OrderCoupon.class, on -> on.eq(OrderCoupon::getCouponId, UserCoupon::getCouponId).eq(OrderCoupon::getUserId, UserCoupon::getUserId))
-                .eq(OrderCoupon::getStartChargeSeq, startChargeSeq)
-                .eq(OrderCoupon::getUserId, userId)
-                .eq(OrderCoupon::getStatus, OrderCoupon.STATUS_使用成功);
-        return selectJoinOne(UserOrderCouponVo.class, wrapper);
-    }
-
     @Override
     public List<UserCoupon> listStationAvailableCoupons(Map<String, ?> params) {
         return baseMapper.listStationAvailableCoupons(params);