1

pro-base/src/main/java/com/idea/customerManagement/controller/ContractManageController.java

@@ -64,5 +64,16 @@ public class ContractManageController extends BaseController {
     }
 
 
+    /**
+     * 获取合同对应的银行账号
+     * @param contractId
+     * @return
+     */
+    @PostMapping(value = "getBankList",produces = {"application/json;charset=UTF-8"})
+    @ResponseBody
+    public Object getBankList(String contractId){
+        return modelService.getBankList(contractId);
+    }
+
 
 }

pro-base/src/main/java/com/idea/customerManagement/service/ContractManageService.java

@@ -16,6 +16,9 @@ import com.idea.customerManagement.mapper.ContractManageMapper;
 import com.idea.customerManagement.mapper.CustomerManagementMapper;
 import com.idea.customerManagement.mapper.RoomSelectionInfoMapper;
 import com.idea.customerManagement.model.*;
+import com.idea.invoice.mapper.InvoiceBankMapper;
+import com.idea.invoice.model.InvoiceBank;
+import com.idea.invoice.model.InvoiceBankExample;
 import com.rockstar.common.base.BaseService;
 import com.rockstar.frame.model.extend.DateTrans;
 import com.rockstar.frame.model.extend.Tablepar;
@@ -48,6 +51,8 @@ public class ContractManageService implements BaseService<ContractManage, Contra
     private CustomerManagementMapper customerManagementMapper;
     @Autowired
     private RoomSelectionInfoMapper roomSelectionInfoMapper;
+    @Autowired
+    private InvoiceBankMapper invoiceBankMapper;
 
     @Override
     public int deleteByPrimaryKey(String s) {
@@ -220,5 +225,20 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         return result;
     }
 
+    /**
+     * 获取合同对应的银行账号
+     * @param contractId
+     * @return
+     */
+    public List<InvoiceBank> getBankList(String contractId){
+
+//        ContractManage contractManage = selectByPrimaryKey(contractId);
+//        ParkRoom parkRoom = parkRoomService.selectByPrimaryKey(contractManage.getHouseId());
+        InvoiceBankExample example = new InvoiceBankExample();
+//        example.createCriteria().andSuitCostTypeLike("%" + parkRoom.getDiscId() + "%");
+        return invoiceBankMapper.selectByExample(example);
+        
+    }
+
 
 }

pro-base/src/main/java/com/idea/paymentManagement/service/PayLogService.java

@@ -325,6 +325,8 @@ public class PayLogService implements BaseService<PayLog, PayLogExample> {
         payLogDto.setReceivableMoney(receivableMoney);
         payLogDto.setReceivedMoney(receivedMoney);
         payLogDto.setArrears(arrears);
+        payLogDto.setBankName(contractManage.getBankName());
+        payLogDto.setBankNumber(contractManage.getBankNumber());
         return payLogDto;
     }
 

pro-base/src/main/java/com/idea/paymentManagement/service/RefundDetailService.java

@@ -115,6 +115,10 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
             refundDetail.setType(type);
             refundDetail.setContentType(payLog.getContentType());
             refundDetail.setReceivedAmount(payLog.getPayMoney());
+            // 默认扣除 0
+            refundDetail.setDeductible(BigDecimal.ZERO);
+            // 默认实退金额 和 已收金额 相等
+            refundDetail.setActualRefundAmount(payLog.getPayMoney());
             refundDetail.setUuid(IdUtil.simpleUUID());
             refundDetail.setPayLogId(payLog.getPayLogId());
             refundDetail.setSerialNumber(payLog.getSerialNumber());
@@ -129,6 +133,10 @@ public class RefundDetailService implements BaseService<RefundDetail, RefundDeta
             refundDetail2.setType("专项维修资金");
             refundDetail2.setContentType(4);
             refundDetail2.setReceivedAmount(new BigDecimal(funds));
+            // 默认扣除 0
+            refundDetail2.setDeductible(BigDecimal.ZERO);
+            // 默认实退金额 和 已收金额 相等
+            refundDetail2.setActualRefundAmount(new BigDecimal(funds));
             refundDetail2.setUuid(IdUtil.simpleUUID());
             refundDetails.add(refundDetail2);
         }

pro-base/src/main/resources/mybatis/transactionRecord/TransactionRecord.xml

@@ -107,6 +107,7 @@
 
     <select id="convertRecord" resultType="com.idea.transactionRecordManage.vo.NccRecordVo">
         select intentional_deposit.*,
+        intentional_deposit.received_amount money,
         customer_management.buyer_name,
         customer_management.house_name,
         frame_user.truename as createdName,