Authored by caoyan

Merge branch 'dev_物权转移' into test6.8.6

@@ -544,6 +544,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -544,6 +544,7 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
544 if(StringUtils.isBlank(ownerName)){ 544 if(StringUtils.isBlank(ownerName)){
545 ownerName = blurUid(toUid); 545 ownerName = blurUid(toUid);
546 } 546 }
  547 +
547 //组装信息 同步至区块链写代理 548 //组装信息 同步至区块链写代理
548 Map<String, Object> infoMap = new HashMap<>(); 549 Map<String, Object> infoMap = new HashMap<>();
549 infoMap.put("tagid", tagId); 550 infoMap.put("tagid", tagId);
@@ -555,6 +556,10 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{ @@ -555,6 +556,10 @@ public class ProductIdentifyServiceImpl implements ProductIdentifyService{
555 infoMap.put("transaction_time", DateUtil.getCurrentTimeSecond()); 556 infoMap.put("transaction_time", DateUtil.getCurrentTimeSecond());
556 infoMap.put("owner", ownerName); 557 infoMap.put("owner", ownerName);
557 infoMap.put("auth_time", DateUtil.getCurrentTimeSecond()); 558 infoMap.put("auth_time", DateUtil.getCurrentTimeSecond());
  559 + ProductChain productChain = productChainMapper.selectByTagId(tagId);
  560 + if(null != productChain) {
  561 + infoMap.put("last_transaction_id", productChain.getTransactionId());
  562 + }
558 logger.info("req url is {}, params is {}", syncBlockChain_url, infoMap); 563 logger.info("req url is {}, params is {}", syncBlockChain_url, infoMap);
559 String result = serviceCaller.post("", syncBlockChain_url, infoMap, String.class, null).get(5); 564 String result = serviceCaller.post("", syncBlockChain_url, infoMap, String.class, null).get(5);
560 logger.info(" result is {}", result); 565 logger.info(" result is {}", result);