优化押金退款功能

java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java

@@ -23,6 +23,8 @@ public class FeeDetailDto extends PageDto implements Serializable {
     public static final String PRIME_REATE_WECHAT = "5";
     public static final String PRIME_REATE_CRASH = "1";
     public static final String PRIME_REATE_WECHAT_APP = "6";
+
+    public static final String PRIME_REATE_REFUND_ACCT = "8";
     public static final String STATE_RETURNING = "1000";
     public static final String STATE_RETURNED = "1100";
     public static final String STATE_RETURN_ERROR = "1200";

java110-core/src/main/java/com/java110/core/smo/IComputeFeeSMO.java

@@ -81,6 +81,14 @@ public interface IComputeFeeSMO {
      */
     public OwnerDto getFeeOwnerDto(FeeDto feeDto);
 
+    /**
+     * 查询费用的业主信息
+     *
+     * @param feeId
+     * @return
+     */
+    OwnerDto getFeeOwnerDto(String feeId);
+
     /**
      * 刷入 付费方名称
      *

java110-core/src/main/java/com/java110/core/smo/impl/ComputeFeeSMOImpl.java

@@ -490,7 +490,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             parkingSpaceDto.setCommunityId(feeDto.getCommunityId());
             parkingSpaceDto.setPsId(ownerCarDtos.get(0).getPsId());
             List<ParkingSpaceDto> parkingSpaceDtos = parkingSpaceInnerServiceSMOImpl.queryParkingSpaces(parkingSpaceDto);
-            if (parkingSpaceDtos == null || parkingSpaceDtos.size() < 1) { //数据有问题
+            if (ListUtil.isNull(parkingSpaceDtos)) { //数据有问题
                 return objName;
             }
             objName = objName + "-" + parkingSpaceDtos.get(0).getAreaNum() + "停车场" + "-" + parkingSpaceDtos.get(0).getNum() + "车位";
@@ -508,6 +508,19 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
         return objName;
     }
 
+    @Override
+    public OwnerDto getFeeOwnerDto(String feeId) {
+
+        FeeDto feeDto = new FeeDto();
+        feeDto.setFeeId(feeId);
+        List<FeeDto> feeDtos = feeInnerServiceSMOImpl.queryFees(feeDto);
+
+        Assert.listOnlyOne(feeDtos, "费用不存在");
+        feeDtos.get(0).setFeeAttrDtos(null); // todo 这里设置为空，不要从属性中查以防数据有问题导致有问题
+
+        return getFeeOwnerDto(feeDtos.get(0));
+    }
+
     @Override
     public OwnerDto getFeeOwnerDto(FeeDto feeDto) {
         OwnerDto ownerDto = getOwnerDtoByFeeAttr(feeDto);
@@ -559,7 +572,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
     private OwnerDto getOwnerDtoByFeeAttr(FeeDto feeDto) {
         List<FeeAttrDto> feeAttrDtos = feeDto.getFeeAttrDtos();
 
-        if (feeAttrDtos == null || feeAttrDtos.size() < 1) {
+        if (ListUtil.isNull(feeAttrDtos)) {
             return null;
         }
 
@@ -2173,11 +2186,11 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
             //todo 本轮递增时间未到 费用deadlineTime
             if (curCycleRateEneTime.getTime() < feeDto.getDeadlineTime().getTime()) {
                 curOweMonth = DateUtil.dayCompare(curOweStartTime, curCycleRateEneTime);
-                hasInRateMonth = rateStartMonthIn(oRateStartTime,curOweStartTime,curCycleRateEneTime);
+                hasInRateMonth = rateStartMonthIn(oRateStartTime, curOweStartTime, curCycleRateEneTime);
                 curOweStartTime = curCycleRateEneTime;
             } else {
                 curOweMonth = DateUtil.dayCompare(curOweStartTime, feeDto.getDeadlineTime());
-                hasInRateMonth = rateStartMonthIn(oRateStartTime,curOweStartTime,feeDto.getDeadlineTime());
+                hasInRateMonth = rateStartMonthIn(oRateStartTime, curOweStartTime, feeDto.getDeadlineTime());
 
                 curOweStartTime = feeDto.getDeadlineTime();
             }
@@ -2201,6 +2214,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
 
     /**
      * 递增月在这个之间
+     *
      * @param oRateStartTime
      * @param startTime
      * @param endTime
@@ -2210,7 +2224,7 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
 
         Calendar calendarStartTime = Calendar.getInstance();
         calendarStartTime.setTime(startTime);
-        calendarStartTime.set(Calendar.DAY_OF_MONTH,1);
+        calendarStartTime.set(Calendar.DAY_OF_MONTH, 1);
 
         Calendar calendarEndTime = Calendar.getInstance();
         calendarEndTime.setTime(endTime);
@@ -2219,15 +2233,15 @@ public class ComputeFeeSMOImpl implements IComputeFeeSMO {
 
         Calendar calendarOrate = Calendar.getInstance();
         calendarOrate.setTime(oRateStartTime);
-        calendarOrate.set(Calendar.YEAR,calendarStartTime.get(Calendar.YEAR));
+        calendarOrate.set(Calendar.YEAR, calendarStartTime.get(Calendar.YEAR));
 
-        if(calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())){
+        if (calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())) {
             return true;
         }
 
-        calendarOrate.set(Calendar.YEAR,calendarEndTime.get(Calendar.YEAR));
+        calendarOrate.set(Calendar.YEAR, calendarEndTime.get(Calendar.YEAR));
 
-        if(calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())){
+        if (calendarStartTime.getTime().before(calendarOrate.getTime()) && calendarEndTime.getTime().after(calendarOrate.getTime())) {
             return true;
         }
 

java110-db/src/main/resources/mapper/fee/PayFeeDetailNewV1ServiceDaoImplMapper.xml

@@ -531,4 +531,112 @@
         </if>
         )) rt
     </select>
+
+
+    <select id="queryFeeDepositCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from pay_fee_detail t
+        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'state'
+        LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390008' and pfa1.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390012' and pfa2.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa3 on t.fee_id = pfa3.fee_id and pfa3.spec_cd = '390007' and pfa3.status_cd = '0'
+        where 1=1
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and pfa3.`value`= #{ownerId}
+        </if>
+        <if test="payerObjId !=null and payerObjId != ''">
+            and pf.payer_obj_id= #{payerObjId}
+        </if>
+        and pf.fee_type_cd = '888800010006'
+        <if test="primeRate !=null and primeRate != ''">
+            and t.prime_rate= #{primeRate}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="payOrderId !=null and payOrderId != ''">
+            and t.pay_order_id= #{payOrderId}
+        </if>
+        <if test="cashierId !=null and cashierId != ''">
+            and t.cashier_id= #{cashierId}
+        </if>
+        <if test="cashierName !=null and cashierName != ''">
+            and t.cashier_name= #{cashierName}
+        </if>
+    </select>
+    <select id="queryFeeDeposit" parameterType="Map" resultType="Map">
+        select t.detail_id detailId,t.fee_id feeId,t.start_time startTime,
+        t.end_time endTime,t.received_amount receivedAmount,pfc.fee_name feeName,
+        t.create_time createTime,t.state,td.name stateName,pfa1.`value` ownerName,pfa2.`value` payerObjName,
+        pfa3.`value` ownerId,pf.payer_obj_id payerObjId,t.cashier_name cashierName,t.pay_order_id payOrderId,t.remark
+        from pay_fee_detail t
+        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
+        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'
+        left join t_dict td on t.state = td.status_cd and td.table_name = 'pay_fee_detail' and td.table_columns = 'state'
+        LEFT JOIN pay_fee_attrs pfa1 on t.fee_id = pfa1.fee_id and pfa1.spec_cd = '390008' and pfa1.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa2 on t.fee_id = pfa2.fee_id and pfa2.spec_cd = '390012' and pfa2.status_cd = '0'
+        LEFT JOIN pay_fee_attrs pfa3 on t.fee_id = pfa3.fee_id and pfa3.spec_cd = '390007' and pfa3.status_cd = '0'
+        where 1=1
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
+        <if test="ownerId !=null and ownerId != ''">
+            and pfa3.`value`= #{ownerId}
+        </if>
+
+        <if test="payerObjId !=null and payerObjId != ''">
+            and pf.payer_obj_id= #{payerObjId}
+        </if>
+        and pf.fee_type_cd = '888800010006'
+        <if test="primeRate !=null and primeRate != ''">
+            and t.prime_rate= #{primeRate}
+        </if>
+        <if test="detailId !=null and detailId != ''">
+            and t.detail_id= #{detailId}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="startTime !=null and startTime != ''">
+            and t.create_time &gt;= #{startTime}
+        </if>
+        <if test="endTime !=null and endTime != ''">
+            and t.create_time &lt;= #{endTime}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="feeId !=null and feeId != ''">
+            and t.fee_id= #{feeId}
+        </if>
+        <if test="payOrderId !=null and payOrderId != ''">
+            and t.pay_order_id= #{payOrderId}
+        </if>
+        <if test="cashierId !=null and cashierId != ''">
+            and t.cashier_id= #{cashierId}
+        </if>
+        <if test="cashierName !=null and cashierName != ''">
+            and t.cashier_name= #{cashierName}
+        </if>
+    </select>
 </mapper>

java110-interface/src/main/java/com/java110/intf/fee/IPayFeeDetailV1InnerServiceSMO.java

@@ -16,6 +16,7 @@
 package com.java110.intf.fee;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.PayFeeDetailDto;
 import com.java110.po.fee.PayFeeDetailPo;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -55,6 +56,12 @@ public interface IPayFeeDetailV1InnerServiceSMO {
     @RequestMapping(value = "/queryPayFeeDetailNewSum", method = RequestMethod.POST)
     public List<PayFeeDetailDto> queryPayFeeDetailNewSum(@RequestBody PayFeeDetailDto payFeeDetailDto);
 
+    @RequestMapping(value = "/queryFeeDepositCount", method = RequestMethod.POST)
+    int queryFeeDepositCount(@RequestBody FeeDetailDto feeDetailDto);
+
+    @RequestMapping(value = "/queryFeeDeposit", method = RequestMethod.POST)
+    List<FeeDetailDto> queryFeeDeposit(@RequestBody FeeDetailDto feeDetailDto);
+
 //    /**
 //     * <p>查询小区楼信息</p>
 //     *

service-fee/src/main/java/com/java110/fee/cmd/fee/QueryFeeDepositCmd.java

@@ -0,0 +1,54 @@
+package com.java110.fee.cmd.fee;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 查询押金
+ */
+@Java110Cmd(serviceCode = "fee.queryFeeDeposit")
+public class QueryFeeDepositCmd extends Cmd {
+
+    @Autowired
+    private IPayFeeDetailV1InnerServiceSMO feeDetailV1InnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+        super.validatePageInfo(reqJson);
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区");
+    }
+
+    @Override
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        FeeDetailDto feeDetailDto = BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class);
+
+        int total = feeDetailV1InnerServiceSMOImpl.queryFeeDepositCount(feeDetailDto);
+        List<FeeDetailDto> feeDetailDtos = null;
+        if (total > 0) {
+            feeDetailDtos = feeDetailV1InnerServiceSMOImpl.queryFeeDeposit(BeanConvertUtil.covertBean(reqJson, FeeDetailDto.class));
+        } else {
+            feeDetailDtos = new ArrayList<>();
+        }
+
+        int row = reqJson.getInteger("row");
+        ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, feeDetailDtos);
+        context.setResponseEntity(responseEntity);
+    }
+}

service-fee/src/main/java/com/java110/fee/cmd/fee/RefundFeeDepositCmd.java

@@ -0,0 +1,147 @@
+package com.java110.fee.cmd.fee;
+
+import com.alibaba.fastjson.JSONObject;
+import com.java110.core.annotation.Java110Cmd;
+import com.java110.core.annotation.Java110Transactional;
+import com.java110.core.context.CmdContextUtils;
+import com.java110.core.context.ICmdDataFlowContext;
+import com.java110.core.event.cmd.Cmd;
+import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.core.smo.IComputeFeeSMO;
+import com.java110.dto.account.AccountDto;
+import com.java110.dto.fee.FeeDetailDto;
+import com.java110.dto.owner.OwnerDto;
+import com.java110.dto.user.UserDto;
+import com.java110.fee.dao.IPayFeeDetailNewV1ServiceDao;
+import com.java110.intf.acct.IAccountInnerServiceSMO;
+import com.java110.intf.fee.IFeeDetailInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
+import com.java110.intf.user.IUserV1InnerServiceSMO;
+import com.java110.po.account.AccountDetailPo;
+import com.java110.po.account.AccountPo;
+import com.java110.po.fee.PayFeeDetailPo;
+import com.java110.utils.exception.CmdException;
+import com.java110.utils.util.Assert;
+import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 押金退费
+ */
+@Java110Cmd(serviceCode = "fee.refundFeeDeposit")
+public class RefundFeeDepositCmd extends Cmd {
+
+    @Autowired
+    private IFeeDetailInnerServiceSMO feeDetailInnerServiceSMOImpl;
+
+    @Autowired
+    private IPayFeeDetailV1InnerServiceSMO payFeeDetailV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IUserV1InnerServiceSMO userV1InnerServiceSMOImpl;
+
+    @Autowired
+    private IComputeFeeSMO computeFeeSMOImpl;
+
+    @Autowired
+    private IAccountInnerServiceSMO accountInnerServiceSMOImpl;
+
+    @Override
+    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        Assert.hasKeyAndValue(reqJson, "detailId", "未包含缴费ID");
+        Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区ID");
+
+
+    }
+
+    @Override
+    @Java110Transactional
+    public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+        String userId = CmdContextUtils.getUserId(context);
+
+        UserDto userDto = new UserDto();
+        userDto.setUserId(userId);
+        List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+
+        Assert.listOnlyOne(userDtos, "用户不存在");
+
+        FeeDetailDto feeDetailDto = new FeeDetailDto();
+        feeDetailDto.setCommunityId(reqJson.getString("communityId"));
+        feeDetailDto.setDetailId(reqJson.getString("detailId"));
+        feeDetailDto.setFeeId(reqJson.getString("feeId"));
+        List<FeeDetailDto> feeDetailDtos = feeDetailInnerServiceSMOImpl.queryFeeDetails(feeDetailDto);
+
+        Assert.listOnlyOne(feeDetailDtos, "不存在该缴费记录");
+
+        //todo 根据查询 账户信息
+        OwnerDto ownerDto = computeFeeSMOImpl.getFeeOwnerDto(feeDetailDtos.get(0).getFeeId());
+        if (ownerDto == null) {
+            throw new CmdException("费用未查到业主");
+        }
+
+
+        AccountDto accountDto = new AccountDto();
+        accountDto.setObjId(ownerDto.getMemberId());
+        accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH); //2003  现金账户
+        List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
+
+        if (ListUtil.isNull(accountDtos)) {
+            throw new CmdException("账户不存在,请到账户页面预存0元，生成账户");
+        }
+
+
+        PayFeeDetailPo payFeeDetailPo = new PayFeeDetailPo();
+        payFeeDetailPo.setDetailId(reqJson.getString("detailId"));
+        payFeeDetailPo.setState(FeeDetailDto.STATE_RETURNED);
+
+        int flag = payFeeDetailV1InnerServiceSMOImpl.updatePayFeeDetailNew(payFeeDetailPo);
+        if (flag < 1) {
+            throw new CmdException("保存数据失败");
+        }
+
+
+        PayFeeDetailPo refundPayFeeDetailPo = BeanConvertUtil.covertBean(feeDetailDtos.get(0), PayFeeDetailPo.class);
+        refundPayFeeDetailPo.setRemark("押金转存");
+        refundPayFeeDetailPo.setbId("-1");
+        refundPayFeeDetailPo.setState(FeeDetailDto.STATE_RETURN_ORDER);
+        refundPayFeeDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId("11"));
+        refundPayFeeDetailPo.setCashierId(userDtos.get(0).getUserId());
+        refundPayFeeDetailPo.setCashierName(userDtos.get(0).getName());
+        refundPayFeeDetailPo.setReceivableAmount(unum(refundPayFeeDetailPo.getReceivableAmount()) + "");
+        refundPayFeeDetailPo.setReceivedAmount(unum(refundPayFeeDetailPo.getReceivedAmount()) + "");
+        refundPayFeeDetailPo.setLateAmount("0");
+        refundPayFeeDetailPo.setDiscountAmount("0");
+        refundPayFeeDetailPo.setGiftAmount("0");
+        refundPayFeeDetailPo.setDeductionAmount("0");
+        refundPayFeeDetailPo.setAcctAmount("0");
+        refundPayFeeDetailPo.setCycles(unum(refundPayFeeDetailPo.getCycles()) + "");
+        refundPayFeeDetailPo.setPrimeRate(FeeDetailDto.PRIME_REATE_REFUND_ACCT);
+        payFeeDetailV1InnerServiceSMOImpl.savePayFeeDetailNew(refundPayFeeDetailPo);
+
+
+        AccountDetailPo accountDetailPo = new AccountDetailPo();
+        accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
+        accountDetailPo.setAmount(feeDetailDtos.get(0).getReceivedAmount());
+        accountDetailPo.setObjId(accountDtos.get(0).getObjId());
+        accountDetailPo.setObjType(accountDtos.get(0).getObjType());
+        accountDetailPo.setRemark("押金退款预存账户");
+        accountInnerServiceSMOImpl.prestoreAccount(accountDetailPo);
+
+
+    }
+
+
+    private double unum(String value) {
+        double dValue = Double.parseDouble(value);
+        return dValue * -1;
+    }
+}

