1

pro-base/src/main/java/com/idea/buildManage/response/ParkRoomResponse.java

@@ -90,4 +90,6 @@ public class ParkRoomResponse extends ParkRoom {
 
     private String chooseStatus;
 
+    private String contractId;
+
 }

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

@@ -156,7 +156,7 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         ParkRoomResponse response = parkRoomService.getFullName(roomSelectionInfo.getHouseId());
         String fullName = response.getGroupName() + response.getDiscName() + response.getBuildName() + response.getRoomNo();
         contractManage.setHouseName(fullName);
-        int result = insertSelective(contractManage);
+        int result = insertWithoutId(contractManage);
         return result;
     }
 

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

@@ -297,6 +297,8 @@ public class IntentionalDepositService implements BaseService<IntentionalDeposit
         payLog.setPayTime(new Date());
         payLog.setPaymentMethod(model.getPaymentMethod());
         payLog.setStatus(0);
+        payLog.setCreatedAt(new Date());
+        payLog.setCreatedBy(ShiroUtils.getUserId());
         payLogMapper.insertSelective(payLog);
 
         // 更新房间状态

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

@@ -230,6 +230,8 @@ public class RoomSelectionInfoService implements BaseService<RoomSelectionInfo,
         payLog.setPayTime(new Date());
         payLog.setPaymentMethod(model.getPaymentMethod());
         payLog.setStatus(0);
+        payLog.setCreatedAt(new Date());
+        payLog.setCreatedBy(ShiroUtils.getUserId());
         payLogMapper.insertSelective(payLog);
         return result;
     }

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

@@ -125,6 +125,8 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
         payLog.setPayTime(new Date());
         payLog.setPaymentMethod(model.getPaymentMethod());
         payLog.setStatus(0);
+        payLog.setCreatedAt(new Date());
+        payLog.setCreatedBy(ShiroUtils.getUserId());
         payLogMapper.insertSelective(payLog);
 
         model.setHouseId(contractManage.getHouseId());

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

@@ -126,8 +126,15 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         List<RoomSelectionInfo> selectionList = roomSelectionInfoMapper.selectByExample(roomSelectionInfoExample);
         List<ParkRoomResponse> result = new ArrayList<>();
         for(RoomSelectionInfo info : selectionList){
+            // 根据客户id 合同房间id 查询合同
+            ContractManageExample example = new ContractManageExample();
+            example.createCriteria().andCustomerManagementIdEqualTo(info.getCustomerManagementId())
+                    .andHouseIdEqualTo(info.getHouseId());
+            List<ContractManage> contractManages = contractManageMapper.selectByExample(example);
+
             ParkRoomResponse response = roomExtendMapper.getFullName(info.getHouseId());
             response.setCustomerManagementId(info.getCustomerManagementId());
+            response.setContractId(contractManages.get(0).getId());
             result.add(response);
         }
         return result;

pro-base/src/main/resources/mybatis/paymentManagement/RefundManageExtendMapper.xml

@@ -13,18 +13,17 @@
     from contract_manage
     left join refund_manage on contract_manage.id = refund_manage.contract_id
     <where>
-      and contract_status = '2'
       <if test="houseName != null and houseName != ''">
         and house_name like concat('%',#{houseName},'%')
       </if>
       <if test="refundDateFrom != null and refundDateFrom != ''">
-        and refund_manage.created_at >= #{refundDateFrom}
+        and date_format(refund_manage.created_at, '%Y-%m-%d') &gt;= #{refundDateFrom}
       </if>
       <if test="refundDateTo != null and refundDateTo != ''">
-        and refund_manage.created_at &lt;= #{refundDateTo}
+        and date_format(refund_manage.created_at, '%Y-%m-%d') &lt;= #{refundDateTo}
       </if>
       <if test="buyerName != null and buyerName != ''">
-        and contract_manage.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
+        and refund_manage.buyer_name concat('%',#{buyerName},'%')
       </if>
       <if test="applicant != null and applicant != ''">
         and applicant like concat('%',#{applicant},'%')