取消收费小数位数处理

smart-city-platform/src/main/java/com/bz/smart_city/commom/security/WebSecurityConfig.java

@@ -96,6 +96,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/printinvoice/InvoicePrintRequest")
                 .antMatchers("/waterMeter/getMeterByDeviceNo")
                 .antMatchers("/device/synArchies")
+                .antMatchers("/installPlan/**")
                 .antMatchers("/customer/synCustomer")
                 .antMatchers("/druid/**");
 

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

@@ -51,7 +51,7 @@ public class PayFeeController {
     private Integer customerId;
 
     @PostMapping("/payFee")
-    @ApiOperation(value="冲账接口，客户名称、客户编码、应收id不能同时为空")
+    @ApiOperation(value = "冲账接口，客户名称、客户编码、应收id不能同时为空")
     public AjaxMessage<String> payFee(
             @ApiParam(value = "客户编码", required = false) @RequestParam(required = false) String accountnumber,
             @ApiParam(value = "客户名称", required = false) @RequestParam(required = false) String metercode,
@@ -62,11 +62,11 @@ public class PayFeeController {
             @ApiParam(value = "站点ID", required = false) @RequestParam(required = false) String siteId,
             @ApiParam(value = "水司ID", required = false) @RequestParam(required = false) String customerId,
             @ApiParam(value = "用户ID", required = false) @RequestParam(required = false) String userId
-    ){
+    ) {
         DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
-        List<BigInteger> arrayList= null;
-        if(StringUtils.isNotBlank(receivableIds)){
-            arrayList=  Arrays.asList(receivableIds.split(",")).stream().map(BigInteger::new).collect(Collectors.toList());
+        List<BigInteger> arrayList = null;
+        if (StringUtils.isNotBlank(receivableIds)) {
+            arrayList = Arrays.asList(receivableIds.split(",")).stream().map(BigInteger::new).collect(Collectors.toList());
         }
 
         return new AjaxMessage<>(ResultStatus.OK, payFeeService.payFee(accountnumber,
@@ -83,44 +83,45 @@ public class PayFeeController {
 
 
     @PostMapping("/payFeeCounter")
-    @ApiOperation(value="柜台缴费接口")
+    @ApiOperation(value = "柜台缴费接口")
     public AjaxMessage<PayfeeResult> payFeeCounter(
-            @ApiParam(value = "客户id", required = true) @RequestParam(required = true)String accountId,
-            @ApiParam(value = "欠费金额", required = false) @RequestParam(required = false)String debt,
-            @ApiParam(value = "预存金额", required = false) @RequestParam(required = false)String remaining,
-            @ApiParam(value = "购水量", required = false) @RequestParam(required = false)String amount,
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) String accountId,
+            @ApiParam(value = "欠费金额", required = false) @RequestParam(required = false) String debt,
+            @ApiParam(value = "预存金额", required = false) @RequestParam(required = false) String remaining,
+            @ApiParam(value = "购水量", required = false) @RequestParam(required = false) String amount,
             /*@ApiParam(value = "购水金额", required = false) @RequestParam(required = false)String waterAmount,*/
-            @ApiParam(value = "单价", required = false) @RequestParam(required = false)String price,
-            @ApiParam(value = "实收金额", required = true) @RequestParam(required = true)String transAmount,
+            @ApiParam(value = "单价", required = false) @RequestParam(required = false) String price,
+            @ApiParam(value = "实收金额", required = true) @RequestParam(required = true) String transAmount,
 
-            @ApiParam(value = "支付方式", required = true) @RequestParam(required = true)Integer payway,
-            @ApiParam(value = "是否转预存，0否 1是", required = true) @RequestParam(required = true)Integer balancetype
+            @ApiParam(value = "支付方式", required = true) @RequestParam(required = true) Integer payway,
+            @ApiParam(value = "是否转预存，0否 1是", required = true) @RequestParam(required = true) Integer balancetype
 
-    ){
+    ) {
         //暂时先默认柜台支付为现金支付，后期区分
-        return new AjaxMessage<>(ResultStatus.OK, payFeeService.payFeeCounter(accountId,4,new BigDecimal(transAmount),balancetype,
-                new BigDecimal(debt),new BigDecimal(remaining),Integer.valueOf(amount),new BigDecimal(price)));    }
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.payFeeCounter(accountId, 4, new BigDecimal(transAmount), balancetype,
+                new BigDecimal(debt), new BigDecimal(remaining), Integer.valueOf(amount), new BigDecimal(price)));
+    }
 
     @GetMapping("/findPayfeeAccountInfo")
-    @ApiOperation(value="收费界面查询客户信息，客户id是在查询出多用户时，选择某个用户")
+    @ApiOperation(value = "收费界面查询客户信息，客户id是在查询出多用户时，选择某个用户")
     public AjaxMessage<List<PayfeeAccountInfoDto>> findPayfeeAccountInfo(
-            @ApiParam(value = "开户id,查询多用户时，再次查询用id查询") @RequestParam(required = false)BigInteger id,
-            @ApiParam(value = "查询内容,户编、户名、手机、地址") @RequestParam(required = false)String condition ){
+            @ApiParam(value = "开户id,查询多用户时，再次查询用id查询") @RequestParam(required = false) BigInteger id,
+            @ApiParam(value = "查询内容,户编、户名、手机、地址") @RequestParam(required = false) String condition) {
 
-        return new AjaxMessage<>(ResultStatus.OK, payFeeService.findPayfeeAccountInfo(id , condition ));
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.findPayfeeAccountInfo(id, condition));
     }
 
     @GetMapping("/getPayfeeDetaileBill")
-    @ApiOperation(value="查询账单详情")
+    @ApiOperation(value = "查询账单详情")
     public AjaxMessage<PayfeeDetaileBill> getPayfeeDetaileBill(
-            @ApiParam(value = "客户id",required = true) @RequestParam(required = true)BigInteger accountId){
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId) {
         //根据客户id查找用水性质ID
         BigInteger propertyId = payFeeService.getWaterPropertyId(accountId);
         BaseWaterPropertyFormDto baseWaterPropertyFormDto = new BaseWaterPropertyFormDto();
-        if(propertyId != null){
+        if (propertyId != null) {
             //根据用水性质ID去查找对应的用水性质
             baseWaterPropertyFormDto = baseWaterPropertyService.getEditPage(propertyId);
-        }else{
+        } else {
             baseWaterPropertyFormDto = new BaseWaterPropertyFormDto();
         }
         PayfeeDetaileBill bill = payFeeService.getPayfeeDetaileBill(accountId);
@@ -132,189 +133,189 @@ public class PayFeeController {
         bill.setProp2(baseWaterPropertyFormDto.getProp2());//二阶用水性质
         bill.setProp3(baseWaterPropertyFormDto.getProp3());//三阶用水性质
         bill.setProp4(baseWaterPropertyFormDto.getProp4());//四阶用水性质
-        return new AjaxMessage<>(ResultStatus.OK,bill);
+        return new AjaxMessage<>(ResultStatus.OK, bill);
 
 
     }
 
     @GetMapping("/getPayfeeDetailed")
-    @ApiOperation(value="查询本账期欠费明细")
+    @ApiOperation(value = "查询本账期欠费明细")
     public AjaxMessage<PayfeeDetailed> getPayfeeDetailed(
-            @ApiParam(value = "客户id",required = true) @RequestParam(required = true)BigInteger accountId ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayfeeDetailed(accountId));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayfeeDetailed(accountId));
     }
 
     @GetMapping("/getPayreceiveDebt")
-    @ApiOperation(value="收费页面————欠费信息")
+    @ApiOperation(value = "收费页面————欠费信息")
     public AjaxMessage<List<PayfeeReceivableInfo>> getPayreceiveDebt(
-            @ApiParam(value = "客户id",required = true) @RequestParam(required = true)BigInteger accountId ,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayreceiveDebt(accountId,year));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayreceiveDebt(accountId, year));
     }
 
     @GetMapping("/getPayreceiveDebtDetailed")
-    @ApiOperation(value="收费页面————欠费信息详情")
+    @ApiOperation(value = "收费页面————欠费信息详情")
     public AjaxMessage<List<PayfeeReceivableInfo>> getPayreceiveDebtDetailed(
-            @ApiParam(value = "客户id",required = true) @RequestParam(required = true)BigInteger accountId,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year,
-            @ApiParam(value = "账期月",required = true) @RequestParam(required = true)Integer month
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayreceiveDebtDetailed(accountId,year,month));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year,
+            @ApiParam(value = "账期月", required = true) @RequestParam(required = true) Integer month
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayreceiveDebtDetailed(accountId, year, month));
     }
 
     @GetMapping("/getPayreceived")
