bug

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

@@ -30,6 +30,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -112,9 +113,18 @@ public class MaintenanceFundsManagementService implements BaseService<Maintenanc
      */
     public int add(MaintenanceFundsManagement model){
 
-        // 更新合同 专项维修资金收取状态 已收款
+        // 更新合同 专项维修资金收取状态
         ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
-        contractManage.setFundCollectionStatus(2);
+        BigDecimal payMoney = model.getPayMoney();
+        BigDecimal maintenanceTotalPrice = contractManage.getMaintenanceTotalPrice();
+        if(payMoney.doubleValue() >= maintenanceTotalPrice.doubleValue()){
+            // 已收款
+            contractManage.setFundCollectionStatus(2);
+        }else {
+            // 部分收款
+            contractManage.setFundCollectionStatus(4);
+        }
+
         contractManageMapper.updateByPrimaryKeySelective(contractManage);
 
         model.setHouseId(contractManage.getHouseId());

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

@@ -6,9 +6,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.idea.buildManage.mapper.ParkRoomExtendMapper;
+import com.idea.buildManage.mapper.ParkRoomMapper;
+import com.idea.buildManage.model.ParkRoom;
 import com.idea.buildManage.response.ParkRoomResponse;
 import com.idea.customerManagement.dto.ContractManageDto;
 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.customerManagement.service.BuyerService;
@@ -55,6 +58,10 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
     private ContractManageMapper contractManageMapper;
     @Autowired
     private FrameUserMapper frameUserMapper;
+    @Autowired
+    private CustomerManagementMapper customerManagementMapper;
+    @Autowired
+    private ParkRoomMapper roomMapper;
 
 
     @Override
@@ -177,6 +184,15 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         contractManage.setFundCollectionStatus(fundCollectionStatus);
         contractManage.setContractStatus(3);
         contractManageMapper.updateByPrimaryKeySelective(contractManage);
+        // 更新客户管理 客户状态
+        CustomerManagement customerManagement = customerManagementMapper.selectByPrimaryKey(contractManage.getCustomerManagementId());
+        customerManagement.setStatus(5);
+        customerManagementMapper.updateByPrimaryKeySelective(customerManagement);
+        // 更新房间状态
+        ParkRoom room = roomMapper.selectByPrimaryKey(contractManage.getHouseId());
+        room.setSoldStatus(4);
+        roomMapper.updateByPrimaryKeySelective(room);
+
         return result;
     }
 

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

@@ -12,16 +12,16 @@
     <where>
         and contract_manage.contract_status = '2'
       <if test="houseName != null and houseName != ''">
-        and house_name like concat('%',#{houseName},'%')
+        and contract_manage.house_name like concat('%',#{houseName},'%')
       </if>
       <if test="fundCollectionStatus != null and fundCollectionStatus != ''">
         and contract_manage.fund_collection_status = #{fundCollectionStatus}
       </if>
       <if test="buyerName != null and buyerName != ''">
-        and maintenance_funds_management.customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
+        and contract_manage.buyer_name like concat('%',#{buyerName},'%')
       </if>
     </where>
-    order by created_at desc
+      order by contract_manage.created_at desc
   </select>