实收和票据功能优化

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayInvoiceController.java

@@ -40,8 +40,8 @@ public class PayInvoiceController {
     public AjaxMessage<Pagination<PayInvoiceDto>> getPrintInfoListPage(
             @ApiParam(value = "查询条件", required = false) @RequestParam(required = false) String condition,
             @ApiParam(value = "收据状态", required = false) @RequestParam(required = false) Integer state,
-            @ApiParam(value = "开票时间开始", required = false) @RequestParam(required = false) String startTime,
-            @ApiParam(value = "开票时间结束", required = false) @RequestParam(required = false) String endTime,
+            @ApiParam(value = "开票时间开始 yyyyMMddHHmmss", required = false) @RequestParam(required = false) String startTime,
+            @ApiParam(value = "开票时间结束 yyyyMMddHHmmss", required = false) @RequestParam(required = false) String endTime,
             @ApiParam(value = "页数,非必传，默认第一页", required = false, defaultValue = "1") @RequestParam(required = false, defaultValue = "1") int pageNum,
             @ApiParam(value = "条数，非必传，默认10条", required = false, defaultValue = "10") @RequestParam(required = false, defaultValue = "10") int pageSize
 

smart-city-platform/src/main/java/com/bz/smart_city/controller/pay/PayPayReceiveContorller.java

@@ -73,32 +73,10 @@ public class PayPayReceiveContorller {
     @GetMapping("/findListInfo")
     @ApiOperation(value = "计费系统-查询实收下拉列表点击事件")
     public AjaxMessage<List<PayPayReceivedListDto>> findListInfo(
-        @ApiParam(value = "账期年", required = true) @RequestParam(required = true)Integer year,
-        @ApiParam(value = "账期月", required = true) @RequestParam(required = true) Integer month,
-        @ApiParam(value = "客户编码", required = true) @RequestParam(required = true)String accountnumber,
-        @ApiParam(value = "客户Id", required = true) @RequestParam(required = true)String accountId,
-        @ApiParam(value = "状态", required = false) @RequestParam(required = false) Integer state,
-        @ApiParam(value = "支付方式", required = false) @RequestParam(required = false) Integer payway,
-        @ApiParam(value = "开始日期,2020-04-08", required = false) @RequestParam(required = false) String beginDate,
-        @ApiParam(value = "结束日期，2020-04-08", required = false) @RequestParam(required = false) String endDate
+        @ApiParam(value = "交易流水号", required = true) @RequestParam(required = true)String payseriesno
     ){
-        try{
-            DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            LocalDateTime startDf = null;
-            LocalDateTime endDf = null;
-            if(StringUtils.isNotBlank(beginDate)){
-                beginDate = beginDate +" 00:00:00";
-                startDf = LocalDateTime.parse(beginDate,df);
-            }
-            if(StringUtils.isNotBlank(endDate)){
-                endDate =endDate + " 23:59:59";
-                endDf = LocalDateTime.parse(endDate,df);
-            }
-            List<PayPayReceivedListDto> list = payPayReceivedService.findListByPayseriesno(year,month,accountnumber,state,payway,startDf,endDf);
+            List<PayPayReceivedListDto> list = payPayReceivedService.findListByPayseriesno(payseriesno);
             return new AjaxMessage<>(ResultStatus.OK,list);
-        }catch (Exception ex){
-            return new AjaxMessage<>(ResultStatus.ERROR,new ArrayList<PayPayReceivedListDto>());
-        }
     }
 
     @PostMapping("/cancelReceived")

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/PayInvoiceDto.java

@@ -35,6 +35,7 @@ public class PayInvoiceDto {
     private Integer state;
     @ApiModelProperty(value = "票据状态")
     private String stateLabel;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @ApiModelProperty(value = "开票日期")
     private LocalDateTime createDate;
     @ApiModelProperty(value = "开票人")
@@ -43,7 +44,7 @@ public class PayInvoiceDto {
     @ApiModelProperty(value = "作废时间")
     private LocalDateTime canceltime;
     @ApiModelProperty(value = "作废人")
-    private BigInteger cancelpersonName;
+    private String cancelpersonName;
 
 
     @ApiModelProperty(value = "数据查询（票据号、户编、户名）",  hidden = true)

smart-city-platform/src/main/java/com/bz/smart_city/dto/pay/payfee/PayfeeAccountInfoDto.java

@@ -1,5 +1,6 @@
 package com.bz.smart_city.dto.pay.payfee;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -36,6 +37,7 @@ public class PayfeeAccountInfoDto {
     private String vatno;
     @ApiModelProperty(value = "电子邮箱" )
     private String email;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @ApiModelProperty(value = "开户时间" )
     private LocalDateTime opendate;
     @ApiModelProperty(value = "水表编码" )

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayFeeServiceImp.java

@@ -521,9 +521,9 @@ public class PayFeeServiceImp implements PayFeeService {
             throw new ServiceException(ResultStatus.PAYFEE_TRANSAMOUNT_BELOW_ZERO);
         }
 
-        //根据客编或者水编获取客户信息
+        //根据客户id
         PayCustomRechargeDto payCustomRechargeDto = null;
-        if(StringUtils.isEmpty(accountId)){
+        if(StringUtils.isNotEmpty(accountId)){
             payCustomRechargeDto= payFeeMapper.getCustomInfoByMeterOrAccount(accountId,null,null,BigInteger.valueOf(siteId),BigInteger.valueOf(customerId));
         }
 

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/pay/PayPayReceivedServiceImpl.java

@@ -72,22 +72,22 @@ public class PayPayReceivedServiceImpl implements PayPayReceivedService {
         return new Pagination<PayPayReceivedListDto>(list);
     }
 
-    public List<PayPayReceivedListDto> findListByPayseriesno(Integer year,Integer month,String accountnumber,
-               Integer state,Integer payway,LocalDateTime beginDate,LocalDateTime endDate){
+    public List<PayPayReceivedListDto> findListByPayseriesno(String payseriesno){
 
         LoginUser loginUser = UserUtil.getCurrentUser();
         PayPayReceived received = new PayPayReceived();
-        received.setAccountnumber(accountnumber);
-        received.setState(state);
-        received.setPayway(payway);
-        received.setBeginDate(beginDate);
-        received.setEndDate(endDate);
+
+
+        received.setPayseriesno(payseriesno);
+
         received.setSiteId(BigInteger.valueOf(loginUser.getSiteId()));
         received.setCustomerId(BigInteger.valueOf(loginUser.getCustomerId()));
         List<PayPayReceivedListDto> receivedList = payPayReceivedMapper.findListByPayseriesno(received);
         return receivedList;
     }
 
+
+
     //取消实收
     @Transactional(rollbackFor = Exception.class)
     public int cancelReceived(BigInteger id){

smart-city-platform/src/main/java/com/bz/smart_city/service/pay/PayPayReceivedService.java

@@ -17,8 +17,7 @@ public interface PayPayReceivedService {
     public Pagination<PayPayReceivedListDto> findTotalList(String condition, Integer state, Integer payway, LocalDateTime beginDate,
                                                            LocalDateTime endDate, int pageNum, int pageSize);
 
-    public List<PayPayReceivedListDto> findListByPayseriesno(Integer year,Integer month,String accountnumber,
-                                                             Integer state,Integer payway,LocalDateTime beginDate,LocalDateTime endDate);
+    public List<PayPayReceivedListDto> findListByPayseriesno(String payseriesno);
 
     public int cancelReceived(BigInteger id);
 

smart-city-platform/src/main/resources/mapper/pay/PayPayReceivedMapper.xml

@@ -44,6 +44,9 @@
             <if test="customerId != null">
                 and rece.customer_id=#{customerId}
             </if>
+            <if test="payseriesno != null">
+                and rece.payseriesno =#{payseriesno}
+            </if>
             <if test="year != null">
                 and rece.year =#{year}
             </if>
@@ -257,7 +260,7 @@
             rece.customer_id as "customerId"
         from pay_pay_received rece
         <where>
-            rece.canceledrecord_id is null
+            rece.canceledrecord_id is null and rece.state=1
             <if test="siteId != null">
                 and rece.site_id =#{siteId}
             </if>

smart-city-platform/src/main/resources/mapper/pay/payFeeMapper.xml

@@ -105,8 +105,11 @@
             a.email,
             c.opendate,
             c.metercode,
-            c.housetype,
-            c.calculateway,
+            (select label from pay_sys_dict where type='住房类型' and `value`=c.housetype and site_id=#{siteId}
+            and customer_id=#{customerId}) as "housetype",
+            (select label from pay_sys_dict where type='结算方式' and `value`=c.calculateway and  site_id=#{siteId}
+            and customer_id=#{customerId}) as "calculateway",
+
             p.id as "waterPropertyId",
             p.name as "waterPropertyName"
         from pay_base_customerandmeterrela c