-    @ApiOperation(value="收费页面————实收信息")
+    @ApiOperation(value = "收费页面————实收信息")
     public AjaxMessage<List<PayfeeReceivedInfo>> getPayreceived(
-            @ApiParam(value = "客户id",required = true) @RequestParam(required = true)BigInteger accountId ,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayreceived(accountId,year));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayreceived(accountId, year));
     }
 
     @GetMapping("/getPayreceivedDetailed")
-    @ApiOperation(value="收费页面————实收信息详情")
+    @ApiOperation(value = "收费页面————实收信息详情")
     public AjaxMessage<List<PayfeeReceivedInfo>> getPayreceivedDetailed(
-            @ApiParam(value = "客户id" ,required = true) @RequestParam(required = true)BigInteger accountId,
-            @ApiParam(value = "交易流水号" ,required = true) @RequestParam(required = true)String payseriesno,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year,
-            @ApiParam(value = "账期月",required = true) @RequestParam(required = true)Integer month
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayreceivedDetailed(accountId,payseriesno,year,month));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId,
+            @ApiParam(value = "交易流水号", required = true) @RequestParam(required = true) String payseriesno,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year,
+            @ApiParam(value = "账期月", required = true) @RequestParam(required = true) Integer month
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayreceivedDetailed(accountId, payseriesno, year, month));
     }
 
 
     @GetMapping("/getTransDetailed")
