余额

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccInfoVo.java

@@ -12,17 +12,10 @@ public class AccInfoVo {
     @Excel(name = "账户id")
     @ApiModelProperty(value = "账户id")
     private Long accId;
-
-    /** 账户名称 */
-    @Excel(name = "账户名称")
-    @ApiModelProperty(value = "账户名称")
-    private String accName;
-
     /** 人员id */
     @Excel(name = "人员id")
     @ApiModelProperty(value = "人员id")
     private Long userId;
-
     @ApiModelProperty("账户状态 1正常  2冻结  3销户 4过期")
     private Integer accStatus;
     @ApiModelProperty("账户可用总余额(不包括冻结金额)")

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java

@@ -27,7 +27,7 @@ public interface AccInfoMapper {
      */
     public List<AccInfo> selectAccInfoList(AccInfo accInfo);
 
-    public List<AccInfoVo> selectAccInfoVoList(AccInfo accInfo);
+    public AccInfoVo selectAccInfoVo(AccInfo accInfo);
 
     /**
      * 新增账户资料

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccInfoService.java

@@ -29,7 +29,7 @@ public interface IAccInfoService {
      */
     public List<AccInfo> selectAccInfoList(AccInfo accInfo);
 
-    public List<AccInfoVo> selectAccInfoVoList(AccInfo accInfo);
+//    public List<AccInfoVo> selectAccInfoVoList(AccInfo accInfo);
 
     /**
      * 新增账户资料

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java

@@ -67,10 +67,10 @@ public class AccInfoServiceImpl implements IAccInfoService {
         return accInfoMapper.selectAccInfoList(accInfo);
     }
 
-    @Override
+//    @Override
-    public List<AccInfoVo> selectAccInfoVoList(AccInfo accInfo) {
+//    public List<AccInfoVo> selectAccInfoVoList(AccInfo accInfo) {
-        return accInfoMapper.selectAccInfoVoList(accInfo);
+//        return accInfoMapper.selectAccInfoVoList(accInfo);
-    }
+//    }
 
     /**
      * 新增账户资料
@@ -167,7 +167,7 @@ public class AccInfoServiceImpl implements IAccInfoService {
 
     public WalletBalanceVO queryWalletBalance(AccInfo accInfo) {
         log.info("[app]v4查询账户余额入参={}", JSONUtil.toJsonStr(accInfo));
-        AccInfoVo accInfoVO = (AccInfoVo) accInfoMapper.selectAccInfoVoList(accInfo);
+        AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo);
         if (ObjectUtil.isNull(accInfoVO)) {
             throw new ServiceException("账户不存在");
         } else {

bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml

@@ -59,16 +59,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
-    <resultMap type="com.bonus.canteen.core.account.domain.AccInfoVo" id="AccInfoVoResult">
-        <result property="accId"    column="acc_id"    />
-        <result property="accName"    column="acc_name"    />
-        <result property="userId"    column="user_id"    />
-        <result property="walletBal"    column="wallet_bal"    />
-        <result property="subsidyBal"    column="subsidy_bal"    />
-        <result property="redEnvelope"    column="red_envelope"    />
-        <result property="accStatus"    column="acc_status"    />
-    </resultMap>
-
     <sql id="selectAccInfoVo">
         select acc_id, acc_name, user_id, wallet_bal, subsidy_bal, red_envelope, subsidy_freeze_bal,
                acc_bal, balance2, water_wallet_bal, water_subsidy_bal, freeze_wallet_bal, freeze_subsidy_bal,
@@ -137,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
-    <select id="selectAccInfoVoList" parameterType="com.bonus.canteen.core.account.domain.AccInfo" resultMap="AccInfoVoResult">
+    <select id="selectAccInfoVo" parameterType="com.bonus.canteen.core.account.domain.AccInfo" resultType="com.bonus.canteen.core.account.domain.AccInfoVo">
         <include refid="selectAccInfoVo"/>
         <where>
             <if test="accId != null "> and acc_id = #{accId}</if>