ljy121 1 year ago
parent
commit
ee9db377dd

+ 6 - 4
zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractMessageServiceImpl.java

@@ -134,13 +134,15 @@ public class ContractMessageServiceImpl implements ContractMessageService {
      */
     @Override
     public void addByReturnMoney(ContractReturnMoney contractReturnMoney) {
-        ContractMessage message = null;
-        if(StringUtils.isNotBlank(contractReturnMoney.getId())){
-            message = contractMessageMapper.selectById(contractReturnMoney.getId());
-        }
         Contract contract = contractService.selectByPrimaryKey(contractReturnMoney.getContractId());
         BigDecimal amount = contractReturnMoney.getReturnAmount().setScale(2, RoundingMode.HALF_UP);
         String content = "[回款]已回款:¥" + amount + " " + StringUtils.join(Arrays.asList(contract.getName(), contract.getContractOn(), "¥" + amount, contract.getAreaManager()), "/");
+        ContractMessage message = null;
+        if(StringUtils.isNotBlank(contractReturnMoney.getId())) {
+            QueryWrapper<ContractMessage> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("BUSINESS_ID", contractReturnMoney.getId()).eq("MESSAGE_TYPE", 2);
+            message = contractMessageMapper.selectOne(queryWrapper);
+        }
         if(message == null) {
             message = new ContractMessage();
             message.setContractId(contractReturnMoney.getContractId());