-    @ApiOperation(value="收费页面————交易明细详情")
+    @ApiOperation(value = "收费页面————交易明细详情")
     public AjaxMessage<List<PayTransactiondetailsDto>> getListByYear(
             @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger accountId,
             @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year
-    ){
+    ) {
 
-        PayTransactiondetailsDto payTransactiondetailsDto =new PayTransactiondetailsDto();
+        PayTransactiondetailsDto payTransactiondetailsDto = new PayTransactiondetailsDto();
         payTransactiondetailsDto.setAccountId(accountId);
         payTransactiondetailsDto.setYear(year);
         return new AjaxMessage<>(ResultStatus.OK, payTransactiondetailsService.selectTransactionList(payTransactiondetailsDto));
     }
 
     @GetMapping("/getWaterusedamount")
-    @ApiOperation(value="收费页面————水量信息")
+    @ApiOperation(value = "收费页面————水量信息")
     public AjaxMessage<List<PayfeeWaterusedamount>> getWaterusedamount(
-            @ApiParam(value = "客户id" ,required = true) @RequestParam(required = true)BigInteger id,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getWaterusedamount(id,year));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger id,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getWaterusedamount(id, year));
     }
 
     @GetMapping("/getPayinvoiceInfo")
-    @ApiOperation(value="收费页面————收据信息")
+    @ApiOperation(value = "收费页面————收据信息")
     public AjaxMessage<List<PayInvoiceDto>> getPayinvoiceInfo(
-            @ApiParam(value = "客户id" ,required = true) @RequestParam(required = true)BigInteger id,
-            @ApiParam(value = "账期年",required = true) @RequestParam(required = true)Integer year
-    ){
-        return new AjaxMessage<>(ResultStatus.OK,payFeeService.getPayinvoiceInfo(id,year));
+            @ApiParam(value = "客户id", required = true) @RequestParam(required = true) BigInteger id,
+            @ApiParam(value = "账期年", required = true) @RequestParam(required = true) Integer year
+    ) {
+        return new AjaxMessage<>(ResultStatus.OK, payFeeService.getPayinvoiceInfo(id, year));
     }
 
 
     @PostMapping("/queryUserInfo")
     @ApiOperation(value = "银行缴费接口——客户信息查询")
