优化代码

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

@@ -0,0 +1,179 @@
+package com.java110.dto.fee;
+
+import java.io.Serializable;
+
+/**
+ * @ClassName PayFeePo
+ * @Description TODO
+ * @Author wuxw
+ * @Date 2020/5/27 22:57
+ * @Version 1.0
+ * add by wuxw 2020/5/27
+ **/
+public class PayFeeDto implements Serializable {
+
+    private String feeId;
+    private String feeTypeCd;
+    private String communityId;
+    private String payerObjId;
+    private String incomeObjId;
+    private String startTime;
+    private String endTime;
+    private String amount;
+    private String userId;
+
+    private String feeFlag;
+    private String state;
+    private String configId;
+    private String payerObjType;
+    private String statusCd = "0";
+    private String createTime;
+    private String batchId;
+
+    private int page;
+    private int row;
+
+    public String getFeeId() {
+        return feeId;
+    }
+
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
+
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
+
+    public String getCommunityId() {
+        return communityId;
+    }
+
+    public void setCommunityId(String communityId) {
+        this.communityId = communityId;
+    }
+
+    public String getPayerObjId() {
+        return payerObjId;
+    }
+
+    public void setPayerObjId(String payerObjId) {
+        this.payerObjId = payerObjId;
+    }
+
+    public String getIncomeObjId() {
+        return incomeObjId;
+    }
+
+    public void setIncomeObjId(String incomeObjId) {
+        this.incomeObjId = incomeObjId;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getFeeFlag() {
+        return feeFlag;
+    }
+
+    public void setFeeFlag(String feeFlag) {
+        this.feeFlag = feeFlag;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getConfigId() {
+        return configId;
+    }
+
+    public void setConfigId(String configId) {
+        this.configId = configId;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    public void setPayerObjType(String payerObjType) {
+        this.payerObjType = payerObjType;
+    }
+
+    public String getStatusCd() {
+        return statusCd;
+    }
+
+    public void setStatusCd(String statusCd) {
+        this.statusCd = statusCd;
+    }
+
+    public String getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(String createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(String batchId) {
+        this.batchId = batchId;
+    }
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public int getRow() {
+        return row;
+    }
+
+    public void setRow(int row) {
+        this.row = row;
+    }
+}

java110-bean/src/main/java/com/java110/po/car/OwnerCarPo.java

@@ -28,6 +28,7 @@ public class OwnerCarPo implements Serializable {
     private String endTime;
 
     private String state;
+    private String bId;
 
     private String communityId;
     private String carTypeCd;
@@ -162,4 +163,12 @@ public class OwnerCarPo implements Serializable {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }

java110-bean/src/main/java/com/java110/po/fee/PayFeePo.java

@@ -21,6 +21,7 @@ public class PayFeePo implements Serializable {
     private String endTime;
     private String amount;
     private String userId;
+    private String bId;
 
     private String feeFlag;
     private String state;
@@ -157,4 +158,12 @@ public class PayFeePo implements Serializable {
     public void setBatchId(String batchId) {
         this.batchId = batchId;
     }
+
+    public String getbId() {
+        return bId;
+    }
+
+    public void setbId(String bId) {
+        this.bId = bId;
+    }
 }

java110-bean/src/main/java/com/java110/po/parkingSpaceApply/ParkingSpaceApplyPo.java

@@ -42,6 +42,7 @@ private String startTime;
 private String applyPersonId;
 private String endTime;
 private String state;
+private String feeId;
 private String communityId;
 public String getCarBrand() {
         return carBrand;
@@ -140,6 +141,11 @@ public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getFeeId() {
+        return feeId;
+    }
 
-
+    public void setFeeId(String feeId) {
+        this.feeId = feeId;
+    }
 }

java110-db/src/main/resources/mapper/community/ParkingSpaceApplyV1ServiceDaoImplMapper.xml

@@ -103,6 +103,9 @@ order by t.create_time desc
 <if test="psId !=null and psId != ''">
 , t.ps_id= #{psId}
 </if> 
+<if test="feeId !=null and feeId != ''">
+, t.fee_id= #{feeId}
+</if>
 <if test="remark !=null and remark != ''">
 , t.remark= #{remark}
 </if> 

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

@@ -16,6 +16,7 @@
 package com.java110.intf.fee;
 
 import com.java110.config.feign.FeignConfiguration;
+import com.java110.dto.fee.PayFeeDto;
 import com.java110.po.fee.PayFeePo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -46,22 +47,22 @@ public interface IPayFeeNewV1InnerServiceSMO {
     @RequestMapping(value = "/deletePayFeeNew", method = RequestMethod.POST)
     public int deletePayFeeNew(@RequestBody  PayFeePo PayFeePo);
 
-//    /**
-//     * <p>查询小区楼信息</p>
-//     *
-//     *
-//     * @param PayFeeDto 数据对象分享
-//     * @return PayFeeDto 对象数据
-//     */
-//    @RequestMapping(value = "/queryPayFeeNews", method = RequestMethod.POST)
-//    List<PayFeeDto> queryPayFeeNews(@RequestBody PayFeeDto PayFeeDto);
-//
-//    /**
-//     * 查询<p>小区楼</p>总记录数
-//     *
-//     * @param PayFeeDto 数据对象分享
-//     * @return 小区下的小区楼记录数
-//     */
-//    @RequestMapping(value = "/queryPayFeeNewsCount", method = RequestMethod.POST)
-//    int queryPayFeeNewsCount(@RequestBody PayFeeDto PayFeeDto);
+    /**
+     * <p>查询小区楼信息</p>
+     *
+     *
+     * @param payFeeDto 数据对象分享
+     * @return PayFeeDto 对象数据
+     */
+    @RequestMapping(value = "/queryPayFeeNews", method = RequestMethod.POST)
+    List<PayFeeDto> queryPayFeeNews(@RequestBody PayFeeDto payFeeDto);
+
+    /**
+     * 查询<p>小区楼</p>总记录数
+     *
+     * @param payFeeDto 数据对象分享
+     * @return 小区下的小区楼记录数
+     */
+    @RequestMapping(value = "/queryPayFeeNewsCount", method = RequestMethod.POST)
+    int queryPayFeeNewsCount(@RequestBody PayFeeDto payFeeDto);
 }

service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/SaveParkingSpaceApplyCmd.java

@@ -22,8 +22,14 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.fee.PayFeeDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.owner.OwnerDto;
 import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.user.IBuildingOwnerV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
 import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -32,6 +38,10 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
+import java.util.List;
 
 /**
  * 类表述：保存
@@ -52,6 +62,12 @@ public class SaveParkingSpaceApplyCmd extends AbstractServiceCmdListener {
 
     @Autowired
     private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
+    @Autowired
+    private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
+    @Autowired
+    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    @Autowired
+    private IBuildingOwnerV1InnerServiceSMO buildingOwnerV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -65,21 +81,54 @@ public class SaveParkingSpaceApplyCmd extends AbstractServiceCmdListener {
         Assert.hasKeyAndValue(reqJson, "applyPersonName", "请求报文中未包含applyPersonName");
         Assert.hasKeyAndValue(reqJson, "applyPersonLink", "请求报文中未包含applyPersonLink");
         Assert.hasKeyAndValue(reqJson, "applyPersonId", "请求报文中未包含applyPersonId");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
 
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
         ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
+        /**
+         * 1、車位申請判斷車輛是否存在owner_car，如果存在判断是否有2008001的费用，
+         * car_id是费用表中的payer_obj_id。申请的时候判断下owner_id是否为-1，还需到owner表中校验在不在，
+         * 2、审核的时，判断车辆是否在owner_car中有，有就跳过。  没有的话写入owner_car，--都要写入pay_fee。
+         * 3、支付成功后，回调方法中刷新申请表状态。
+         */
+        //申请的时候判断下owner_id是否为-1
+        if ("-1".equals(parkingSpaceApplyPo.getApplyPersonId())) {
+            throw new CmdException("游客身份不能申请车位！");
+        }
+        //还需到owner表中校验在不在,不是业主则不能申请
+        OwnerDto ownerDto = new OwnerDto();
+        ownerDto.setOwnerId(parkingSpaceApplyPo.getApplyPersonId());
+        List<OwnerDto> ownerDtos = buildingOwnerV1InnerServiceSMOImpl.queryBuildingOwners(ownerDto);
+        if (ownerDtos == null || ownerDtos.size() < 1) {
+            throw new CmdException("不是本小区业主不能申请车位！");
+        }
+        //判断车辆是否已经有申请单
         ParkingSpaceApplyDto parkingSpaceApplyDto = new ParkingSpaceApplyDto();
-        parkingSpaceApplyDto.setCarNum(parkingSpaceApplyDto.getCarNum());
+        parkingSpaceApplyDto.setCarNum(parkingSpaceApplyPo.getCarNum());
         parkingSpaceApplyDto.setState("1001");//审核中
         int count = parkingSpaceApplyV1InnerServiceSMOImpl.queryParkingSpaceApplysCount(parkingSpaceApplyDto);
         if (count > 1) {
             throw new CmdException("当前车辆申请处理审核中，不能重复申请。");
         }
+        //車位申請判斷車輛是否存在owner_car，如果存在判断是否有2008001的费用
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCarNum(parkingSpaceApplyPo.getCarNum());
+        ownerCarDto.setCommunityId(parkingSpaceApplyPo.getCommunityId());
+        List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+        if (ownerCarDtos != null && ownerCarDtos.size() > 0) {
+            PayFeeDto payFeeDto = new PayFeeDto();
+            payFeeDto.setPayerObjId(ownerCarDtos.get(0).getCarId());
+            payFeeDto.setState("2008001");
+            List<PayFeeDto> payFeeDtos = payFeeNewV1InnerServiceSMOImpl.queryPayFeeNews(payFeeDto);
+            if (payFeeDtos != null && payFeeDtos.size() > 0) {
+                throw new CmdException("该车辆已经有相关费用，请到停车费中续费。或者联系管理员");
+            }
+        }
+
         parkingSpaceApplyPo.setApplyId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = parkingSpaceApplyV1InnerServiceSMOImpl.saveParkingSpaceApply(parkingSpaceApplyPo);
         if (flag < 1) {

service-community/src/main/java/com/java110/community/cmd/parkingSpaceApply/UpdateParkingSpaceApplyCmd.java

@@ -22,8 +22,20 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.CommunityMemberDto;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.PayFeeDto;
+import com.java110.dto.owner.OwnerCarDto;
+import com.java110.dto.parkingSpaceApply.ParkingSpaceApplyDto;
+import com.java110.intf.community.ICommunityMemberV1InnerServiceSMO;
 import com.java110.intf.community.IParkingSpaceApplyV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
+import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
+import com.java110.intf.user.IOwnerCarV1InnerServiceSMO;
+import com.java110.po.car.OwnerCarPo;
+import com.java110.po.fee.PayFeePo;
 import com.java110.po.parkingSpaceApply.ParkingSpaceApplyPo;
+import com.java110.utils.constant.CommonConstant;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -33,6 +45,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -47,11 +61,19 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "parkingSpaceApply.updateParkingSpaceApply")
 public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateParkingSpaceApplyCmd.class);
-
+    private static Logger logger = LoggerFactory.getLogger(UpdateParkingSpaceApplyCmd.class);
 
+    public static final String CODE_PREFIX_ID = "10";
     @Autowired
     private IParkingSpaceApplyV1InnerServiceSMO parkingSpaceApplyV1InnerServiceSMOImpl;
+    @Autowired
+    private IOwnerCarV1InnerServiceSMO ownerCarV1InnerServiceSMOImpl;
+    @Autowired
+    private IPayFeeNewV1InnerServiceSMO payFeeNewV1InnerServiceSMOImpl;
+    @Autowired
+    private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
+    @Autowired
+    private ICommunityMemberV1InnerServiceSMO communityMemberV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
@@ -62,15 +84,93 @@ public class UpdateParkingSpaceApplyCmd extends AbstractServiceCmdListener {
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
+        String userId = cmdDataFlowContext.getReqHeaders().get(CommonConstant.USER_ID);
+        ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
 
-       ParkingSpaceApplyPo parkingSpaceApplyPo = BeanConvertUtil.covertBean(reqJson, ParkingSpaceApplyPo.class);
+        PayFeePo payFeePo = new PayFeePo();
+        payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
 
+        parkingSpaceApplyPo.setFeeId(payFeePo.getFeeId());
         int flag = parkingSpaceApplyV1InnerServiceSMOImpl.updateParkingSpaceApply(parkingSpaceApplyPo);
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
 
+        ParkingSpaceApplyDto parkingSpaceApplyDto = new ParkingSpaceApplyDto();
+        parkingSpaceApplyDto.setApplyId(parkingSpaceApplyPo.getApplyId());
+        List<ParkingSpaceApplyDto> parkingSpaceApplyDtos = parkingSpaceApplyV1InnerServiceSMOImpl.queryParkingSpaceApplys(parkingSpaceApplyDto);
+
+        if (parkingSpaceApplyDtos == null || parkingSpaceApplyDtos.size() < 1) {
+            throw new CmdException("未查询到申请单，请联系管理员");
+        }
+        ParkingSpaceApplyDto parkingSpaceApply = parkingSpaceApplyDtos.get(0);
+
+        //2、审核的时，判断车辆是否在owner_car中有，有就跳过。  没有的话写入owner_car，--都要写入pay_fee。
+        OwnerCarDto ownerCarDto = new OwnerCarDto();
+        ownerCarDto.setCarNum(parkingSpaceApplyPo.getCarNum());
+        ownerCarDto.setCommunityId(parkingSpaceApplyPo.getCommunityId());
+        List<OwnerCarDto> ownerCarDtos = ownerCarV1InnerServiceSMOImpl.queryOwnerCars(ownerCarDto);
+        String catId = "";
+        OwnerCarPo ownerCarPo = new OwnerCarPo();
+        if (ownerCarDtos == null || ownerCarDtos.size() < 1) {
+            ownerCarPo.setCarId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+            ownerCarPo.setOwnerId(parkingSpaceApply.getApplyPersonId());
+            ownerCarPo.setbId("-1");
+            ownerCarPo.setCarNum(parkingSpaceApply.getCarNum());
+            ownerCarPo.setCarColor(parkingSpaceApply.getCarColor());
+            ownerCarPo.setCarBrand(parkingSpaceApply.getCarBrand());
+            ownerCarPo.setCarType(parkingSpaceApply.getCarType());
+            ownerCarPo.setCarTypeCd("1001");
+            ownerCarPo.setCommunityId(parkingSpaceApply.getCommunityId());
+            ownerCarPo.setMemberId(ownerCarPo.getCarId());
+            ownerCarPo.setStartTime(parkingSpaceApply.getStartTime());
+            ownerCarPo.setEndTime(parkingSpaceApply.getEndTime());
+            ownerCarPo.setPsId(parkingSpaceApply.getPsId());
+            ownerCarPo.setState("1001");
+            ownerCarPo.setUserId(userId);
+            ownerCarPo.setRemark("车位申请，系统自动写入");
+            flag = ownerCarV1InnerServiceSMOImpl.saveOwnerCar(ownerCarPo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
+            catId = ownerCarPo.getCarId();
+        }else {
+            catId = ownerCarDtos.get(0).getCarId();
+        }
+
+        FeeConfigDto feeConfigDto = new FeeConfigDto();
+        feeConfigDto.setConfigId(parkingSpaceApply.getConfigId());
+        List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+        if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+            throw new CmdException("未查询到相关费用项设置，请联系管理员");
+        }
+        CommunityMemberDto communityMemberDto = new CommunityMemberDto();
+        communityMemberDto.setCommunityId(parkingSpaceApply.getCommunityId());
+        communityMemberDto.setMemberTypeCd("390001200002");
+        List<CommunityMemberDto> communityMemberDtos = communityMemberV1InnerServiceSMOImpl.queryCommunityMembers(communityMemberDto);
+        if (communityMemberDtos == null || communityMemberDtos.size() < 1) {
+            throw new CmdException("未查询到小区和商户的关系，请联系管理员");
+        }
+        FeeConfigDto feeConfig = feeConfigDtos.get(0);
+        payFeePo.setCommunityId(feeConfig.getCommunityId());
+        payFeePo.setConfigId(feeConfig.getConfigId());
+        payFeePo.setFeeTypeCd(feeConfig.getFeeTypeCd());
+        payFeePo.setPayerObjId(catId);
+        payFeePo.setIncomeObjId(communityMemberDtos.get(0).getMemberId());//根据小区ID查询storeId
+        payFeePo.setStartTime(parkingSpaceApply.getStartTime());
+        payFeePo.setEndTime(parkingSpaceApply.getEndTime());
+        payFeePo.setAmount("0");
+        payFeePo.setFeeFlag("1003006");
+        payFeePo.setState("2009001");
+        payFeePo.setPayerObjType("6666");
+        payFeePo.setBatchId("-1");
+        payFeePo.setbId("-1");
+        payFeePo.setUserId(userId);
+        flag = payFeeNewV1InnerServiceSMOImpl.savePayFeeNew(payFeePo);
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

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

@@ -16,6 +16,7 @@
 package com.java110.fee.smo.impl;
 
 
+import com.java110.dto.fee.PayFeeDto;
 import com.java110.fee.dao.IPayFeeNewV1ServiceDao;
 import com.java110.intf.fee.IPayFeeNewV1InnerServiceSMO;
 import com.java110.po.fee.PayFeePo;
@@ -64,25 +65,25 @@ public class PayFeeNewV1InnerServiceSMOImpl extends BaseServiceSMO implements IP
        return saveFlag;
     }
 
-//    @Override
-//    public List<PayFeeNewDto> queryPayFeeNews(@RequestBody  PayFeeNewDto payFeeNewDto) {
-//
-//        //校验是否传了 分页信息
-//
-//        int page = payFeeNewDto.getPage();
-//
-//        if (page != PageDto.DEFAULT_PAGE) {
-//            payFeeNewDto.setPage((page - 1) * payFeeNewDto.getRow());
-//        }
-//
-//        List<PayFeeNewDto> payFeeNews = BeanConvertUtil.covertBeanList(payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo(BeanConvertUtil.beanCovertMap(payFeeNewDto)), PayFeeNewDto.class);
-//
-//        return payFeeNews;
-//    }
-//
-//
-//    @Override
-//    public int queryPayFeeNewsCount(@RequestBody PayFeeNewDto payFeeNewDto) {
-//        return payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount(BeanConvertUtil.beanCovertMap(payFeeNewDto));    }
+    @Override
+    public List<PayFeeDto> queryPayFeeNews(@RequestBody  PayFeeDto payFeeNewDto) {
+
+        //校验是否传了 分页信息
+
+        int page = payFeeNewDto.getPage();
+
+        if (page != PageDto.DEFAULT_PAGE) {
+            payFeeNewDto.setPage((page - 1) * payFeeNewDto.getRow());
+        }
+
+        List<PayFeeDto> payFeeNews = BeanConvertUtil.covertBeanList(payFeeNewV1ServiceDaoImpl.getPayFeeNewInfo(BeanConvertUtil.beanCovertMap(payFeeNewDto)), PayFeeDto.class);
+
+        return payFeeNews;
+    }
+
+
+    @Override
+    public int queryPayFeeNewsCount(@RequestBody PayFeeDto payFeeNewDto) {
+        return payFeeNewV1ServiceDaoImpl.queryPayFeeNewsCount(BeanConvertUtil.beanCovertMap(payFeeNewDto));    }
 
 }