bug修改

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

@@ -23,7 +23,7 @@ public class PayfeeDetailed {
     private Double waterFee1;
     @ApiModelProperty(value = "二次加压费")
     private Double waterFee2;
-    @ApiModelProperty(value = "不征税自来水")
+    @ApiModelProperty(value = "不征税自来水（水资源费）")
     private Double waterFee3;
     @ApiModelProperty(value = "污水处理费")
     private Double waterFee4;

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

@@ -1,9 +1,12 @@
 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;
 
+import java.time.LocalDateTime;
+
 /**
  * @description 收费界面实收信息
  * @auto wangli
@@ -38,8 +41,12 @@ public class PayfeeReceivedInfo {
     private String payway;
     @ApiModelProperty(value = "交易状态")
     private String state;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     @ApiModelProperty(value = "创建日期")
-    private String createDate;
+    private LocalDateTime createDate;
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @ApiModelProperty(value = "作废时间")
+    private LocalDateTime canceltime;
     @ApiModelProperty(value = "是否作废")
     private String iscanceled;
     @ApiModelProperty(value = "作废人id")

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

@@ -140,7 +140,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     iterator.remove();
                     remaining = remaining.subtract(payReceivable.getDebt());//修改余额
                     //生成并保存实收
-                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,payway,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
+                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
                     //生成交易明细
                     PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,paywayName, localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
@@ -158,7 +158,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     //生成并保存实收
                     fees= fees.add(remaining.negate());
 
-                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,payway,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
+                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
 
                     PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
@@ -226,7 +226,7 @@ public class PayFeeServiceImp implements PayFeeService {
             remaining=remaining.add(transAmount);
             //生成交易明细
             PayTransactiondetails payTransactiondetails = getPayTransactiondetails(payway, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, transAmount, siteId, customerId, userId  );
-            payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "充值");
+            payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "缴费");
             payTransactiondetails.setTranstype(4);
             payTransactiondetails.setTranstypeLabel("账户转预存");
             transactiondetailsDtoList.add(payTransactiondetails);
@@ -384,7 +384,7 @@ public class PayFeeServiceImp implements PayFeeService {
                     iterator.remove();
                     remaining = remaining.subtract(payReceivable.getDebt());//修改余额
                     //生成并保存实收
-                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,payway,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
+                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,payReceivable.getDebt(),feetypeMap, siteId, customerId, userId );
                     //生成交易明细
                     PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5,paywayName, localDateTime, payCustomRechargeDto, payseriesno, month, year, payReceivable.getDebt().negate(), siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
@@ -400,7 +400,7 @@ public class PayFeeServiceImp implements PayFeeService {
                 }else{
                     //预存余额小于于欠费（部分抵扣）
                     //生成并保存实收
-                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,payway,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
+                    PayPayReceived payPayReceived = getReceived(payReceivable, year, month, localDateTime,5,payseriesno,remaining,feetypeMap, siteId, customerId, userId );
 
                     PayTransactiondetails payTransactiondetails = getPayTransactiondetails(5, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, remaining.negate() , siteId, customerId, userId );
                     payTransactiondetails.setReceivedId(payPayReceived.getId());
@@ -477,7 +477,7 @@ public class PayFeeServiceImp implements PayFeeService {
             remaining=remaining.add(transAmount);
             //生成交易明细
             PayTransactiondetails payTransactiondetails = getPayTransactiondetails(payway, paywayName,localDateTime, payCustomRechargeDto, payseriesno, month, year, transAmount, siteId, customerId, userId  );
-            payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "充值");
+            payTransactiondetails.setName(payCustomRechargeDto.getAccountname() + payCustomRechargeDto.getAccountnumber() + "缴费");
             payTransactiondetails.setTranstype(4);
             payTransactiondetails.setTranstypeLabel("账户转预存");
             transactiondetailsDtoList.add(payTransactiondetails);

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

@@ -121,10 +121,11 @@
                and  c.id= #{id}
             </if>
             <if test="condition != null and condition != ''">
-                or c.accountname  like concat('%',#{condition},'%')
-                or c.accountnumber like concat('%',#{condition},'%')
-                or a.mobilephone like concat('%',#{condition},'%')
-                or a.address  like concat('%',#{condition},'%')
+                and( c.accountname like concat('%',#{condition},'%')
+                    or c.accountnumber like concat('%',#{condition},'%')
+                    or a.mobilephone like concat('%',#{condition},'%')
+                    or a.address like concat('%',#{condition},'%')
+                    )
             </if>
             <if test="programItems != null and programItems.size() != 0">
                 and   <foreach collection="programItems" item="item" open="(" separator=" or " close=")">
@@ -255,8 +256,9 @@
                 (case when  min(reced.payway) != 5 then min(reced.payway) else max(reced.payway) end )
                  and site_id = #{siteId} and customer_id =#{customerId}) as "paywayname",
             (select label from pay_sys_dict where type = '交易状态' and value =  max(reced.state) and site_id = #{siteId} and customer_id =#{customerId}) as "statename",
-
-             max(create_date) as "createDate"
+            max(reced.invoice_id) as "invoiceId",
+            max(canceltime) as "canceltime",
+            max(create_date) as "createDate"
         from pay_pay_received reced
         where
          account_id=#{accountId}