-    public BankPayfeeMsg queryUserInfo(@RequestBody BankQueryParm bankQueryParm){
-        try{
+    public BankPayfeeMsg queryUserInfo(@RequestBody BankQueryParm bankQueryParm) {
+        try {
             //空值
             String parmCheck = bankQueryParm.checkParmIsNull();
-            if(StringUtils.isNotBlank(parmCheck)){
-                return new BankPayfeeMsg("0002",parmCheck,null);
+            if (StringUtils.isNotBlank(parmCheck)) {
+                return new BankPayfeeMsg("0002", parmCheck, null);
             }
-            PayPayAgentbranch payPayAgentbranch =  payFeeService.selectPayAgentbranchInfo(bankQueryParm.getAgentCode(), customerId);
-            if(null == payPayAgentbranch || null == payPayAgentbranch.getId()){
-                return new BankPayfeeMsg("0003","代收单位不存在",null);
+            PayPayAgentbranch payPayAgentbranch = payFeeService.selectPayAgentbranchInfo(bankQueryParm.getAgentCode(), customerId);
+            if (null == payPayAgentbranch || null == payPayAgentbranch.getId()) {
+                return new BankPayfeeMsg("0003", "代收单位不存在", null);
             }
-            if(null == payPayAgentbranch.getPaykey() ||!bankQueryParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())){
-                return new BankPayfeeMsg("0004","代收单位密钥错误",null);
+            if (null == payPayAgentbranch.getPaykey() || !bankQueryParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())) {
+                return new BankPayfeeMsg("0004", "代收单位密钥错误", null);
             }
 
-            List<BankPayfeeAccountInfo> list = payFeeService.selectBankPayfeeAccountInfo(bankQueryParm.getQueryType(),bankQueryParm.getQueryValue());
-            if(list.size() == 0){
-                return new BankPayfeeMsg("1001","查询的号码不存在",list);
+            List<BankPayfeeAccountInfo> list = payFeeService.selectBankPayfeeAccountInfo(bankQueryParm.getQueryType(), bankQueryParm.getQueryValue());
+            if (list.size() == 0) {
+                return new BankPayfeeMsg("1001", "查询的号码不存在", list);
             }
-            return new BankPayfeeMsg("9999","查询成功",list);
-        }catch (Exception e){
+            return new BankPayfeeMsg("9999", "查询成功", list);
+        } catch (Exception e) {
             e.printStackTrace();
-            return new BankPayfeeMsg("0005","系统异常");
+            return new BankPayfeeMsg("0005", "系统异常");
         }
     }
 
     @PostMapping("/payFeeAmount")
     @ApiOperation(value = "银行缴费接口——缴费欠费")
-    public BankPayfeeMsg payFeeAmount(@RequestBody BankPayFeeParm bankPayFeeParm){
-        try{
+    public BankPayfeeMsg payFeeAmount(@RequestBody BankPayFeeParm bankPayFeeParm) {
+        try {
             String parmCheck = bankPayFeeParm.checkParmIsNull();
-            if(StringUtils.isNotBlank(parmCheck)){
-                return new BankPayfeeMsg("0002",parmCheck);
+            if (StringUtils.isNotBlank(parmCheck)) {
+                return new BankPayfeeMsg("0002", parmCheck);
             }
-            PayPayAgentbranch payPayAgentbranch =  payFeeService.selectPayAgentbranchInfo(bankPayFeeParm.getAgentCode(), customerId);
-            if(null == payPayAgentbranch || null == payPayAgentbranch.getId()){
-                return new BankPayfeeMsg("0003","代收单位不存在");
+            PayPayAgentbranch payPayAgentbranch = payFeeService.selectPayAgentbranchInfo(bankPayFeeParm.getAgentCode(), customerId);
+            if (null == payPayAgentbranch || null == payPayAgentbranch.getId()) {
+                return new BankPayfeeMsg("0003", "代收单位不存在");
             }
-            if(null == payPayAgentbranch.getPaykey() ||!bankPayFeeParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())){
-                return new BankPayfeeMsg("0004","代收单位密钥错误");
+            if (null == payPayAgentbranch.getPaykey() || !bankPayFeeParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())) {
+                return new BankPayfeeMsg("0004", "代收单位密钥错误");
             }
 
-            return payFeeService.payfeeByBank(payPayAgentbranch,bankPayFeeParm.getOrderCode(),bankPayFeeParm.getAccountNumber(),bankPayFeeParm.getMoney(),bankPayFeeParm.getPayTime());
-        }catch (Exception e){
+            return payFeeService.payfeeByBank(payPayAgentbranch, bankPayFeeParm.getOrderCode(), bankPayFeeParm.getAccountNumber(), bankPayFeeParm.getMoney(), bankPayFeeParm.getPayTime());
+        } catch (Exception e) {
             e.printStackTrace();
-            return new BankPayfeeMsg("0005","系统异常");
+            return new BankPayfeeMsg("0005", "系统异常");
         }
     }
 
     @PostMapping("/checkBill")
     @ApiOperation(value = "银行缴费接口——对账")
-    public BankCheckBillsMsg checkBill(@RequestBody BankCheckBillParm bankCheckBillParm){
-        try{
+    public BankCheckBillsMsg checkBill(@RequestBody BankCheckBillParm bankCheckBillParm) {
+        try {
 
 
             String parmCheck = bankCheckBillParm.checkParmIsNull();
-            if(StringUtils.isNotBlank(parmCheck)){
-                return new BankCheckBillsMsg("0002",parmCheck,null);
+            if (StringUtils.isNotBlank(parmCheck)) {
+                return new BankCheckBillsMsg("0002", parmCheck, null);
             }
-            PayPayAgentbranch payPayAgentbranch =  payFeeService.selectPayAgentbranchInfo(bankCheckBillParm.getAgentCode(), customerId);
-            if(null == payPayAgentbranch || null == payPayAgentbranch.getId()){
-                return new BankCheckBillsMsg("0003","代收单位不存在",null);
+            PayPayAgentbranch payPayAgentbranch = payFeeService.selectPayAgentbranchInfo(bankCheckBillParm.getAgentCode(), customerId);
+            if (null == payPayAgentbranch || null == payPayAgentbranch.getId()) {
+                return new BankCheckBillsMsg("0003", "代收单位不存在", null);
             }
-            if(null == payPayAgentbranch.getPaykey() ||!bankCheckBillParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())){
-                return new BankCheckBillsMsg("0004","代收单位密钥错误",null);
+            if (null == payPayAgentbranch.getPaykey() || !bankCheckBillParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())) {
+                return new BankCheckBillsMsg("0004", "代收单位密钥错误", null);
             }
 
-            return payFeeService.checkBill(payPayAgentbranch,bankCheckBillParm);
-        }catch (Exception e){
+            return payFeeService.checkBill(payPayAgentbranch, bankCheckBillParm);
+        } catch (Exception e) {
             e.printStackTrace();
-            return new BankCheckBillsMsg("0005","系统异常");
+            return new BankCheckBillsMsg("0005", "系统异常");
         }
     }
 
     @PostMapping("/cancelPayFee")
     @ApiOperation(value = "银行缴费接口——冲正")
-    public BankPayfeeMsg cancelPayFee(@RequestBody BankCancelPayFeeParm bankCancelPayFeeParm){
+    public BankPayfeeMsg cancelPayFee(@RequestBody BankCancelPayFeeParm bankCancelPayFeeParm) {
 
 
-        try{
+        try {
             String parmCheck = bankCancelPayFeeParm.checkParmIsNull();
-            if(StringUtils.isNotBlank(parmCheck)){
-                return new BankPayfeeMsg("0002",parmCheck);
+            if (StringUtils.isNotBlank(parmCheck)) {
+                return new BankPayfeeMsg("0002", parmCheck);
             }
-            PayPayAgentbranch payPayAgentbranch =  payFeeService.selectPayAgentbranchInfo(bankCancelPayFeeParm.getAgentCode(), customerId);
-            if(null == payPayAgentbranch || null == payPayAgentbranch.getId()){
-                return new BankPayfeeMsg("0003","代收单位不存在");
+            PayPayAgentbranch payPayAgentbranch = payFeeService.selectPayAgentbranchInfo(bankCancelPayFeeParm.getAgentCode(), customerId);
+            if (null == payPayAgentbranch || null == payPayAgentbranch.getId()) {
+                return new BankPayfeeMsg("0003", "代收单位不存在");
             }
-            if(null == payPayAgentbranch.getPaykey() ||!bankCancelPayFeeParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())){
-                return new BankPayfeeMsg("0004","代收单位密钥错误");
+            if (null == payPayAgentbranch.getPaykey() || !bankCancelPayFeeParm.getAgentPwd().equals(payPayAgentbranch.getPaykey())) {
+                return new BankPayfeeMsg("0004", "代收单位密钥错误");
             }
 
 //            return payFeeService.payfeeByBank(payPayAgentbranch,bankPayFeeParm.getOrderCode(),bankPayFeeParm.getAccountNumber(),bankPayFeeParm.getMoney(),bankPayFeeParm.getPayTime());
-        return payFeeService.cancelPayFee(payPayAgentbranch,bankCancelPayFeeParm);
-        }catch (Exception e){
+            return payFeeService.cancelPayFee(payPayAgentbranch, bankCancelPayFeeParm);
+        } catch (Exception e) {
             e.printStackTrace();
-            return new BankPayfeeMsg("0005","系统异常");
+            return new BankPayfeeMsg("0005", "系统异常");
         }
     }
 }

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

@@ -1475,7 +1475,7 @@ public class PayFeeServiceImp implements PayFeeService {
             //取消的批次号
             String payseriesno =payAgenttransactionDto.getPayseriesno();
 
-            if(payAgenttransactionDto.getAmount() != null && payAgenttransactionDto.getAmount().compareTo(new BigDecimal(bankCancelPayFeeParm.getMoney())) == 0){
+            if(payAgenttransactionDto.getAmount() != null && payAgenttransactionDto.getAmount().setScale(2,BigDecimal.ROUND_HALF_UP).compareTo(new BigDecimal(bankCancelPayFeeParm.getMoney()).setScale(2,BigDecimal.ROUND_HALF_UP)) == 0){
                 if(payAgenttransactionDto.getState() != 4){
                     //获取相同批次号相同的实收信息
                     List<PayPayReceived> payReceiveds =  payPayReceivedMapper.findBySeriesno(payseriesno,siteId,customerId);