From 8708226a837ff25c4720a67e896099acdd4624dc Mon Sep 17 00:00:00 2001 From: sdk-team Date: Fri, 4 Dec 2020 10:54:55 +0000 Subject: [PATCH] Supported broker demand. --- CHANGELOG | 3 ++ .../domain/model/AcceptDemandResult.h | 2 + .../domain/model/QueryBrokerDemandResult.h | 1 + domain/src/DomainClient.cc | 6 +-- domain/src/model/AcceptDemandResult.cc | 7 +++ ...atchFuzzyMatchDomainSensitiveWordResult.cc | 8 +-- domain/src/model/LookupTmchNoticeResult.cc | 52 +++++++++---------- domain/src/model/QueryBrokerDemandResult.cc | 2 + .../model/QueryDomainAdminDivisionResult.cc | 8 +-- 9 files changed, 52 insertions(+), 37 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index b44b55bd0..2dba7e4bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +2020-12-04 Version: patch +- Supported broker demand. + 2020-12-04 Version: patch - Support manual scan interface. diff --git a/domain/include/alibabacloud/domain/model/AcceptDemandResult.h b/domain/include/alibabacloud/domain/model/AcceptDemandResult.h index 4abf20312..0c6fccb46 100644 --- a/domain/include/alibabacloud/domain/model/AcceptDemandResult.h +++ b/domain/include/alibabacloud/domain/model/AcceptDemandResult.h @@ -37,10 +37,12 @@ namespace AlibabaCloud AcceptDemandResult(); explicit AcceptDemandResult(const std::string &payload); ~AcceptDemandResult(); + std::string getBindUrl()const; protected: void parse(const std::string &payload); private: + std::string bindUrl_; }; } diff --git a/domain/include/alibabacloud/domain/model/QueryBrokerDemandResult.h b/domain/include/alibabacloud/domain/model/QueryBrokerDemandResult.h index 329b3b41a..c333e2832 100644 --- a/domain/include/alibabacloud/domain/model/QueryBrokerDemandResult.h +++ b/domain/include/alibabacloud/domain/model/QueryBrokerDemandResult.h @@ -43,6 +43,7 @@ namespace AlibabaCloud float bargainSellerPrice; float servicePayPrice; std::string payDomain; + int orderType; int produceType; std::string bargainSellerMobile; long publishTime; diff --git a/domain/src/DomainClient.cc b/domain/src/DomainClient.cc index 0c7220d2d..5086226d1 100644 --- a/domain/src/DomainClient.cc +++ b/domain/src/DomainClient.cc @@ -31,21 +31,21 @@ DomainClient::DomainClient(const Credentials &credentials, const ClientConfigura RpcServiceClient(SERVICE_NAME, std::make_shared(credentials), configuration) { auto locationClient = std::make_shared(credentials, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "domain"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } DomainClient::DomainClient(const std::shared_ptr& credentialsProvider, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration) { auto locationClient = std::make_shared(credentialsProvider, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "domain"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } DomainClient::DomainClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) : RpcServiceClient(SERVICE_NAME, std::make_shared(accessKeyId, accessKeySecret), configuration) { auto locationClient = std::make_shared(accessKeyId, accessKeySecret, configuration); - endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, "domain"); + endpointProvider_ = std::make_shared(locationClient, configuration.regionId(), SERVICE_NAME, ""); } DomainClient::~DomainClient() diff --git a/domain/src/model/AcceptDemandResult.cc b/domain/src/model/AcceptDemandResult.cc index 7e91c8752..74507ac94 100644 --- a/domain/src/model/AcceptDemandResult.cc +++ b/domain/src/model/AcceptDemandResult.cc @@ -39,6 +39,13 @@ void AcceptDemandResult::parse(const std::string &payload) Json::Value value; reader.parse(payload, value); setRequestId(value["RequestId"].asString()); + if(!value["BindUrl"].isNull()) + bindUrl_ = value["BindUrl"].asString(); } +std::string AcceptDemandResult::getBindUrl()const +{ + return bindUrl_; +} + diff --git a/domain/src/model/BatchFuzzyMatchDomainSensitiveWordResult.cc b/domain/src/model/BatchFuzzyMatchDomainSensitiveWordResult.cc index 097bba662..67717feb3 100644 --- a/domain/src/model/BatchFuzzyMatchDomainSensitiveWordResult.cc +++ b/domain/src/model/BatchFuzzyMatchDomainSensitiveWordResult.cc @@ -47,12 +47,12 @@ void BatchFuzzyMatchDomainSensitiveWordResult::parse(const std::string &payload) sensitiveWordMatchResultListObject.keyword = valueSensitiveWordMatchResultListSensitiveWordMatchResult["Keyword"].asString(); if(!valueSensitiveWordMatchResultListSensitiveWordMatchResult["Exist"].isNull()) sensitiveWordMatchResultListObject.exist = valueSensitiveWordMatchResultListSensitiveWordMatchResult["Exist"].asString() == "true"; - auto allMatchedSentiveWordsNode = allSensitiveWordMatchResultListNode["MatchedSentiveWords"]["MatchedSensitiveWord"]; - for (auto allSensitiveWordMatchResultListNodeMatchedSentiveWordsMatchedSensitiveWord : allMatchedSentiveWordsNode) + auto allMatchedSentiveWordsNode = valueSensitiveWordMatchResultListSensitiveWordMatchResult["MatchedSentiveWords"]["MatchedSensitiveWord"]; + for (auto valueSensitiveWordMatchResultListSensitiveWordMatchResultMatchedSentiveWordsMatchedSensitiveWord : allMatchedSentiveWordsNode) { SensitiveWordMatchResult::MatchedSensitiveWord matchedSentiveWordsObject; - if(!allSensitiveWordMatchResultListNodeMatchedSentiveWordsMatchedSensitiveWord["Word"].isNull()) - matchedSentiveWordsObject.word = allSensitiveWordMatchResultListNodeMatchedSentiveWordsMatchedSensitiveWord["Word"].asString(); + if(!valueSensitiveWordMatchResultListSensitiveWordMatchResultMatchedSentiveWordsMatchedSensitiveWord["Word"].isNull()) + matchedSentiveWordsObject.word = valueSensitiveWordMatchResultListSensitiveWordMatchResultMatchedSentiveWordsMatchedSensitiveWord["Word"].asString(); sensitiveWordMatchResultListObject.matchedSentiveWords.push_back(matchedSentiveWordsObject); } sensitiveWordMatchResultList_.push_back(sensitiveWordMatchResultListObject); diff --git a/domain/src/model/LookupTmchNoticeResult.cc b/domain/src/model/LookupTmchNoticeResult.cc index 470a2c18e..5f565b75f 100644 --- a/domain/src/model/LookupTmchNoticeResult.cc +++ b/domain/src/model/LookupTmchNoticeResult.cc @@ -47,14 +47,14 @@ void LookupTmchNoticeResult::parse(const std::string &payload) claimsObject.markName = valueClaimsClaim["MarkName"].asString(); if(!valueClaimsClaim["GoodsAndServices"].isNull()) claimsObject.goodsAndServices = valueClaimsClaim["GoodsAndServices"].asString(); - auto allHoldersNode = allClaimsNode["Holders"]["Holder"]; - for (auto allClaimsNodeHoldersHolder : allHoldersNode) + auto allHoldersNode = valueClaimsClaim["Holders"]["Holder"]; + for (auto valueClaimsClaimHoldersHolder : allHoldersNode) { Claim::Holder holdersObject; - if(!allClaimsNodeHoldersHolder["Entitlement"].isNull()) - holdersObject.entitlement = allClaimsNodeHoldersHolder["Entitlement"].asString(); - if(!allClaimsNodeHoldersHolder["Org"].isNull()) - holdersObject.org = allClaimsNodeHoldersHolder["Org"].asString(); + if(!valueClaimsClaimHoldersHolder["Entitlement"].isNull()) + holdersObject.entitlement = valueClaimsClaimHoldersHolder["Entitlement"].asString(); + if(!valueClaimsClaimHoldersHolder["Org"].isNull()) + holdersObject.org = valueClaimsClaimHoldersHolder["Org"].asString(); auto addrNode = value["Addr"]; if(!addrNode["City"].isNull()) holdersObject.addr.city = addrNode["City"].asString(); @@ -69,22 +69,22 @@ void LookupTmchNoticeResult::parse(const std::string &payload) holdersObject.addr.street.push_back(value.asString()); claimsObject.holders.push_back(holdersObject); } - auto allContactsNode = allClaimsNode["Contacts"]["Contact"]; - for (auto allClaimsNodeContactsContact : allContactsNode) + auto allContactsNode = valueClaimsClaim["Contacts"]["Contact"]; + for (auto valueClaimsClaimContactsContact : allContactsNode) { Claim::Contact contactsObject; - if(!allClaimsNodeContactsContact["Type"].isNull()) - contactsObject.type = allClaimsNodeContactsContact["Type"].asString(); - if(!allClaimsNodeContactsContact["Name"].isNull()) - contactsObject.name = allClaimsNodeContactsContact["Name"].asString(); - if(!allClaimsNodeContactsContact["Org"].isNull()) - contactsObject.org = allClaimsNodeContactsContact["Org"].asString(); - if(!allClaimsNodeContactsContact["Voice"].isNull()) - contactsObject.voice = allClaimsNodeContactsContact["Voice"].asString(); - if(!allClaimsNodeContactsContact["Fax"].isNull()) - contactsObject.fax = allClaimsNodeContactsContact["Fax"].asString(); - if(!allClaimsNodeContactsContact["Email"].isNull()) - contactsObject.email = allClaimsNodeContactsContact["Email"].asString(); + if(!valueClaimsClaimContactsContact["Type"].isNull()) + contactsObject.type = valueClaimsClaimContactsContact["Type"].asString(); + if(!valueClaimsClaimContactsContact["Name"].isNull()) + contactsObject.name = valueClaimsClaimContactsContact["Name"].asString(); + if(!valueClaimsClaimContactsContact["Org"].isNull()) + contactsObject.org = valueClaimsClaimContactsContact["Org"].asString(); + if(!valueClaimsClaimContactsContact["Voice"].isNull()) + contactsObject.voice = valueClaimsClaimContactsContact["Voice"].asString(); + if(!valueClaimsClaimContactsContact["Fax"].isNull()) + contactsObject.fax = valueClaimsClaimContactsContact["Fax"].asString(); + if(!valueClaimsClaimContactsContact["Email"].isNull()) + contactsObject.email = valueClaimsClaimContactsContact["Email"].asString(); auto addr1Node = value["Addr"]; if(!addr1Node["City"].isNull()) contactsObject.addr1.city = addr1Node["City"].asString(); @@ -99,14 +99,14 @@ void LookupTmchNoticeResult::parse(const std::string &payload) contactsObject.addr1.street2.push_back(value.asString()); claimsObject.contacts.push_back(contactsObject); } - auto allClassDescsNode = allClaimsNode["ClassDescs"]["ClassDesc"]; - for (auto allClaimsNodeClassDescsClassDesc : allClassDescsNode) + auto allClassDescsNode = valueClaimsClaim["ClassDescs"]["ClassDesc"]; + for (auto valueClaimsClaimClassDescsClassDesc : allClassDescsNode) { Claim::ClassDesc classDescsObject; - if(!allClaimsNodeClassDescsClassDesc["ClassNum"].isNull()) - classDescsObject.classNum = std::stoi(allClaimsNodeClassDescsClassDesc["ClassNum"].asString()); - if(!allClaimsNodeClassDescsClassDesc["Desc"].isNull()) - classDescsObject.desc = allClaimsNodeClassDescsClassDesc["Desc"].asString(); + if(!valueClaimsClaimClassDescsClassDesc["ClassNum"].isNull()) + classDescsObject.classNum = std::stoi(valueClaimsClaimClassDescsClassDesc["ClassNum"].asString()); + if(!valueClaimsClaimClassDescsClassDesc["Desc"].isNull()) + classDescsObject.desc = valueClaimsClaimClassDescsClassDesc["Desc"].asString(); claimsObject.classDescs.push_back(classDescsObject); } auto jurDescNode = value["JurDesc"]; diff --git a/domain/src/model/QueryBrokerDemandResult.cc b/domain/src/model/QueryBrokerDemandResult.cc index df6d47576..6c03967f9 100644 --- a/domain/src/model/QueryBrokerDemandResult.cc +++ b/domain/src/model/QueryBrokerDemandResult.cc @@ -71,6 +71,8 @@ void QueryBrokerDemandResult::parse(const std::string &payload) dataObject.bargainSellerMobile = valueDataDemand["BargainSellerMobile"].asString(); if(!valueDataDemand["ServicePayPrice"].isNull()) dataObject.servicePayPrice = std::stof(valueDataDemand["ServicePayPrice"].asString()); + if(!valueDataDemand["OrderType"].isNull()) + dataObject.orderType = std::stoi(valueDataDemand["OrderType"].asString()); data_.push_back(dataObject); } if(!value["TotalItemNum"].isNull()) diff --git a/domain/src/model/QueryDomainAdminDivisionResult.cc b/domain/src/model/QueryDomainAdminDivisionResult.cc index ea1d41269..b9e8ce3bd 100644 --- a/domain/src/model/QueryDomainAdminDivisionResult.cc +++ b/domain/src/model/QueryDomainAdminDivisionResult.cc @@ -45,12 +45,12 @@ void QueryDomainAdminDivisionResult::parse(const std::string &payload) AdminDivision adminDivisionsObject; if(!valueAdminDivisionsAdminDivision["DivisionName"].isNull()) adminDivisionsObject.divisionName = valueAdminDivisionsAdminDivision["DivisionName"].asString(); - auto allChildrenNode = allAdminDivisionsNode["Children"]["ChildrenItem"]; - for (auto allAdminDivisionsNodeChildrenChildrenItem : allChildrenNode) + auto allChildrenNode = valueAdminDivisionsAdminDivision["Children"]["ChildrenItem"]; + for (auto valueAdminDivisionsAdminDivisionChildrenChildrenItem : allChildrenNode) { AdminDivision::ChildrenItem childrenObject; - if(!allAdminDivisionsNodeChildrenChildrenItem["ChildDivisionName"].isNull()) - childrenObject.childDivisionName = allAdminDivisionsNodeChildrenChildrenItem["ChildDivisionName"].asString(); + if(!valueAdminDivisionsAdminDivisionChildrenChildrenItem["ChildDivisionName"].isNull()) + childrenObject.childDivisionName = valueAdminDivisionsAdminDivisionChildrenChildrenItem["ChildDivisionName"].asString(); adminDivisionsObject.children.push_back(childrenObject); } adminDivisions_.push_back(adminDivisionsObject);