1

pro-base/src/main/java/com/idea/customerManagement/dto/ContractManageDto.java

@@ -17,10 +17,24 @@ public class ContractManageDto extends ContractManage {
 
     private String signingDateTo;
 
+    /**
+     * 已收
+     */
     private BigDecimal receivedMoney;
 
+    /**
+     * 尚欠
+     */
     private BigDecimal arrears;
 
+    /**
+     * 关联专项维修资金id
+     */
     private String maintenanceFundsId;
 
+    /**
+     * 收款类型 1 预收款 2 专项维修资金
+     */
+    private String payType;
+
 }

pro-base/src/main/java/com/idea/customerManagement/dto/RoomSelectionInfoDto.java

@@ -38,4 +38,8 @@ public class RoomSelectionInfoDto extends RoomSelectionInfo {
 
     private String createdName;
 
+    private String buyerName;
+
+    private String groupDiscName;
+
 }

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

@@ -171,6 +171,8 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         model.setUpdatedId(ShiroUtils.getUserId());
         // 如果是已签约
         if(model.getContractStatus() == 2){
+            // 定金转房款 部分收款
+            model.setCollectionStatus(1);
             // 更新房间已售状态
             String houseId = model.getHouseId();
             ParkRoom parkRoom = parkRoomService.selectByPrimaryKey(houseId);

pro-base/src/main/resources/mybatis/customerManagement/RoomSelectionInfoExtendMapper.xml

@@ -25,11 +25,16 @@
         select room_selection_info.*,
                mnp_building.build_num buildName,
                park_room.room_no,
-               frame_user.truename createdName
+               frame_user.truename createdName,
+               cm.buyer_name,
+        concat(park_info.group_name,'-',park_floor_disc.name) groupDiscName
         from room_selection_info
-        left join mnp_building on mnp_building.id = room_selection_info.build_id
         left join park_room on park_room.id = room_selection_info.house_id
+        left join mnp_building on mnp_building.id = room_selection_info.build_id
+        left join park_info on park_info.id = room_selection_info.group_id
+        left join park_floor_disc on park_floor_disc.id = room_selection_info.disc_id
         left join frame_user on frame_user.id = room_selection_info.created_id
+        left join customer_management cm on cm.id = room_selection_info.customer_management_id
         <where>
             <if test="buyerName != null and buyerName != ''">
                 and room_selection_info.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))

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

@@ -12,10 +12,9 @@
     select contract_manage.*, ifnull(sum(pay_log.pay_money),0) receivedMoney,
            ifnull(contract_manage.total_price - sum(pay_log.pay_money),0) arrears
     from contract_manage
-    left join pay_log on contract_manage.id = pay_log.contract_id
+    left join pay_log on contract_manage.id = pay_log.contract_id and pay_log.pay_type = #{payType}
     <where>
       and contract_status = '2'
-      and pay_log.pay_type = #{payType}
       <if test="houseName != null and houseName != ''">
         and house_name like concat('%',#{houseName},'%')
       </if>