czh hace 2 años
padre
commit
3a3f403871

+ 3 - 2
sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -504,7 +504,7 @@ public class KwcContractTradeService {
     private void sendTradeMessage(KwcContractTrade kwcContractTrade) {
         List<KwcContractTradeUnit> kwcContractTradeUnits = kwcContractTradeUnitService.queryByContractId(kwcContractTrade.getId());
         Map<Integer, KwcContractTradeUnit> collect = kwcContractTradeUnits.stream().collect(Collectors.toMap(KwcContractTradeUnit::getUnitType, Function.identity()));
-        KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.CARRIAGE.getCode());
+        KwcContractTradeUnit kwcContractTradeUnit = collect.get(CooperateTypeEnum.PURCHASER.getCode());
         EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(kwcContractTradeUnit.getEntId());
         Map<String, Object> map = new HashMap<>();
         map.put("entName", entCacheResDto.getFirmName());
@@ -530,7 +530,8 @@ public class KwcContractTradeService {
         }
 
         EntCacheResDto entCacheResDto2 = remoteSystemService.queryEntTreeById(kwcContractTradeUnit.getEntId());
-        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(kwcContractTrade.getEntId());
+        KwcContractTradeUnit kwcContractTradeUnit2 = collect.get(CooperateTypeEnum.SUPPLIER.getCode());
+        EntCacheResDto entCacheResDto1 = remoteSystemService.queryEntCacheById(kwcContractTradeUnit2.getEntId());
         map.put("entName", entCacheResDto1.getFirmName());
         commonBusinessService.sendSystemMessage(Collections.singletonList(new UserInfo().setUserId(entCacheResDto2.getContactsId()).setEntId(entCacheResDto2.getId())),
                 messageEnum,