feature: 卡务中心代码优化

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/XfCreditAccountBack.java

@@ -73,7 +73,7 @@ public class XfCreditAccountBack extends TenantEntity {
     /**
      * 使用类型,100-消费系统
      */
-    private Long useYpe;
+    private Integer useType;
 
     /**
      * 工作站Id

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfCreditaccountbackMapper.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfCreditAccountBackMapper.java

@@ -10,6 +10,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author Yb
  * @date 2024-08-15
  */
-public interface XfCreditaccountbackMapper extends BaseMapperPlus<XfCreditAccountBack, XfCreditAccountBackVo> {
+public interface XfCreditAccountBackMapper extends BaseMapperPlus<XfCreditAccountBack, XfCreditAccountBackVo> {
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfCreditaccountMapper.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfCreditAccountMapper.java

@@ -10,6 +10,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author LionLi
  * @date 2024-08-15
  */
-public interface XfCreditaccountMapper extends BaseMapperPlus<XfCreditAccount, XfCreditAccountVo> {
+public interface XfCreditAccountMapper extends BaseMapperPlus<XfCreditAccount, XfCreditAccountVo> {
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfUsertotalMapper.java → ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/mapper/XfUserTotalMapper.java

@@ -10,6 +10,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @author LionLi
  * @date 2024-08-15
  */
-public interface XfUsertotalMapper extends BaseMapperPlus<XfUserTotal, XfUserTotalVo> {
+public interface XfUserTotalMapper extends BaseMapperPlus<XfUserTotal, XfUserTotalVo> {
 
 }

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfCreditAccountBackServiceImpl.java

@@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.dromara.backstage.consumption.mapper.XfCreditaccountbackMapper;
+import org.dromara.backstage.consumption.mapper.XfCreditAccountBackMapper;
 import org.dromara.backstage.consumption.service.IXfCreditAccountBackService;
 
 import java.util.List;
@@ -29,7 +29,7 @@ import java.util.Collection;
 @Service
 public class XfCreditAccountBackServiceImpl implements IXfCreditAccountBackService {
 
-    private final XfCreditaccountbackMapper baseMapper;
+    private final XfCreditAccountBackMapper baseMapper;
 
     /**
      * 查询资金收支备份
@@ -79,7 +79,7 @@ public class XfCreditAccountBackServiceImpl implements IXfCreditAccountBackServi
         lqw.eq(bo.getCardValue() != null, XfCreditAccountBack::getCardValue, bo.getCardValue());
         lqw.eq(StringUtils.isNotBlank(bo.getMainCard()), XfCreditAccountBack::getMainCard, bo.getMainCard());
         lqw.eq(StringUtils.isNotBlank(bo.getBagType()), XfCreditAccountBack::getBagType, bo.getBagType());
-        lqw.eq(bo.getUseType() != null, XfCreditAccountBack::getUseYpe, bo.getUseType());
+        lqw.eq(bo.getUseType() != null, XfCreditAccountBack::getUseType, bo.getUseType());
         lqw.eq(bo.getStationId() != null, XfCreditAccountBack::getStationId, bo.getStationId());
         lqw.eq(bo.getOperatorId() != null, XfCreditAccountBack::getOperatorId, bo.getOperatorId());
         lqw.eq(bo.getCreditTime() != null, XfCreditAccountBack::getCreditTime, bo.getCreditTime());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfCreditAccountServiceImpl.java

@@ -1,6 +1,5 @@
 package org.dromara.backstage.consumption.service.impl;
 
-import com.baomidou.dynamic.datasource.annotation.DS;
 import org.dromara.backstage.consumption.domain.XfCreditAccount;
 import org.dromara.backstage.consumption.domain.bo.XfCreditAccountBo;
 import org.dromara.backstage.consumption.domain.vo.XfCreditAccountVo;
@@ -13,7 +12,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
-import org.dromara.backstage.consumption.mapper.XfCreditaccountMapper;
+import org.dromara.backstage.consumption.mapper.XfCreditAccountMapper;
 import org.dromara.backstage.consumption.service.IXfCreditAccountService;
 
 import java.util.List;
@@ -30,7 +29,7 @@ import java.util.Collection;
 @Service
 public class XfCreditAccountServiceImpl implements IXfCreditAccountService {
 
-    private final XfCreditaccountMapper baseMapper;
+    private final XfCreditAccountMapper baseMapper;
 
     /**
      * 查询资金收支明细

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfUserTotalServiceImpl.java

@@ -1,7 +1,6 @@
 package org.dromara.backstage.consumption.service.impl;
 
 import cn.hutool.core.util.ObjUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -10,7 +9,7 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.backstage.consumption.domain.XfUserTotal;
 import org.dromara.backstage.consumption.domain.bo.XfUserTotalBo;
 import org.dromara.backstage.consumption.domain.vo.XfUserTotalVo;
-import org.dromara.backstage.consumption.mapper.XfUsertotalMapper;
+import org.dromara.backstage.consumption.mapper.XfUserTotalMapper;
 import org.dromara.backstage.consumption.service.IXfUserTotalService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -31,10 +30,9 @@ import java.util.Map;
  */
 @RequiredArgsConstructor
 @Service
-@DS("storage")
 public class XfUserTotalServiceImpl implements IXfUserTotalService {
 
-    private final XfUsertotalMapper baseMapper;
+    private final XfUserTotalMapper baseMapper;
 
     /**
      * 查询个人与消费与充值统计

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditaccountbackMapper.xml → ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditAccountBackMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.backstage.consumption.mapper.XfCreditaccountbackMapper">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfCreditAccountBackMapper">
 
-    <resultMap type="org.dromara.backstage.consumption.domain.XfCreditAccountBack" id="XfCreditaccountbackResult">
+    <resultMap type="org.dromara.backstage.consumption.domain.XfCreditAccountBack" id="XfCreditAccountBackResult">
             <result property="backId"    column="back_id"    />
             <result property="tenantId"    column="tenant_id"    />
             <result property="recordId"    column="record_id"    />
@@ -15,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="cardValue"    column="card_value"    />
             <result property="mainCard"    column="main_card"    />
             <result property="bagType"    column="bag_type"    />
-            <result property="useYpe"    column="use_ype"    />
+            <result property="useType"    column="use_type"    />
             <result property="stationId"    column="station_id"    />
             <result property="operatorId"    column="operator_id"    />
             <result property="creditTime"    column="credit_time"    />
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="originalId"    column="original_id"    />
             <result property="smsSend"    column="sms_send"    />
             <result property="recordStatus"    column="record_status"    />
-            <result property="anlysFlag"    column="anlys_flag"    />
+            <result property="analysisFlag"    column="analysis_flag"    />
             <result property="digitalSign"    column="digital_sign"    />
             <result property="remark"    column="remark"    />
             <result property="delFlag"    column="del_flag"    />

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditaccountMapper.xml → ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfCreditAccountMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.backstage.consumption.mapper.XfCreditaccountMapper">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfCreditAccountMapper">
 
-    <resultMap type="org.dromara.backstage.consumption.domain.XfCreditAccount" id="XfCreditaccountResult">
+    <resultMap type="org.dromara.backstage.consumption.domain.XfCreditAccount" id="XfCreditAccountResult">
             <result property="creditId"    column="credit_id"    />
             <result property="tenantId"    column="tenant_id"    />
             <result property="recordId"    column="record_id"    />
@@ -23,7 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="cardTypeName"    column="card_type_name"    />
             <result property="mainCard"    column="main_card"    />
             <result property="bagType"    column="bag_type"    />
-            <result property="useYpe"    column="use_ype"    />
+            <result property="useType"    column="use_type"    />
             <result property="stationNumb"    column="station_numb"    />
             <result property="stationName"    column="station_name"    />
             <result property="operatorId"    column="operator_id"    />

ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfUsertotalMapper.xml → ruoyi-modules/ruoyi-backstage/src/main/resources/mapper/consumption/XfUserTotalMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.backstage.consumption.mapper.XfUsertotalMapper">
+<mapper namespace="org.dromara.backstage.consumption.mapper.XfUserTotalMapper">
 
-    <resultMap type="org.dromara.backstage.consumption.domain.XfUserTotal" id="XfUsertotalResult">
+    <resultMap type="org.dromara.backstage.consumption.domain.XfUserTotal" id="XfUserTotalResult">
             <result property="totalId"    column="total_id"    />
             <result property="tenantId"    column="tenant_id"    />
             <result property="userId"    column="user_id"    />
@@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <result property="deptName"    column="dept_name"    />
             <result property="cardNo"    column="card_no"    />
             <result property="dateDay"    column="date_day"    />
-            <result property="useYpe"    column="use_ype"    />
+            <result property="useType"    column="use_type"    />
             <result property="creditMoney"    column="credit_money"    />
             <result property="consumeMoney"    column="consume_money"    />
             <result property="delFlag"    column="del_flag"    />