service-fee/src/main/java/com/java110/fee/dao/IPayFeeDetailNewV1ServiceDao.java

@@ -87,4 +87,8 @@ public interface IPayFeeDetailNewV1ServiceDao {
      * @date 2023-11-13
      */
     List<Map> queryPayFeeDetailNewSumInfo(Map info);
+
+    int queryFeeDepositCount(Map info);
+
+    List<Map> queryFeeDeposit(Map info);
 }

service-fee/src/main/java/com/java110/fee/dao/impl/PayFeeDetailNewV1ServiceDaoImpl.java

@@ -61,8 +61,8 @@ public class PayFeeDetailNewV1ServiceDaoImpl extends BaseServiceDao implements I
     @Override
     public List<Map> getPayFeeDetailNewInfo(Map info) throws DAOException {
         logger.debug("查询 getPayFeeDetailNewInfo 入参 info : {}", info);
-        List<Map> businessPayFeeDetailNewInfos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.getPayFeeDetailNewInfo", info);
-        return businessPayFeeDetailNewInfos;
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.getPayFeeDetailNewInfo", info);
+        return infos;
     }
 
     /**
@@ -87,34 +87,51 @@ public class PayFeeDetailNewV1ServiceDaoImpl extends BaseServiceDao implements I
     @Override
     public int queryPayFeeDetailNewsCount(Map info) {
         logger.debug("查询 queryPayFeeDetailNewsCount 入参 info : {}", info);
-        List<Map> businessPayFeeDetailNewInfos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewsCount", info);
-        if (businessPayFeeDetailNewInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewsCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
-        return Integer.parseInt(businessPayFeeDetailNewInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> queryPayFeeDetailNewInfo(Map info) {
         logger.debug("查询 queryPayFeeDetailNewInfo 入参 info : {}", info);
-        List<Map> businessPayFeeDetailNewInfos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewInfo", info);
-        return businessPayFeeDetailNewInfos;
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewInfo", info);
+        return infos;
     }
 
     @Override
     public int queryPayFeeDetailNewCount(Map info) {
         logger.debug("查询 queryPayFeeDetailNewCount 入参 info : {}", info);
-        List<Map> businessPayFeeDetailNewInfos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewCount", info);
-        if (businessPayFeeDetailNewInfos.size() < 1) {
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewCount", info);
+        if (infos.size() < 1) {
             return 0;
         }
-        return Integer.parseInt(businessPayFeeDetailNewInfos.get(0).get("count").toString());
+        return Integer.parseInt(infos.get(0).get("count").toString());
     }
 
     @Override
     public List<Map> queryPayFeeDetailNewSumInfo(Map info) {
         logger.debug("查询 queryPayFeeDetailNewSumInfo 入参 info : {}", info);
-        List<Map> businessPayFeeDetailNewInfos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewSumInfo", info);
-        return businessPayFeeDetailNewInfos;
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewSumInfo", info);
+        return infos;
+    }
+
+    @Override
+    public int queryFeeDepositCount(Map info) {
+        logger.debug("查询 queryFeeDepositCount 入参 info : {}", info);
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryFeeDepositCount", info);
+        if (infos.size() < 1) {
+            return 0;
+        }
+        return Integer.parseInt(infos.get(0).get("count").toString());
+    }
+
+    @Override
+    public List<Map> queryFeeDeposit(Map info) {
+        logger.debug("查询 queryFeeDeposit 入参 info : {}", info);
+        List<Map> infos = sqlSessionTemplate.selectList("payFeeDetailNewV1ServiceDaoImpl.queryFeeDeposit", info);
+        return infos;
     }
 }

service-fee/src/main/java/com/java110/fee/smo/impl/PayFeeDetailV1InnerServiceSMOImpl.java

@@ -17,6 +17,7 @@ package com.java110.fee.smo.impl;
 
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.dto.PageDto;
+import com.java110.dto.fee.FeeDetailDto;
 import com.java110.dto.fee.PayFeeDetailDto;
 import com.java110.fee.dao.IPayFeeDetailNewV1ServiceDao;
 import com.java110.intf.fee.IPayFeeDetailV1InnerServiceSMO;
@@ -89,6 +90,22 @@ public class PayFeeDetailV1InnerServiceSMOImpl extends BaseServiceSMO implements
         List<PayFeeDetailDto> payFeeDetailNews = BeanConvertUtil.covertBeanList(payFeeDetailNewV1ServiceDaoImpl.queryPayFeeDetailNewSumInfo(BeanConvertUtil.beanCovertMap(payFeeDetailDto)), PayFeeDetailDto.class);
         return payFeeDetailNews;
     }
+
+    @Override
+    public int queryFeeDepositCount(@RequestBody FeeDetailDto feeDetailDto) {
+        return payFeeDetailNewV1ServiceDaoImpl.queryFeeDepositCount(BeanConvertUtil.beanCovertMap(feeDetailDto));
+    }
+
+    @Override
+    public List<FeeDetailDto> queryFeeDeposit(@RequestBody FeeDetailDto feeDetailDto) {
+        //校验是否传了 分页信息
+        int page = feeDetailDto.getPage();
+        if (page != PageDto.DEFAULT_PAGE) {
+            feeDetailDto.setPage((page - 1) * feeDetailDto.getRow());
+        }
+        List<FeeDetailDto> feeDetailDtos = BeanConvertUtil.covertBeanList(payFeeDetailNewV1ServiceDaoImpl.queryFeeDeposit(BeanConvertUtil.beanCovertMap(feeDetailDto)), FeeDetailDto.class);
+        return feeDetailDtos;
+    }
 //
 //    @Override
 //    public List<PayFeeDetailNewDto> queryPayFeeDetailNews(@RequestBody  PayFeeDetailNewDto payFeeDetailNewDto) {