chengf
2025-09-22 92b2e606aa2af4be3e06cd0e636d7cca2d4016c8
Merge remote-tracking branch 'origin/master'

# Conflicts:
# springboot/src/main/resources/application.yml
2个文件已修改
20 ■■■■■ 已修改文件
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/UpdateReturnPayFeeCmd.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-fee/src/main/java/com/java110/fee/cmd/returnPayFee/UpdateReturnPayFeeCmd.java
@@ -286,6 +286,24 @@
            returnAccount(reqJson);
            //todo 提交线上退费
            returnOnlinePayMoney(feeDetailDto);
            String detailId = reqJson.getJSONObject("feeDetailDto").getString("detailId");
            PayFeeAuditPo payFeeAuditPo = new PayFeeAuditPo();
            payFeeAuditPo.setFeeDetailId(detailId);
            PayFeeAuditDto payFeeAuditDto = new PayFeeAuditDto();
            payFeeAuditPo.setFeeDetailId(detailId);
            List<PayFeeAuditDto> payFeeAuditDtos = payFeeAuditInnerServiceSMOImpl.queryPayFeeAudits(payFeeAuditDto);
//            if (ListUtil.isNull(payFeeAuditDtos)) {
//                payFeeAuditPo.setAuditId(GenerateCodeFactory.getGeneratorId("84"));
//                payFeeAuditPo.setState("3030");
//                payFeeAuditPo.setMessage("已退费");
//                payFeeAuditPo.setStatusCd("0");
//                payFeeAuditPo.setCommunityId(reqJson.getString("communityId"));
//                payFeeAuditPo.setFeeId(reqJson.getString("feeId"));
//                payFeeAuditPo.setAuditUserId(reqJson.getString("userId"));
//                payFeeAuditPo.setAuditUserName(reqJson.getString("applyPersonName"));
//                payFeeAuditInnerServiceSMOImpl.savePayFeeAudit(payFeeAuditPo);
//            }
        }
        //不通过
        if ("1200".equals(reqJson.getString("state"))) {
springboot/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active: devlocal
    active: debug
import:
  line: