LAPTOP-FO2T5SIU\35838 9 maanden geleden
bovenliggende
commit
d429eed416

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

@@ -130,6 +130,8 @@ public class ContractManageService implements BaseService<ContractManage, Contra
         contractManage.setMaintenanceFunds(parkFloorDisc.getMaintenanceFunds());
         contractManage.setContractStatus(1);
         contractManage.setFundCollectionStatus(1);
+        contractManage.setCreatedAt(new Date());
+        contractManage.setCreatedId(ShiroUtils.getUserId());
         
         // 拼接买受人名称
         BuyerExample buyerExample = new BuyerExample();

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

@@ -171,10 +171,11 @@ public class RefundManageService implements BaseService<RefundManage, RefundMana
         model.setCreatedAt(date);
         int result = insertWithoutId(model);
 
-        // 更新合同 收款状态
+        // 更新合同 收款状态 合同状态
         ContractManage contractManage = contractManageMapper.selectByPrimaryKey(model.getContractId());
         contractManage.setCollectionStatus(collectionStatus);
         contractManage.setFundCollectionStatus(fundCollectionStatus);
+        contractManage.setContractStatus(3);
         contractManageMapper.updateByPrimaryKeySelective(contractManage);
         return result;
     }

+ 1 - 0
pro-base/src/main/resources/mybatis/customerManagement/ContractManageExtendMapper.xml

@@ -24,5 +24,6 @@
                 and customer_management_id in (select customer_management_id from buyer where name like concat('%',#{buyerName},'%'))
             </if>
         </where>
+        order by created_at desc,updated_at desc
     </select>
 </mapper>