Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2023-03-29 0b04f664887c73e90bf684a4e69c0fdbfe26349d

 service-fee/src/main/java/com/java110/fee/bmo/payFeeAudit/impl/GetPayFeeAuditBMOImpl.java

@@ -46,33 +46,24 @@
     * @return 订单服务能够接受的报文
     */
    public ResponseEntity<String> get(PayFeeAuditDto payFeeAuditDto) {

        if (!refreshRoomPayObjId(payFeeAuditDto)) {
            ResponseEntity<String> responseEntity = new ResponseEntity<String>("[]", HttpStatus.OK);
            return responseEntity;
        }

        if (!refreshCarPayObjId(payFeeAuditDto)) {
            ResponseEntity<String> responseEntity = new ResponseEntity<String>("[]", HttpStatus.OK);
            return responseEntity;
        }


        int count = payFeeAuditInnerServiceSMOImpl.queryPayFeeAuditsCount(payFeeAuditDto);

        List<PayFeeAuditDto> payFeeAuditDtos = null;
        if (count > 0) {
            payFeeAuditDtos = payFeeAuditInnerServiceSMOImpl.queryPayFeeAudits(payFeeAuditDto);

            frashRoomAndStaff(payFeeAuditDtos);
        } else {
            payFeeAuditDtos = new ArrayList<>();
        }

        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) payFeeAuditDto.getRow()), count, payFeeAuditDtos);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);

        return responseEntity;
    }

@@ -162,14 +153,15 @@

        for (PayFeeAuditDto payFeeAuditDto : payFeeAuditDtos) {
            for (OrderDto orderDto : orderDtos) {
                if (StringUtil.isEmpty(payFeeAuditDto.getbId())) {
                    continue;
                }
                if (payFeeAuditDto.getbId().equals(orderDto.getbId())) {
                    payFeeAuditDto.setUserId(orderDto.getUserId());
                    payFeeAuditDto.setUserName(orderDto.getUserName());
                }
            }
        }


    }

}