删除多余代码

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

@@ -4,11 +4,12 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 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.PayLogService;
 import com.kym.service.miniapp.UserService;
-import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 用户相关信息
@@ -21,12 +22,10 @@ import org.springframework.web.bind.annotation.*;
 public class CustomController {
 
     private final UserService customUserService;
-    private final ChargeOrderService customChargeOrders;
     private final PayLogService payLogService;
 
-    public CustomController(UserService customUserService, ChargeOrderService customChargeOrders, PayLogService payLogService) {
+    public CustomController(UserService customUserService, PayLogService payLogService) {
         this.customUserService = customUserService;
-        this.customChargeOrders = customChargeOrders;
         this.payLogService = payLogService;
     }
 
@@ -37,25 +36,6 @@ public class CustomController {
         return R.success(customUserService.listCustomUser(params));
     }
 
-    @SysLog("查询用户充电订单列表")
-    @GetMapping("/listChargeOrders")
-    public R<?> listChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params) {
-        return R.success(customChargeOrders.customChargeOrders(params));
-    }
-
-    @SysLog("订单结算")
-    @GetMapping("/closeChargeOrder/{startChargeSeq}")
-    public R<?> closeChargeOrder(@PathVariable("startChargeSeq") String startChargeSeq) {
-        customChargeOrders.closeChargeOrder(startChargeSeq);
-        return R.success();
-    }
-
-    @SysLog(value = "用户充电订单列表导出", ignoreParams = true)
-    @GetMapping("/exportChargeOrders")
-    public void exportChargeOrders(@ModelAttribute CustomChargeOrdersQueryParam params, HttpServletResponse response) {
-        customChargeOrders.exportCustomChargeOrders(params, response);
-    }
-
     @SysLog("充值记录列表")
     @GetMapping("/listRecharge")
     public R<?> listRecharge(@ModelAttribute CommonQueryParam params) {

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

@@ -1,91 +0,0 @@
-package com.kym.admin.controller;
-
-import com.kym.common.R;
-import com.kym.entity.admin.queryParams.StatQueryParam;
-import com.kym.entity.admin.queryParams.StatementsQueryParam;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author skyline
- * @description 统计数据
- * @date 2023-09-02 09:44
- */
-@RestController
-@RequestMapping("/stat")
-public class StatController {
-
-    private final ChargeOrderService chargeOrderService;
-    private final StationStatMonthService stationStatMonthService;
-
-    public StatController(ChargeOrderService chargeOrderService, StationStatMonthService stationStatMonthService) {
-        this.chargeOrderService = chargeOrderService;
-        this.stationStatMonthService = stationStatMonthService;
-    }
-
-    /**
-     * 站点充电数据-日/月
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/stationStat")
-    R<?> stationStat(@ModelAttribute StatQueryParam params) {
-        return R.success(chargeOrderService.stationStat(params));
-    }
-
-    /**
-     * 站点实时数据
-     *
-     * @return
-     */
-    @GetMapping("/stationTodayStat")
-    R<?> stationTodayStat(String stationId) {
-        return R.success(chargeOrderService.stationTodayStat(stationId));
-    }
-
-    /**
-     * 站点详细数据统计
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/stationStatDetail")
-    R<?> stationStatDetail(@ModelAttribute StatQueryParam params) {
-        return R.success(chargeOrderService.stationStatDetail(params));
-    }
-
-    /**
-     * 站点月统计数据列表
-     *
-     * @param params
-     * @return
-     */
-    @GetMapping("/listStatMonth")
-    R<?> listStatMonth(@ModelAttribute StatementsQueryParam params) {
-        return R.success(stationStatMonthService.listStatMonth(params));
-    }
-
-    /**
-     * 单条站点月统计数据
-     *
-     * @param statMonthId
-     * @return
-     */
-    @GetMapping("/getStationStatMonth/{statMonthId}")
-    R<?> getStationStatMonth(@PathVariable("statMonthId") String statMonthId) {
-        return R.success(stationStatMonthService.getById(statMonthId));
-    }
-
-    /**
-     * 修改站点月统计数据（填写电费账单数据）
-     *
-     * @param stationStatMonth
-     * @return
-     */
-    @PostMapping("/modifyStationStatMonth")
-    R<?> modifyStationStatMonth(@RequestBody StationStatMonth stationStatMonth) {
-        stationStatMonthService.modifyStationStatMonth(stationStatMonth);
-        return R.success();
-    }
-
-}

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

@@ -5,7 +5,6 @@ import com.kym.entity.BaseEntity;
 import com.kym.entity.admin.Banner;
 import com.kym.entity.admin.Coupon;
 import com.kym.entity.admin.RechargeRights;
-import com.kym.entity.admin.Station;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -96,10 +95,6 @@ public class ActivityVo extends BaseEntity {
      */
     List<String> stationIds;
 
-    /**
-     * 站点id
-     */
-    List<Station> stationList;
 
     /**
      * 充值权益列表

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

@@ -1,6 +1,7 @@
 package com.kym.entity.miniapp.other;
 
 import com.kym.entity.miniapp.Account;
+import com.kym.entity.miniapp.WashOrder;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -12,13 +13,13 @@ import java.time.LocalDateTime;
  */
 @Data
 public class DiscountCompute {
-    public ChargeOrder chargeOrder;
+    public WashOrder washOrder;
     public Account account;
     public LocalDateTime endTime;
     public int discountAmount;
 
-    public DiscountCompute(ChargeOrder chargeOrder, Account account, LocalDateTime endTime) {
-        this.chargeOrder = chargeOrder;
+    public DiscountCompute(WashOrder washOrder, Account account, LocalDateTime endTime) {
+        this.washOrder = washOrder;
         this.account = account;
         this.endTime = endTime;
     }

car-wash-mapper/src/main/java/com/kym/mapper/admin/StationMapper.java

@@ -1,16 +0,0 @@
-package com.kym.mapper.admin;
-
-import com.kym.entity.admin.Station;
-import com.kym.mapper.mybatisplus.MyBaseMapper;
-
-/**
- * <p>
- * 充电站信息 Mapper 接口
- * </p>
- *
- * @author skyline
- * @since 2023-08-12
- */
-public interface StationMapper extends MyBaseMapper<Station> {
-
-}

car-wash-mapper/src/main/resources/mappers/admin/ActivityMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.ActivityMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Activity">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="name" property="name" />
-        <result column="activityDesc" property="activity_desc" />
-        <result column="activityDescPage" property="activity_desc_page" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="discount_type" property="discountType" />
-        <result column="target_users" property="targetUsers" />
-        <result column="apply_station" property="applyStation" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,name, activity_desc, activity_desc_page,start_time, end_time, discount_type, target_users, apply_station, allow_stacke, quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ActivityStationMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.ActivityStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.ActivityStation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="station_id" property="stationId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,activity_id, station_id,status,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserRoleMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.AdminUserRoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserRole">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="role_id" property="roleId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, admin_user_id, role_id,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/AdminUserStationMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.AdminUserStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.AdminUserStation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, admin_user_id, station_id, station_name,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/BannerMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.BannerMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Banner">
-        <result column="id" property="id" />
-        <result column="activity_id" property="activityId" />
-        <result column="banner_desc" property="bannerDesc" />
-        <result column="banner_url" property="bannerUrl" />
-        <result column="link_url" property="linkUrl" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,activity_id, banner_desc, banner_url, link_url, start_time, end_time, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/CompanyMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.CompanyMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Company">
-        <id column="id" property="id" />
-        <result column="company_name" property="companyName" />
-        <result column="company_id" property="companyId" />
-        <result column="super_admin_id" property="superAdminId" />
-        <result column="super_admin_name" property="superAdminName" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,company_name, super_admin_id, super_admin_name, status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ConnectorInfoMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.ConnectorInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.ConnectorInfo">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="connector_id" property="connectorId" />
-        <result column="connector_name" property="connectorName" />
-        <result column="connector_type" property="connectorType" />
-        <result column="voltage_upper_limits" property="voltageUpperLimits" />
-        <result column="voltage_lower_limits" property="voltageLowerLimits" />
-        <result column="current" property="current" />
-        <result column="power" property="power" />
-        <result column="park_no" property="parkNo" />
-        <result column="national_standard" property="nationalStandard" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, connector_id, connector_name, connector_type, voltage_upper_limits, voltage_lower_limits, current, power, park_no, national_standard, status,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/ContactMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.ContactMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Contact">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="mobile" property="mobile" />
-        <result column="code_url" property="codeUrl" />
-        <result column="join_us" property="joinUs" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,mobile, code_url, join_us, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/CouponMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.CouponMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Coupon">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="name" property="name" />
-        <result column="coupon_desc" property="couponDesc" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="validity" property="validity" />
-        <result column="receive_type" property="receiveType" />
-        <result column="coupon_type" property="couponType" />
-        <result column="min_service_money" property="minServiceMoney" />
-        <result column="discount" property="discount" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="claimed_quantity" property="claimedQuantity" />
-        <result column="used_quantity" property="usedQuantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,activity_id,name, coupon_desc, start_time, end_time, validity,receive_type,coupon_type, min_service_money, discount, allow_stacke, quantity, claimed_quantity, used_quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/EquipmentInfoMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.EquipmentInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.EquipmentInfo">
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="equipment_id" property="equipmentId" />
-        <result column="manufacturer_id" property="manufacturerId" />
-        <result column="manufacturer_name" property="manufacturerName" />
-        <result column="equipment_model" property="equipmentModel" />
-        <result column="production_date" property="productionDate" />
-        <result column="equipment_type" property="equipmentType" />
-        <result column="parking_no" property="parkingNo" />
-        <result column="location" property="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-        <result column="power" property="power" />
-        <result column="net_status" property="netStatus" />
-        <result column="service_status" property="serviceStatus" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, station_id,equipment_id, manufacturer_id, manufacturer_name, equipment_model, production_date, equipment_type, parking_no,location, power, net_status, service_status,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/EquipmentRelationMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.EquipmentRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.EquipmentRelation">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="short_id" property="shortId" />
-        <result column="equipment_id" property="equipmentId" />
-        <result column="connector_id" property="connectorId" />
-        <result column="parking_no" property="parkingNo" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,station_id, station_name,short_id, equipment_id,connector_id, parking_no,status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/FaqMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.FaqMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Faq">
-        <result column="question" property="question" />
-        <result column="status" property="status" />
-        <result column="answer" property="answer" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        question, status, answer
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/FeedbackMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.FeedbackMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Feedback">
-        <result column="title" property="title" />
-        <result column="type" property="type" />
-        <result column="status" property="status" />
-        <result column="content" property="content" />
-        <result column="submit_time" property="submitTime" />
-        <result column="attach_list" property="attachList" />
-        <result column="submit_user_id" property="submitUserId" />
-        <result column="reply_content" property="replyContent" />
-        <result column="reply_time" property="replyTime" />
-        <result column="reply_user_id" property="replyUserId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        title, type, status, content, submit_time, attach_list, submit_user_id, reply_content, reply_time, reply_user_id
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/InvestorInfoMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.InvestorInfoMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.InvestorInfo">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="admin_user_name" property="adminUserName" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="vat_rate" property="vatRate" />
-        <result column="splitting_proportion" property="splittingProportion" />
-        <result column="elec_loss_proportion" property="elecLossProportion" />
-        <result column="account_name" property="accountName" />
-        <result column="telephone" property="telephone" />
-        <result column="bank_name" property="bankName" />
-        <result column="bank_card_no" property="bankCardNo" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="tax_no" property="taxNo" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,admin_user_id, admin_user_name, station_id,station_name, vat_rate, splitting_proportion, elec_loss_proportion,account_name, telephone, bank_name, bank_card_no, status, remark,tax_no,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/MonitorLogMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.MonitorLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.MonitorLog">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="type" property="type" />
-        <result column="sn" property="sn" />
-        <result column="offline_time" property="offlineTime" />
-        <result column="offline_status" property="offlineStatus" />
-        <result column="is_notice" property="isNotice" />
-        <result column="is_recover" property="isRecover" />
-        <result column="recover_time" property="recoverTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, type, sn, offline_time, offline_status, is_notice, is_recover, recover_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/PermissionMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.PermissionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Permission">
-        <result column="id" property="id" />
-        <result column="name" property="name" />
-        <result column="value" property="value" />
-        <result column="pid" property="pid" />
-        <result column="weight" property="weight" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,`name`, `value`, `pid`, weight, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RechargeRightsMapper.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.RechargeRightsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.RechargeRights">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="activity_id" property="activityId" />
-        <result column="name" property="name" />
-        <result column="rights_desc" property="rightsDesc" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="validity" property="validity" />
-        <result column="amount_min" property="amountMin" />
-        <result column="amount_max" property="amountMax" />
-        <result column="discount" property="discount" />
-        <result column="allow_stacke" property="allowStacke" />
-        <result column="quantity" property="quantity" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,activity_id,activity_id, name, rights_desc, start_time, end_time,validity, amount_min, amount_max, discount, allow_stacke, quantity, status, remark,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RoleMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.RoleMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Role">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="parent_id" property="parentId" />
-        <result column="role_name" property="roleName" />
-        <result column="role_desc" property="roleDesc" />
-        <result column="permissions" property="permissions" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, parent_id, role_name, role_desc, permissions, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/RolePermissionMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.RolePermissionMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.RolePermission">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="role_id" property="roleId" />
-        <result column="permission_id" property="permissionId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, role_id, permission_id, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StatementsMapper.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.StatementsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Statements">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="admin_user_name" property="adminUserName" />
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="total_power" property="totalPower" />
-        <result column="actual_power" property="actualPower" />
-        <result column="elec_loss_power" property="elecLossPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="actual_elec_money" property="actualElecMoney" />
-        <result column="elec_loss_money" property="elecLossMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="actual_service_money" property="actualServiceMoney" />
-        <result column="splitting_proportion" property="splittingProportion" />
-        <result column="splitting_amount" property="splittingAmount" />
-        <result column="elec_loss_proportion" property="elecLossProportion" />
-        <result column="elec_loss_amount" property="elecLossAmount" />
-        <result column="vat_rate" property="vatRate" />
-        <result column="vat_amount" property="vatAmount" />
-        <result column="actual_splitting_amount" property="actualSplittingAmount" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,admin_user_id, admin_user_name, station_id, station_name, start_time, end_time, total_power, actual_power, elec_loss_power,
-        total_money, elec_money, actual_elec_money, elec_loss_money, service_money, discount_amount, service_money_discount,
-        actual_service_money, splitting_proportion, splitting_amount, elec_loss_proportion,elec_loss_amount,vat_rate, vat_amount, actual_splitting_amount, status, remark, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationMapper.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.StationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.Station">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="group_id" property="groupId" />
-        <result column="station_id" property="stationId" />
-        <result column="operator_id" property="operatorId" />
-        <result column="equipment_owner_id" property="equipmentOwnerId" />
-        <result column="station_name" property="stationName" />
-        <result column="country_code" property="countryCode" />
-        <result column="area_code" property="areaCode" />
-        <result column="picture" property="picture" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-        <result column="address" property="address" />
-        <result column="station_tel" property="stationTel" />
-        <result column="service_tel" property="serviceTel" />
-        <result column="station_type" property="stationType" />
-        <result column="station_status" property="stationStatus" />
-        <result column="parking_num" property="parkingNum" />
-        <result column="location" property="location" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
-        <result column="site_guide" property="siteGuide" />
-        <result column="construction" property="construction" />
-        <result column="pictures" property="pictures" />
-        <result column="match_cars" property="matchCars" />
-        <result column="park_info" property="parkInfo" />
-        <result column="business_hours" property="businessHours" />
-        <result column="electricity_fee" property="electricityFee" />
-        <result column="service_fee" property="serviceFee" />
-        <result column="park_fee" property="parkFee" />
-        <result column="payment" property="payment" />
-        <result column="support_order" property="supportOrder" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, group_id, station_id, operator_id, equipment_owner_id, station_name, country_code, area_code, picture,address, station_tel, service_tel, station_type, station_status, parking_num, location, site_guide, construction, pictures, match_cars, park_info, business_hours, electricity_fee, service_fee, park_fee, payment, support_order, remark, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationNoticeMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.StationNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationNotice">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="notice_id" property="noticeId" />
-        <result column="station_id" property="stationId" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,notice_id, station_id,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatDayMapper.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.StationStatDayMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatDay">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="stat_day" property="statDay" />
-        <result column="charge_users" property="chargeUsers" />
-        <result column="valid_orders" property="validOrders" />
-        <result column="total_power" property="totalPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="avg_order_elec" property="avgOrderElec" />
-        <result column="avg_order_money" property="avgOrderMoney" />
-        <result column="avg_connector_elec" property="avgConnectorElec" />
-        <result column="connector_usage_rate" property="connectorUsageRate" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, stat_day, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/StationStatMonthMapper.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.StationStatMonthMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.StationStatMonth">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="station_id" property="stationId" />
-        <result column="stat_month" property="statMonth" />
-        <result column="charge_users" property="chargeUsers" />
-        <result column="valid_orders" property="validOrders" />
-        <result column="total_power" property="totalPower" />
-        <result column="total_money" property="totalMoney" />
-        <result column="elec_money" property="elecMoney" />
-        <result column="service_money" property="serviceMoney" />
-        <result column="service_money_discount" property="serviceMoneyDiscount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="avg_order_elec" property="avgOrderElec" />
-        <result column="avg_order_money" property="avgOrderMoney" />
-        <result column="avg_connector_elec" property="avgConnectorElec" />
-        <result column="connector_usage_rate" property="connectorUsageRate" />
-        <result column="actual_power" property="actualPower" />
-        <result column="actual_elec_money" property="actualElecMoney" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,station_id, stat_month, charge_users, valid_orders, total_power, total_money, elec_money, service_money,service_money_discount,discount_amount, avg_order_elec, avg_order_money, avg_connector_elec,connector_usage_rate,actual_power,actual_elec_money,create_time,update_time,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/SystemLogMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.SystemLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.SystemLog">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="username" property="username" />
-        <result column="ip" property="ip" />
-        <result column="operation" property="operation" />
-        <result column="method" property="method" />
-        <result column="request_param" property="requestParam" />
-        <result column="execute_time" property="executeTime" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id, user_id, username, ip, operation, method, request_param, execute_time, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/admin/SystemNoticeMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.admin.SystemNoticeMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.admin.SystemNotice">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="title" property="title" />
-        <result column="content" property="content" />
-        <result column="admin_user_name" property="adminUserName" />
-        <result column="admin_user_id" property="adminUserId" />
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,title, content, admin_user_name, admin_user_id, start_time, end_time, status,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AccountMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.AccountMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Account">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="balance" property="balance" />
-        <result column="frozen_amount" property="frozenAmount" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, balance, frozen_amount, status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AppLogMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.AppLogMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.AppLog">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="username" property="username" />
-        <result column="ip" property="ip" />
-        <result column="operation" property="operation" />
-        <result column="method" property="method" />
-        <result column="request_param" property="requestParam" />
-        <result column="execute_time" property="executeTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id, user_id, username, ip, operation, method, request_param, execute_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/AttachmentMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.AttachmentMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Attachment">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="uuid" property="uuid" />
-        <result column="name" property="name" />
-        <result column="size" property="size" />
-        <result column="upload_by" property="uploadBy" />
-        <result column="upload_name" property="uploadName" />
-        <result column="is_delete" property="isDelete" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,uuid, name, size, upload_by, upload_name, is_delete, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/CarsMapper.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.CarsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Cars">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="plate_no" property="plateNo" />
-        <result column="vehicle_type" property="vehicleType" />
-        <result column="address" property="address" />
-        <result column="vin" property="vin" />
-        <result column="use_character" property="useCharacter" />
-        <result column="model" property="model" />
-        <result column="engine_no" property="engineNo" />
-        <result column="register_date" property="registerDate" />
-        <result column="is_defult" property="isDefault" />
-        <result column="is_delete" property="isDelete" />
-        <result column="issue_date" property="issueDate" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, plate_no, vehicle_type, address, vin, use_character, model, engine_no, register_date, is_defult, is_delete, issue_date, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/ChargeOrderMapper.xml

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.ChargeOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.ChargeOrder">
-        <id column="id" property="id"/>
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId"/>
-        <result column="station_id" property="stationId"/>
-        <result column="start_charge_seq" property="startChargeSeq"/>
-        <result column="connector_id" property="connectorId"/>
-        <result column="is_booking" property="isBooking"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="soc" property="soc"/>
-        <result column="total_power" property="totalPower"/>
-        <result column="total_money" property="totalMoney"/>
-        <result column="elec_money" property="elecMoney"/>
-        <result column="service_money" property="serviceMoney"/>
-        <result column="pay_amount" property="payAmount"/>
-        <result column="discount_type" property="discountType"/>
-        <result column="discount_amount" property="discountAmount"/>
-        <result column="service_money_discount" property="serviceMoneyDiscount"/>
-        <result column="pay_service_amount" property="payServiceAmount"/>
-        <result column="sum_period" property="sumPeriod"/>
-        <result column="charge_detail" property="chargeDetail"/>
-        <result column="order_status" property="orderStatus"/>
-        <result column="charge_status" property="chargeStatus"/>
-        <result column="stop_reason" property="stopReason"/>
-        <result column="invoice_status" property="invoiceStatus"/>
-        <result column="invoice_id" property="invoiceId"/>
-        <result column="create_time" property="createTime"/>
-        <result column="update_time" property="updateTime"/>
-    </resultMap>
-
-    <resultMap id="CustomChargeOrderMap" type="com.kym.entity.admin.vo.CustomOrderVo">
-        <result column="user_id" property="userId"/>
-        <result column="mobile_phone" property="mobilePhone"/>
-        <result column="start_charge_seq" property="startChargeSeq"/>
-        <result column="station_id" property="stationId"/>
-        <result column="connector_id" property="connectorId"/>
-        <result column="is_booking" property="isBooking"/>
-        <result column="start_time" property="startTime"/>
-        <result column="end_time" property="endTime"/>
-        <result column="total_power" property="totalPower"/>
-        <result column="total_money" property="totalMoney"/>
-        <result column="elec_money" property="elecMoney"/>
-        <result column="service_money" property="serviceMoney"/>
-        <result column="pay_amount" property="payAmount"/>
-        <result column="discount_type" property="discountType"/>
-        <result column="discount_amount" property="discountAmount"/>
-        <result column="service_money_discount" property="serviceMoneyDiscount"/>
-        <result column="pay_service_amount" property="payServiceAmount"/>
-        <result column="order_status" property="orderStatus"/>
-        <result column="charge_status" property="chargeStatus"/>
-        <result column="stop_reason" property="stopReason"/>
-        <result column="invoice_status" property="invoiceStatus"/>
-        <result column="invoice_id" property="invoiceId"/>
-    </resultMap>
-
-    <resultMap id="StationStatMap" type="com.kym.entity.admin.vo.StationStatVo">
-<!--        <result column="station_id" property="stationId"/>-->
-        <result column="start_time" property="startTime"/>
-        <result column="total_orders" property="totalOrders"/>
-        <result column="total_power" property="totalPower"/>
-        <result column="total_money" property="totalMoney"/>
-        <result column="elec_money" property="elecMoney"/>
-        <result column="service_money" property="serviceMoney"/>
-        <result column="pay_service_amount" property="payServiceAmount"/>
-
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, station_id, start_charge_seq, connector_id, is_booking,start_time, end_time, soc, total_power, total_money, elec_money, service_money,pay_amount,discount_type,discount_amount,service_money_discount, sum_period, charge_detail, order_status, charge_status, stop_reason, invoice_status,invoice_id,create_time, update_time
-    </sql>
-
-    <select id="statChargeOrders" resultType="java.util.Map"
-            parameterType="com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam">
-        SELECT
-        count(*) totalOrders,
-        sum(t1.total_power) totalPower,
-        sum(t1.total_money) totalMoney,
-        sum(t1.elec_money) elecMoney,
-        sum(t1.service_money) serviceMoney,
-        sum(t1.service_money_discount) serviceMoneyDiscount,
-        (sum(t1.service_money) - sum(t1.service_money_discount)) payServiceAmount
-        FROM
-        t_charge_order t1
-        LEFT JOIN t_user t2
-        ON t1.user_id = t2.id
-        <where>
-            <if test="params.userId != null">
-                and t1.user_id = #{params.userId}
-            </if>
-            <if test="params.mobilePhone != null and params.mobilePhone != ''">
-                and t2.mobile_phone = #{params.mobilePhone}
-            </if>
-            <if test="params.connectorId != null and params.connectorId != ''">
-                and t1.connector_id = #{params.connectorId}
-            </if>
-            <if test="params.startChargeSeq != null and params.startChargeSeq != ''">
-                and t1.start_charge_seq = #{params.startChargeSeq}
-            </if>
-            <if test="params.stationId != null and params.stationId != ''">
-                and t1.station_id = #{params.stationId}
-            </if>
-            <if test="params.orderStatus != null">
-                and t1.order_status = #{params.orderStatus}
-            </if>
-            <if test="params.startDate != null">
-                and t1.start_time &gt;= #{params.startDate}
-            </if>
-            <if test="params.endDate != null">
-                and t1.start_time &lt;= #{params.endDate}
-            </if>
-        </where>
-    </select>
-
-    <select id="listChargeOrders" resultMap="CustomChargeOrderMap"
-            parameterType="com.kym.entity.admin.queryParams.CustomChargeOrdersQueryParam">
-        SELECT
-        t1.user_id,
-        t2.mobile_phone,
-        t1.start_charge_seq,
-        t1.station_id,
-        t1.connector_id,
-        t1.start_time,
-        t1.end_time,
-        t1.total_power,
-        t1.total_money,
-        t1.elec_money,
-        t1.service_money,
-        t1.pay_amount,
-        t1.discount_amount,
-        t1.service_money_discount,
-        (t1.service_money - t1.service_money_discount) pay_service_amount,
-        t1.order_status,
-        t1.charge_status,
-        t1.invoice_status,
-        t1.stop_reason
-        FROM
-        t_charge_order t1
-        LEFT JOIN t_user t2
-        ON t1.user_id = t2.id
-        <where>
-            <if test="params.userId != null">
-                and t1.user_id = #{params.userId}
-            </if>
-            <if test="params.mobilePhone != null and params.mobilePhone != ''">
-                and t2.mobile_phone = #{params.mobilePhone}
-            </if>
-            <if test="params.connectorId != null and params.connectorId != ''">
-                and t1.connector_id = #{params.connectorId}
-            </if>
-            <if test="params.stationId != null and params.stationId != ''">
-                and t1.station_id = #{params.stationId}
-            </if>
-            <if test="params.startChargeSeq != null and params.startChargeSeq != ''">
-                and t1.start_charge_seq = #{params.startChargeSeq}
-            </if>
-            <if test="params.chargeStatus != null">
-                and t1.charge_status = #{params.chargeStatus}
-            </if>
-               <if test="params.orderStatus != null">
-                and t1.order_status = #{params.orderStatus}
-            </if>
-            <if test="params.startDate != null">
-                and t1.start_time &gt;= #{params.startDate}
-            </if>
-            <if test="params.endDate != null">
-                and t1.start_time &lt;= #{params.endDate}
-            </if>
-            <if test="params.invoiceStatus != null">
-                and t1.invoice_status = #{params.invoiceStatus}
-            </if>
-            <if test="params.stopReason != null">
-                and t1.stop_reason = #{params.stopReason}
-            </if>
-        </where>
-        order by t1.start_time desc
-    </select>
-
-    <select id="stationStat" resultMap="StationStatMap" parameterType="com.kym.entity.admin.queryParams.StatQueryParam">
-        SELECT
-        <if test="params.stationId != null and params.stationId != ''">
-            t1.station_id,
-        </if>
-        <if test="params.type == null or params.type == 'day'">
-            DATE_FORMAT(t1.start_time, '%Y-%m-%d')
-        </if>
-        <if test="params.type != null and params.type == 'month'">
-            DATE_FORMAT(t1.start_time, '%Y-%m')
-        </if>
-        stat_time,
-        count(t1.id) total_orders,
-        SUM(t1.total_power) total_power,
-        SUM(t1.total_money) total_money,
-        SUM(t1.elec_money) elec_money,
-        SUM(t1.service_money) service_money,
-        (SUM(t1.service_money) - SUM(t1.service_money_discount)) pay_service_amount
-        FROM
-        (SELECT
-        *
-        FROM
-        t_charge_order
-        <where>
-            <if test="params.stationId != null and params.stationId != ''">
-                and station_id = #{params.stationId}
-            </if>
-        </where>
-        ) t1
-        GROUP BY stat_time
-        <trim prefix="having" suffixOverrides="and">
-            <if test="params.startTime != null">
-                stat_time &gt;= #{params.startTime} and
-            </if>
-            <if test="params.endTime != null">
-                stat_time &lt;= #{params.endTime} and
-            </if>
-        </trim>
-        order by stat_time desc
-    </select>
-
-    <select id="stationTodayStat" resultType="java.util.Map" parameterType="String">
-        SELECT
-        COUNT(DISTINCT (t1.user_id)) chargeUsers,
-        COUNT(t1.id) totalOrders,
-        IFNULL (SUM(t1.total_power),0) totalPower,
-        IFNULL(SUM(t1.total_money),0) totalMoney,
-        IFNULL(SUM(t1.pay_amount),0) payAmount,
-        IFNULL(SUM(t1.elec_money),0) elecMoney,
-        IFNULL(SUM(t1.service_money),0) serviceMoney,
-        (IFNULL(SUM(t1.service_money),0) - IFNULL(SUM(t1.service_money_discount),0)) payServiceAmount
-        FROM
-        (SELECT
-        *
-        FROM
-        t_charge_order
-        <where>
-            <if test="stationId != null and stationId != ''">
-                AND station_id = #{stationId}
-            </if>
-            AND start_time &gt;= DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
-            AND start_time &lt;= DATE_FORMAT(NOW(), '%Y-%m-%d 23:59:59')) t1
-        </where>
-    </select>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/CollectMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.miniapp.mapper.CollectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Collect">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="station_id" property="stationId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, station_id, status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/CollectionMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.CollectMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.Collect">
-        <id column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="station_id" property="stationId" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, station_id, status, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/DataDictMapper.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.DataDictMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.DataDict">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="code" property="code" />
-        <result column="name" property="name" />
-        <result column="value" property="value" />
-        <result column="weight" property="weight" />
-        <result column="remark" property="remark" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,code, name, value, weight,remark, create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/DeviceRelationMapper.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.DeviceRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.DeviceRelation">
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="short_id" property="shortId" />
-        <result column="product_key" property="productKey" />
-        <result column="device_name" property="deviceName" />
-        <result column="parking_no" property="parkingNo" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        station_id, station_name, short_id, product_key, device_name, parking_no
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/MpMsgTemplateMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.MpMsgTemplateMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.MpMsgTemplate">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="template_id" property="templateId" />
-        <result column="title" property="title" />
-        <result column="primary_industry" property="primaryIndustry" />
-        <result column="deputy_industry" property="deputyIndustry" />
-        <result column="content" property="content" />
-        <result column="example" property="example" />
-        <result column="page_path" property="pagePath" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,template_id, title, primary_industry, deputy_industry, content, example,page_path,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/MpRelationMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.MpRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.MpRelation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="openid" property="openid" />
-        <result column="mp_openid" property="mpOpenid" />
-        <result column="unionid" property="unionid" />
-        <result column="subscribe" property="subscribe" />
-        <result column="subscribe_scene" property="subscribeScene" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,user_id, openid, mp_openid, unionid, subscribe, subscribe_scene,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/OrderCouponMapper.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.OrderCouponMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.OrderCoupon">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="coupon_id" property="couponId" />
-        <result column="activity_id" property="activityId" />
-        <result column="user_coupon_id" property="userCouponId" />
-        <result column="user_id" property="userId" />
-        <result column="start_charge_seq" property="startChargeSeq" />
-        <result column="coupon_type" property="couponType" />
-        <result column="discount" property="discount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="status" property="status" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,coupon_id, activity_id, user_coupon_id, user_id, start_charge_seq, coupon_type, discount, discount_amount,status,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/OrderRechargeRightsMapper.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.OrderRechargeRightsMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.OrderRechargeRights">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="rights_id" property="rightsId" />
-        <result column="activity_id" property="activityId" />
-        <result column="user_id" property="userId" />
-        <result column="start_charge_seq" property="startChargeSeq" />
-        <result column="discount" property="discount" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,rights_id, activity_id, user_id, start_charge_seq, discount, discount_amount,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/QuestionAnswerMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.QuestionAnswerMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.QuestionAnswer">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="question" property="question" />
-        <result column="answer" property="answer" />
-        <result column="sort" property="sort" />
-        <result column="is_delete" property="isDelete" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id,company_id,question, answer, sort, is_delete,create_time,update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/RechargeConfigMapper.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.RechargeConfigMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.RechargeConfig">
-        <result column="recharge_amount" property="rechargeAmount" />
-        <result column="grants_amount" property="grantsAmount" />
-        <result column="label" property="label" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        recharge_amount, grants_amount, label
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/UserStationMapper.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.UserStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.UserStation">
-        <result column="id" property="id" />
-        <result column="company_id" property="companyId" />
-        <result column="user_id" property="userId" />
-        <result column="station_id" property="stationId" />
-        <result column="mobile_phone" property="mobilePhone" />
-        <result column="total_power" property="totalPower" />
-        <result column="create_time" property="createTime" />
-        <result column="update_time" property="updateTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, company_id,user_id, station_id, mobile_phone, total_power,create_time, update_time
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/WashDeviceMapper.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.WashDeviceMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.WashDevice">
-        <result column="station_id" property="stationId" />
-        <result column="product_key" property="productKey" />
-        <result column="device_name" property="deviceName" />
-        <result column="functions" property="functions" />
-        <result column="state" property="state" />
-        <result column="fault_reason" property="faultReason" />
-        <result column="fsm_state" property="fsmState" />
-        <result column="uptime_ms" property="uptimeMs" />
-        <result column="has_water" property="hasWater" />
-        <result column="has_foam" property="hasFoam" />
-        <result column="temperature_chip" property="temperatureChip" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        station_id, product_key, device_name, functions, state, fault_reason, fsm_state, uptime_ms, has_water, has_foam, temperature_chip
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/WashOrderMapper.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.WashOrderMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.WashOrder">
-        <result column="user_id" property="userId" />
-        <result column="station_id" property="stationId" />
-        <result column="product_key" property="productKey" />
-        <result column="device_name" property="deviceName" />
-        <result column="open_type" property="openType" />
-        <result column="close_type" property="closeType" />
-        <result column="order_id" property="orderId" />
-        <result column="order_id_local" property="orderIdLocal" />
-        <result column="member_discount" property="memberDiscount" />
-        <result column="prepay_money" property="prepayMoney" />
-        <result column="amount" property="amount" />
-        <result column="amount_receivable" property="amountReceivable" />
-        <result column="amount_received" property="amountReceived" />
-        <result column="discount_money" property="discountMoney" />
-        <result column="coin_money" property="coinMoney" />
-        <result column="coin_num" property="coinNum" />
-        <result column="card_type" property="cardType" />
-        <result column="card_id" property="cardId" />
-        <result column="card_sn" property="cardSn" />
-        <result column="card_expired" property="cardExpired" />
-        <result column="card_balance" property="cardBalance" />
-        <result column="operation_remain_time" property="operationRemainTime" />
-        <result column="idle_remain_time" property="idleRemainTime" />
-        <result column="detail" property="detail" typeHandler="com.kym.entity.typehandle.WashOrderDetailTypeHandle"/>
-        <result column="start_time" property="startTime" />
-        <result column="end_time" property="endTime" />
-        <result column="discount_type" property="discountType" />
-        <result column="discount_amount" property="discountAmount" />
-        <result column="order_status" property="orderStatus" />
-        <result column="pay_status" property="payStatus" />
-        <result column="stop_reason" property="stopReason" />
-        <result column="invoice_status" property="invoiceStatus" />
-        <result column="invoice_id" property="invoiceId" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        user_id, station_id, product_key, device_name, open_type, close_type, order_id, order_id_local, member_discount, prepay_money, amount, amount_receivable, amount_received, discount_money, coin_money, coin_num, card_type, card_id, card_sn, card_expired, card_balance, operation_remain_time, idle_remain_time, detail, start_time, end_time, discount_type, discount_amount, order_status, pay_status, stop_reason, invoice_status, invoice_id
-    </sql>
-
-</mapper>

car-wash-mapper/src/main/resources/mappers/miniapp/WashStationMapper.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kym.mapper.miniapp.WashStationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.kym.entity.miniapp.WashStation">
-        <result column="station_id" property="stationId" />
-        <result column="station_name" property="stationName" />
-        <result column="address" property="address" />
-        <result column="station_tel" property="stationTel" />
-        <result column="service_tel" property="serviceTel" />
-        <result column="station_type" property="stationType" />
-        <result column="station_status" property="stationStatus" />
-        <result column="parking_num" property="parkingNum" />
-        <result column="parking_fee" property="parkingFee" />
-        <result column="location" property="location" />
-        <result column="site_guide" property="siteGuide" />
-        <result column="pictures" property="pictures" />
-        <result column="business_hours" property="businessHours" />
-        <result column="remark" property="remark" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        station_id, station_name, address, station_tel, service_tel, station_type, station_status, parking_num, parking_fee, location, site_guide, pictures, business_hours, remark
-    </sql>
-
-</mapper>

car-wash-service/src/main/java/com/kym/service/factory/DiscountStrategyFactory.java

@@ -1,42 +0,0 @@
-package com.kym.service.factory;
-
-import com.kym.entity.admin.Activity;
-import com.kym.service.admin.CouponService;
-import com.kym.service.miniapp.*;
-import com.kym.service.miniapp.impl.CouponDiscountHandle;
-import com.kym.service.miniapp.impl.NoDiscountHandle;
-import com.kym.service.miniapp.impl.RechargeRightsDiscountHandle;
-import org.springframework.stereotype.Component;
-
-/**
- * 优惠策略工厂
- *
- * @author skyline
- */
-@Component
-public class DiscountStrategyFactory {
-
-    private static OrderRechargeRightsService orderRechargeRightsService;
-    private static UserRechargeRightsService userRechargeRightsService;
-    private static OrderCouponService orderCouponService;
-    private static UserCouponService userCouponService;
-    private static CouponService couponService;
-
-    public DiscountStrategyFactory(OrderRechargeRightsService orderRechargeRightsService, UserRechargeRightsService userRechargeRightsService, OrderCouponService orderCouponService, UserCouponService userCouponService, CouponService couponService) {
-        DiscountStrategyFactory.orderRechargeRightsService = orderRechargeRightsService;
-        DiscountStrategyFactory.userRechargeRightsService = userRechargeRightsService;
-        DiscountStrategyFactory.orderCouponService = orderCouponService;
-        DiscountStrategyFactory.userCouponService = userCouponService;
-        DiscountStrategyFactory.couponService = couponService;
-    }
-
-    public static DiscountService getDiscountStrategy(String discountType) {
-        if (Activity.DISCOUNT_TYPE_优惠券.equals(discountType)) {
-            return new CouponDiscountHandle(orderCouponService, userCouponService, couponService);
-        } else if (Activity.DISCOUNT_TYPE_服务费折扣权益.equals(discountType)) {
-            return new RechargeRightsDiscountHandle(orderRechargeRightsService, userRechargeRightsService);
-        } else {
-            return new NoDiscountHandle();
-        }
-    }
-}

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

@@ -1,312 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
-import com.github.pagehelper.PageHelper;
-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.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.queryParams.OrderQueryParams;
-import com.kym.entity.miniapp.vo.ChargeOrderVo;
-import com.kym.service.admin.ExportService;
-import com.kym.service.cache.KymCache;
-import com.kym.service.miniapp.UserCouponService;
-import com.kym.service.miniapp.UserRechargeRightsService;
-import com.kym.service.mybatisplus.MyBaseServiceImpl;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Headers;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-
-/**
- * <p>
- * 充电订单表 服务实现类
- * </p>
- *
- * @author skyline
- * @since 2023-08-08
- */
-@Service
-@Slf4j
-public class ChargeOrderServiceImpl extends MyBaseServiceImpl<ChargeOrderMapper, ChargeOrder> implements ChargeOrderService {
-
-
-    private final ExportService exportService;
-    private final UserCouponService userCouponService;
-    private final UserRechargeRightsService userRechargeRightsService;
-    private final StationStatDayService stationStatDayService;
-    private final StationStatMonthService stationStatMonthService;
-
-    private final StringRedisTemplate redisTemplate;
-    @Value("${en-plus.sassClose}")
-    public String saasClose;
-
-
-    public ChargeOrderServiceImpl(ExportService exportService, @Lazy UserCouponService userCouponService, UserRechargeRightsService userRechargeRightsService,
-                                  StationStatDayService stationStatDayService, StationStatMonthService stationStatMonthService, StringRedisTemplate redisTemplate) {
-        this.exportService = exportService;
-        this.userCouponService = userCouponService;
-        this.userRechargeRightsService = userRechargeRightsService;
-        this.stationStatDayService = stationStatDayService;
-        this.stationStatMonthService = stationStatMonthService;
-        this.redisTemplate = redisTemplate;
-    }
-
-    @Override
-    public ChargeOrder getChargingOrderByUserId(Long userId) {
-        return lambdaQuery()
-                .eq(ChargeOrder::getUserId, userId)
-                .eq(ChargeOrder::getOrderStatus, ChargeOrder.ORDER_STATUS_未知)
-                .in(ChargeOrder::getChargeStatus, ChargeOrder.CHARGE_STATUS_预约中, ChargeOrder.CHARGE_STATUS_启动中, ChargeOrder.CHARGE_STATUS_充电中, ChargeOrder.CHARGE_STATUS_停止中)
-                .one();
-    }
-
-    @Override
-    public ChargeOrder getChargingOrderByStartChargeSeq(String startChargeSeq) {
-        return lambdaQuery().eq(ChargeOrder::getStartChargeSeq, startChargeSeq).one();
-    }
-
-    @Override
-    public PageBean<CustomOrderVo> customChargeOrders(CustomChargeOrdersQueryParam params) {
-        if (params.getConnectorId() != null) {
-            var connectorId = KymCache.INSTANCE.getConnectorId(params.getConnectorId());
-            params.setConnectorId(connectorId);
-        }
-        // 判断数据权限
-        if (params.getStationId() == null) {
-            params.setStationId(CommUtil.isEmptyOrNull(KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong())) ? null : KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong()).get(0));
-        }
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        // 查询订单列表（订单编号，手机号，充电站，充电桩SN/短码，订单状态，建单时间，结算时间，充电电量，实付金额，付款状态）
-        var result = baseMapper.listChargeOrders(params);
-        var page = new PageBean<>(result);
-        page.setList(result.stream().map(item ->
-                item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getConnectorId()))
-                        .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId()))).collect(Collectors.toList()));
-        var map = baseMapper.statChargeOrders(params);
-        return page.setExtraData(map);
-    }
-
-    @SneakyThrows
-    @Override
-    public void exportCustomChargeOrders(CustomChargeOrdersQueryParam params, HttpServletResponse response) {
-
-        if (params.getConnectorId() != null) {
-            var connectorId = KymCache.INSTANCE.getConnectorId(params.getConnectorId());
-            params.setConnectorId(connectorId);
-        }
-        // 判断数据权限
-        var adminStationIds = KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong());
-        if (params.getStationId() != null && adminStationIds.contains(params.getStationId())) {
-            params.setStationId(adminStationIds.get(0));
-        }
-        // 查询订单列表（订单编号，手机号，充电站，充电桩SN/短码，订单状态，建单时间，结算时间，充电电量，实付金额，付款状态）
-        var result = baseMapper.listChargeOrders(params);
-        result = result.stream().map(item ->
-                        item.setShortId(KymCache.INSTANCE.getShortIdByEquipmentIdOrConnectorId(item.getConnectorId()))
-                                .setStationName(KymCache.INSTANCE.getStationNameById(item.getStationId())))
-                .toList();
-
-        // stationId,startChargeSeq,connectorId,startTime,endTime,totalPower,totalMoney,elecMoney,serviceMoney,orderStatus,chargeStatus,stopReason,invoiceStatus
-        var rows = result.stream().map(item -> {
-            var map = new HashMap<String, Object>();
-            map.put("stationId", item.getStationId());
-            map.put("startChargeSeq", item.getStartChargeSeq());
-            map.put("connectorId", item.getConnectorId());
-            map.put("startTime", item.getStartTime() == null ? "-" : item.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            map.put("endTime", item.getEndTime() == null ? "-" : item.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-            map.put("totalPower", item.getTotalPower());
-            map.put("totalMoney", BigDecimal.valueOf(item.getTotalMoney()).divide(BigDecimal.valueOf(100)));
-            map.put("elecMoney", BigDecimal.valueOf(item.getElecMoney()).divide(BigDecimal.valueOf(100)));
-            map.put("serviceMoney", BigDecimal.valueOf(item.getServiceMoney()).divide(BigDecimal.valueOf(100)));
-            map.put("orderStatus", item.getOrderStatus());
-            map.put("chargeStatus", item.getChargeStatus());
-            return map;
-        }).toList();
-
-        // 通过工具类创建writer，默认创建xls格式
-        ExcelWriter writer = ExcelUtil.getWriter();
-
-        //自定义标题别名
-        writer.addHeaderAlias("stationId", "站点ID");
-        writer.addHeaderAlias("startChargeSeq", "充电订单号");
-        writer.addHeaderAlias("connectorId", "充电设备接口编号");
-        writer.addHeaderAlias("startTime", "充电开始时间");
-        writer.addHeaderAlias("endTime", "充电结束时间");
-        writer.addHeaderAlias("totalPower", "充电量（度）");
-        writer.addHeaderAlias("totalMoney", "累积总金额（元）");
-        writer.addHeaderAlias("elecMoney", "累积电费（元）");
-        writer.addHeaderAlias("serviceMoney", "累积服务费（元）");
-        writer.addHeaderAlias("orderStatus", "订单状态");
-        writer.addHeaderAlias("chargeStatus", "充电状态");
-        exportService.exportExcel("订单列表", writer, rows, response);
-    }
-
-    @Override
-    public PageBean<ChargeOrderVo> listUserChargeOrders(OrderQueryParams params) {
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var list = lambdaQuery()
-                .eq(!CommUtil.isEmptyOrNull(params.getInvoiceStatus()), ChargeOrder::getInvoiceStatus, params.getInvoiceStatus())
-                .eq(ChargeOrder::getUserId, StpUtil.getLoginIdAsLong()).orderByDesc(ChargeOrder::getId).list();
-        var res = new PageBean<>(list);
-        var voList = list.stream().map(chargeOrder -> {
-            var vo = new ChargeOrderVo();
-            BeanUtils.copyProperties(chargeOrder, vo);
-            vo.setPayServiceAmount(vo.getServiceMoney() - vo.getDiscountAmount());
-            return vo;
-        }).toList();
-        return new PageBean<>(voList).setList(res);
-    }
-
-
-    @Override
-    public ChargeOrderVo orderDetailForApp(String startChargeSeq) {
-        var chargeOrder = lambdaQuery().eq(ChargeOrder::getStartChargeSeq, startChargeSeq).one();
-        // 订单对应的优惠信息
-        var orderVo = new ChargeOrderVo();
-        BeanUtils.copyProperties(chargeOrder, orderVo);
-        orderVo.setStationName(KymCache.INSTANCE.getStationNameById(chargeOrder.getStationId()));
-        // todo 修改成只显示优惠金额，具体优惠信息点击详情查看具体权益卡/优惠券
-//        if (chargeOrder.getDiscountAmount() > 0) {
-//            // 充值权益
-//            var orderRechargeRight = orderRechargeRightsService.lambdaQuery().eq(OrderRechargeRights::getStartChargeSeq, startChargeSeq).one();
-//            DynamicDataSourceContextHolder.push("db-admin");
-//            var rechargeRights = rechargeRightsService.lambdaQuery().eq(RechargeRights::getId, orderRechargeRight.getRightsId()).one();
-//            DynamicDataSourceContextHolder.poll();
-//            var desc = rechargeRights.getRightsDesc();
-//            orderVo.setRightsDesc(desc);
-//        }
-        return orderVo;
-    }
-
-
-    @Override
-    public Object orderDiscountDetail(String startChargeSeq, String discountType) {
-        return switch (discountType) {
-            case Activity.DISCOUNT_TYPE_服务费折扣权益 ->
-                    userRechargeRightsService.getUserOrderRechargeRights(startChargeSeq);
-            case Activity.DISCOUNT_TYPE_优惠券 -> userCouponService.getUserOrderCoupon(startChargeSeq);
-            default -> throw new BusinessException("未知的优惠类型");
-        };
-    }
-
-
-    /**
-     * 通过En+ sass关闭订单
-     *
-     * @param startChargeSeq
-     */
-    @Override
-    public void closeChargeOrder(String startChargeSeq) {
-        Headers headers = Headers.of("satoken", redisTemplate.opsForValue().get(RedisKeys.EN_PLUS_SASS_TOKEN));
-        var res = HttpUtil.parseJson(HttpUtil.post(saasClose + startChargeSeq, headers));
-        if (!(res.containsKey("success") && res.getBoolean("success"))) {
-            log.error("关闭订单失败:{}", res);
-            throw new BusinessException("关闭订单失败");
-        }
-    }
-
-
-    /**
-     * 站点统计
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public PageBean<StationStatVo> stationStat(StatQueryParam params) {
-        // 判断数据权限
-        var adminStationIds = KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong());
-        if (params.getStationId() == null && !adminStationIds.isEmpty()) {
-            params.setStationId(adminStationIds.get(0));
-        }
-        PageHelper.startPage(params.getPageNum(), params.getPageSize());
-        var res = baseMapper.stationStat(params).stream().peek(item -> {
-            item.setElecMoneyPercent((new BigDecimal(item.getElecMoney())).divide(new BigDecimal(Math.max(1, item.getTotalMoney())), 2, RoundingMode.HALF_UP));
-            item.setServiceMoneyPercent(BigDecimal.ONE.subtract(item.getElecMoneyPercent()));
-        }).collect(Collectors.toList());
-        var map = Map.of(
-                "totalPower", BigDecimal.valueOf(res.stream().mapToDouble(StationStatVo::getTotalPower).sum()).setScale(2, RoundingMode.HALF_UP).doubleValue(),
-                "serviceMoney", res.stream().mapToInt(StationStatVo::getServiceMoney).sum(),
-                "payServiceAmount", res.stream().mapToInt(StationStatVo::getPayServiceAmount).sum()
-        );
-        return new PageBean<>(res).setExtraData(map);
-    }
-
-    /**
-     * 站点统计详情
-     *
-     * @param params
-     * @return
-     */
-    @Override
-    public Map<String, ?> stationStatDetail(StatQueryParam params) {
-
-        CommUtil.asserts(CommUtil.isNotEmptyAndNull(params.getStationIds()), "站点不能为空");
-        if (params.getType().equals(StatQueryParam.TYPE_DAY)) {
-            return stationStatDayService.lambdaQuery()
-                    .in(StationStatDay::getStationId, params.getStationIds())
-                    .ge(StationStatDay::getStatDay, params.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                    .le(StationStatDay::getStatDay, params.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                    .orderByAsc(StationStatDay::getStatDay)
-                    .list().stream().collect(Collectors.groupingBy(StationStatDay::getStationId, Collectors.toList()));
-        } else {
-            return stationStatMonthService.lambdaQuery()
-                    .in(StationStatMonth::getStationId, params.getStationIds())
-                    .ge(StationStatMonth::getStatMonth, params.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM")))
-                    .le(StationStatMonth::getStatMonth, params.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM")))
-                    .orderByAsc(StationStatMonth::getStatMonth)
-                    .list().stream().collect(Collectors.groupingBy(StationStatMonth::getStationId, Collectors.toList()));
-        }
-    }
-
-    /**
-     * 充电站当日统计
-     *
-     * @return
-     */
-    @Override
-    public Map<String, Object> stationTodayStat(String stationId) {
-        if (CommUtil.null2Long(stationId) <= 0) {
-            // 判断数据权限
-            stationId = CommUtil.isEmptyOrNull(KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong())) ? null : KymCache.INSTANCE.getAdminUserStationIds(StpUtil.getLoginIdAsLong()).get(0);
-        }
-
-        return baseMapper.stationTodayStat(stationId);
-    }
-
-    /**
-     * 订单号批量查询订单
-     *
-     * @param startChargeSeqs
-     * @return
-     */
-    @Override
-    public List<ChargeOrder> getChargeOrdersBySeqs(String[] startChargeSeqs) {
-        return lambdaQuery().in(ChargeOrder::getStartChargeSeq, Arrays.stream(startChargeSeqs).toList()).list();
-    }
-
-}

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

@@ -1,103 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import com.kym.entity.admin.Coupon;
-import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.OrderCoupon;
-import com.kym.entity.miniapp.UserCoupon;
-import com.kym.service.admin.CouponService;
-import com.kym.service.miniapp.OrderCouponService;
-import com.kym.service.miniapp.UserCouponService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 优惠券计算
- *
- * @author skyline
- */
-@Service
-@Slf4j
-public class CouponDiscountHandle implements DiscountService {
-    private final OrderCouponService orderCouponService;
-    private final UserCouponService userCouponService;
-
-    private final CouponService couponService;
-
-    public CouponDiscountHandle(OrderCouponService orderCouponService, UserCouponService userCouponService, CouponService couponService) {
-        this.orderCouponService = orderCouponService;
-        this.userCouponService = userCouponService;
-        this.couponService = couponService;
-    }
-
-
-    @Override
-    @Transactional
-    public void computeDiscount(ChargeOrder chargeOrder, Account account) {
-        int discountAmount = 0;
-
-        try {
-            // 获取订单优惠券
-            var orderCoupon = orderCouponService.lambdaQuery()
-                    .eq(OrderCoupon::getStartChargeSeq, chargeOrder.getStartChargeSeq())
-                    .eq(OrderCoupon::getUserId, chargeOrder.getUserId())
-                    .one();
-
-            // 查询用户优惠券信息
-            var userCoupon = userCouponService.lambdaQuery()
-                    .eq(UserCoupon::getId, orderCoupon.getUserCouponId())
-                    .eq(UserCoupon::getUserId, chargeOrder.getUserId())
-                    .one();
-
-            // 检查是否达到使用门槛
-            if (chargeOrder.getServiceMoney() >= userCoupon.getMinServiceMoney()) {
-                // 根据优惠券类型处理
-                switch (userCoupon.getCouponType()) {
-                    case Coupon.COUPON_TYPE_满减券:
-                        discountAmount = userCoupon.getDiscount();
-                        break;
-                    case Coupon.COUPON_TYPE_折扣券:
-                        discountAmount = chargeOrder.getServiceMoney() * (100 - userCoupon.getDiscount()) / 100;
-                        break;
-                    default:
-                        break;
-                }
-
-                // 订单金额、优惠金额更新
-                chargeOrder.setDiscountAmount(discountAmount);
-                chargeOrder.setServiceMoneyDiscount(discountAmount);
-                chargeOrder.setPayAmount(chargeOrder.getTotalMoney() - discountAmount);
-
-                // 更新用户优惠券信息
-                userCouponService.lambdaUpdate()
-                        .set(UserCoupon::getStatus, UserCoupon.STATUS_无效)
-                        .set(UserCoupon::getUsageStatus, UserCoupon.USAGE_STATUS_已使用)
-                        .eq(UserCoupon::getId, userCoupon.getId())
-                        .update();
-
-                // 更新订单优惠券关联信息
-                orderCouponService.lambdaUpdate()
-                        .set(OrderCoupon::getDiscountAmount, discountAmount)
-                        .set(OrderCoupon::getStatus, OrderCoupon.STATUS_使用成功)
-                        .eq(OrderCoupon::getStartChargeSeq, chargeOrder.getStartChargeSeq())
-                        .eq(OrderCoupon::getUserCouponId, userCoupon.getId())
-                        .update();
-
-                // 优惠券使用情况数据
-                couponService.usedQuantifyCount(userCoupon.getCouponId());
-            } else {
-                orderCouponService.lambdaUpdate()
-                        .set(OrderCoupon::getStatus, OrderCoupon.STATUS_使用失败)
-                        .eq(OrderCoupon::getStartChargeSeq, chargeOrder.getStartChargeSeq())
-                        .eq(OrderCoupon::getUserCouponId, userCoupon.getId())
-                        .update();
-                log.error("订单使用优惠券失败：订单号：{}，优惠券id{}：服务费未达到优惠券使用门槛", chargeOrder.getStartChargeSeq(), userCoupon.getCouponId());
-            }
-        } catch (Exception e) {
-            log.error("处理优惠券失败", e);
-            // 可以添加一些错误处理逻辑，比如重试机制、发送告警等
-        }
-    }
-
-
-}

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

@@ -1,25 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import com.kym.entity.miniapp.Account;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-/**
- * 无优惠策略
- *
- * @author skyline
- */
-@Service
-@Slf4j
-public class NoDiscountHandle implements DiscountService {
-
-    @Override
-    public void computeDiscount(ChargeOrder chargeOrder, Account account) {
-        chargeOrder.setDiscountAmount(0);
-        chargeOrder.setServiceMoneyDiscount(0);
-    }
-
-    ;
-
-
-}

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

@@ -1,123 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import com.kym.entity.miniapp.Account;
-import com.kym.entity.miniapp.OrderRechargeRights;
-import com.kym.entity.miniapp.UserRechargeRights;
-import com.kym.service.miniapp.OrderRechargeRightsService;
-import com.kym.service.miniapp.UserRechargeRightsService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-
-/**
- * 充值优惠计算
- *
- * @author skyline
- */
-@Service
-@Slf4j
-public class RechargeRightsDiscountHandle implements DiscountService {
-
-
-    private final OrderRechargeRightsService orderRechargeRightsService;
-    private final UserRechargeRightsService userRechargeRightsService;
-
-    public RechargeRightsDiscountHandle(OrderRechargeRightsService orderRechargeRightsService, UserRechargeRightsService userRechargeRightsService) {
-        this.orderRechargeRightsService = orderRechargeRightsService;
-        this.userRechargeRightsService = userRechargeRightsService;
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void computeDiscount(ChargeOrder chargeOrder, Account account) {
-        int discountAmount;
-
-        try {
-            // 获取订单权益，计算订单优惠金额，实付金额，服务费优惠金额
-            var orderRechargeRights = orderRechargeRightsService.lambdaQuery()
-                    .eq(OrderRechargeRights::getStartChargeSeq, chargeOrder.getStartChargeSeq())
-                    .eq(OrderRechargeRights::getUserId, chargeOrder.getUserId())
-                    .one();
-            if (orderRechargeRights != null) {
-                // 获取折扣，计算优惠
-                var discount = orderRechargeRights.getDiscount();
-                // 服务费优惠金额只保留到分，分以下不进行四舍五入
-                var serviceMoneyDiscount = (int) (chargeOrder.getServiceMoney() * (BigDecimal.valueOf(1).subtract(BigDecimal.valueOf(discount).divide(BigDecimal.valueOf(100)))).doubleValue());
-                chargeOrder
-                        .setPayAmount(chargeOrder.getTotalMoney() - serviceMoneyDiscount)
-                        .setDiscountAmount(serviceMoneyDiscount)
-                        .setServiceMoneyDiscount(serviceMoneyDiscount);
-
-                orderRechargeRights.setDiscountAmount(serviceMoneyDiscount);
-
-                // 用户充值权益
-                var userRechargeRights = userRechargeRightsService.lambdaQuery()
-                        .eq(UserRechargeRights::getId, orderRechargeRights.getUserRightsId())
-                        .eq(UserRechargeRights::getUserId, chargeOrder.getUserId())
-                        .eq(UserRechargeRights::getRightsId, orderRechargeRights.getRightsId())
-                        .one();
-
-                // 用户当前权益金余额是否足够支付本次充电费用
-                if (userRechargeRights.getStatus() == UserRechargeRights.STATUS_有效) {
-                    if (chargeOrder.getPayAmount() <= userRechargeRights.getRightsBalance()) {
-                        userRechargeRights
-                                // 用户权益包余额扣减当前订单实付金额
-                                .setRightsBalance(userRechargeRights.getRightsBalance() - chargeOrder.getPayAmount())
-                                .setDiscountAmount(userRechargeRights.getDiscountAmount() + serviceMoneyDiscount);
-
-                        // 账户设置优惠不可退金额
-                        discountAmount = account.getDiscountAmount() + serviceMoneyDiscount;
-                        account.setDiscountAmount(discountAmount);
-                        if (chargeOrder.getPayAmount().intValue() == userRechargeRights.getRightsBalance().intValue()) {
-                            userRechargeRights.setStatus(UserRechargeRights.STATUS_无效);
-                        }
-                    } else {
-                        // 不足(用户当前权益金余额是否足够支付本次充电费用)
-                        // 如果优惠后的实付金额大于权益金余额，那么实际优惠金额需要通过权益金余额反推
-                        // 通过权益金余额，反推最多扣减多少服务费
-                        // rightBalance = elecMoney + serviceMoney * (1-discount)
-                        // 订单中elecMoney与serviceMoney的比值是一定的
-                        var ratio = BigDecimal.valueOf(chargeOrder.getElecMoney()).divide(BigDecimal.valueOf(chargeOrder.getServiceMoney()), 2, RoundingMode.HALF_UP);
-                        // (ratio * realServiceMoney) + (realServiceMoney * (100 - discount)/100) = rightBalance
-                        var discountRate = BigDecimal.valueOf(discount).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
-                        var userRightBalance = BigDecimal.valueOf(userRechargeRights.getRightsBalance());
-                        // 真实可以覆盖的服务费金额
-                        var realServiceMoney = userRightBalance.divide(ratio.add(BigDecimal.valueOf(1)).subtract(discountRate), 2, RoundingMode.HALF_UP);
-                        // 实际优惠金额 = 实际可以覆盖的服务费金额 * 折扣率
-                        var realDiscountAmount = realServiceMoney.multiply(BigDecimal.valueOf(1).subtract(discountRate)).intValue();
-                        chargeOrder
-                                // 实付金额
-                                .setPayAmount(chargeOrder.getTotalMoney() - realDiscountAmount)
-                                .setDiscountAmount(realDiscountAmount)
-                                .setServiceMoneyDiscount(realDiscountAmount);
-                        // 余额扣完,总优惠金额加上最后一次真实优惠金额，此条用户权益结束，状态设置为无效
-                        userRechargeRights
-                                .setRightsBalance(0)
-                                .setDiscountAmount(userRechargeRights.getDiscountAmount() + realDiscountAmount)
-                                .setStatus(UserRechargeRights.STATUS_无效);
-
-                        orderRechargeRights.setDiscountAmount(realDiscountAmount);
-                        // 此权益包消耗完毕，账户设置优惠不可退金额
-                        discountAmount = account.getDiscountAmount() + realDiscountAmount;
-                        account.setDiscountAmount(discountAmount);
-                    }
-                }
-
-                // 更新订单权益的最终优惠金额
-                orderRechargeRightsService.updateById(orderRechargeRights);
-                // 更新用户权益金等
-                userRechargeRightsService.updateById(userRechargeRights);
-            }
-
-
-        } catch (Exception e) {
-            log.error("处理充值优惠失败", e);
-            // 可以添加一些错误处理逻辑，比如重试机制、发送告警等
-        }
-    }
-
-
-}

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

@@ -1,77 +0,0 @@
-package com.kym.service.miniapp.impl;
-
-import cn.hutool.core.date.StopWatch;
-import com.kym.entity.miniapp.User;
-import com.kym.entity.miniapp.UserStation;
-import com.kym.mapper.miniapp.UserStationMapper;
-import com.kym.service.miniapp.UserService;
-import com.kym.service.mybatisplus.MyBaseServiceImpl;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 用户所属站点表 服务实现类
- * </p>
- *
- * @author skyline
- * @since 2024-08-19
- */
-@Service
-@Slf4j
-public class UserStationServiceImpl extends MyBaseServiceImpl<UserStationMapper, UserStation> implements UserStationService {
-    private UserService userService;
-
-    private ChargeOrderService chargeOrderService;
-
-    public UserStationServiceImpl(UserService userService, ChargeOrderService chargeOrderService) {
-        this.userService = userService;
-        this.chargeOrderService = chargeOrderService;
-    }
-
-    @Transactional
-    @Override
-    public void initUserStation() {
-        StopWatch stopWatch = new StopWatch();
-        stopWatch.start();
-        // 用户id对应手机号映射
-//        var userId2MobilePhone = userService.list().stream().collect(Collectors.toMap(User::getId, User::getMobilePhone));
-        var userId2MobilePhone = userService.lambdaQuery().select(User::getId, User::getMobilePhone).list().stream().collect(Collectors.toMap(User::getId, User::getMobilePhone));
-        // 获取所有完成充电的订单
-//        var chargeOrderList = chargeOrderService.lambdaQuery().eq(ChargeOrder::getOrderStatus, ChargeOrder.ORDER_STATUS_成功).list();
-        var chargeOrderList = chargeOrderService.lambdaQuery().select(ChargeOrder::getUserId, ChargeOrder::getStationId, ChargeOrder::getTotalPower).list();
-        // 将订单按照用户id和站点id分组并计算出每个用户在每个站点下的充电量
-        var userStationMap = chargeOrderList.stream()
-                .collect(Collectors.groupingBy(chargeOrder -> chargeOrder.getUserId() + ":" + chargeOrder.getStationId(),
-                        Collectors.summarizingDouble(ChargeOrder::getTotalPower)));
-        var userStationList = new ArrayList<UserStation>();
-        userStationMap.forEach((k, v) -> {
-            var userId = Long.valueOf(k.split(":")[0]);
-            var stationId = k.split(":")[1];
-            var userStation = new UserStation().setUserId(userId).setStationId(stationId).setMobilePhone(userId2MobilePhone.get(userId)).setTotalPower(v.getSum());
-            userStationList.add(userStation);
-        });
-        // 批量更新或写入
-        replaceBatch(userStationList);
-        stopWatch.stop();
-        log.info("初始化用户站点表完成，耗时：{}", stopWatch.getTotalTimeSeconds());
-    }
-
-    /**
-     * 订单结束时更新用户站点数据
-     *
-     * @param chargeOrder
-     */
-    @Override
-    public void updateUserStation(ChargeOrder chargeOrder) {
-        lambdaUpdate().setSql("total_power = total_power + #{chargeOrder.totalPower}")
-                .eq(UserStation::getUserId, chargeOrder.getUserId()).eq(UserStation::getStationId, chargeOrder.getStationId())
-                .update();
-    }
-
-
-}

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

@@ -81,8 +81,6 @@ public class WxPayServiceImpl implements WxPayService {
 
     private final AccountService accountService;
 
-    private final ChargeOrderService chargeOrderService;
-
     private final RefundLogService refundLogService;
 
     private final ActivityService activityService;
@@ -99,7 +97,7 @@ public class WxPayServiceImpl implements WxPayService {
 
 
     public WxPayServiceImpl(WxPayConfig conf, WalletDetailService walletDetailService,
-                            PayLogService payLogService, AccountService accountService, ChargeOrderService chargeOrderService,
+                            PayLogService payLogService, AccountService accountService,
                             RefundLogService refundLogService,
                             ActivityService activityService, UserRechargeRightsService userRechargeRightsService,
                             RechargeConfigService rechargeConfigService) {
@@ -107,7 +105,6 @@ public class WxPayServiceImpl implements WxPayService {
         this.walletDetailService = walletDetailService;
         this.payLogService = payLogService;
         this.accountService = accountService;
-        this.chargeOrderService = chargeOrderService;
         this.refundLogService = refundLogService;
         this.activityService = activityService;
         this.userRechargeRightsService = userRechargeRightsService;
@@ -339,12 +336,6 @@ public class WxPayServiceImpl implements WxPayService {
                 payLogService.save(payLog);
                 LOGGER.info("微信支付回调{}：业务处理结束", notifyRes[2]);
 
-                // 如果存在进行中的订单，则向en+更新用户余额
-                var chargingOrder = chargeOrderService.getChargingOrderByUserId(walletDetail.getUserId());
-                if (chargingOrder != null) {
-//                    var res = enPlusService.updateBalanceByQueryEquipChargeStatus(chargingOrder.getStartChargeSeq(), account.getBalance() - 50);
-//                    LOGGER.info("用户：{}充电过程中充值，已更新en+充电金额,en+返回数据：{}", account.getUserId(), res);
-                }
                 return ResponseEntity.status(HttpStatus.OK).build();
 
             } else {
@@ -370,10 +361,10 @@ public class WxPayServiceImpl implements WxPayService {
     @Transactional(rollbackFor = Exception.class)
     public void applyWxRefund(String reason) {
         var userId = StpUtil.getLoginIdAsLong();
-        var chargeOrder = chargeOrderService.getChargingOrderByUserId(userId);
-        if (chargeOrder != null) {
-            throw new BusinessException("存在未完结的订单，请等待所有订单完结之后重试");
-        }
+//        var chargeOrder = chargeOrderService.getChargingOrderByUserId(userId);
+//        if (chargeOrder != null) {
+//            throw new BusinessException("存在未完结的订单，请等待所有订单完结之后重试");
+//        }
 
         var account = accountService.getAccountByUserId(userId);
         if (account.getBalance() <= 0) {