diff --git a/wrenchboard/src/shared_tool/jobs.cc b/wrenchboard/src/shared_tool/jobs.cc index 835f89a7..2c63a7fa 100644 --- a/wrenchboard/src/shared_tool/jobs.cc +++ b/wrenchboard/src/shared_tool/jobs.cc @@ -391,19 +391,23 @@ long WrenchReplyMessage(CVars in, CVars &out) { return 0; } + long WrenchMarketInterestQuestion(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; out = in; try { out["status"] = "0"; long member_id = REQ_LONG(in, "member_id", 1, -1); - long interest_id = REQ_LONG(in, "interest_id", 1, -1); - + //long interest_id = REQ_LONG(in, "interest_id", 1, -1); + REQ_STRING(in, "offer_uid", 1, 55, "(.*)"); + REQ_STRING(in, "interest_uid", 1, 55, "(.*)"); REQ_STRING(in, "yourmessage", 1, 500, "(.*)"); //offer_code - REQ_STRING(in, "offer_code", 1, 15, "(.*)"); //offer_code + //REQ_STRING(in, "offer_code", 1, 15, "(.*)"); //offer_code REQ_STRING(in, "msg_type", 1, 15, "(.*)"); //msg_type - const PGresult *res = pgsql_query("select o.*,o.member_id AS client_id from members_offer_interest o LEFT JOIN members_jobs_offer jo ON jo.id=o.offer_id WHERE jo.offer_code='%s' AND o.id=%lu", in["offer_code"].c_str(), interest_id); + const PGresult *res = pgsql_query("SELECT o.*,o.member_id AS client_id,jo.offer_code " + " FROM members_offer_interest o " + " LEFT JOIN members_jobs_offer jo ON jo.id=o.offer_id WHERE jo.uid='%s' AND o.uid=%lu", in["offer_uid"].c_str(), in["interest_uid"].c_str()); if (res != NULL && pgsql_num_rows(res) > 0) { mapf = pgsql_fetch_assoc(res, 0); if (!f.empty()) { @@ -421,7 +425,7 @@ long WrenchMarketInterestQuestion(CVars in, CVars &out) { x["msg_type"].set_valid(true); x["member_id"] = out["member_id"]; x["member_id"].set_valid(true); - x["memo"] = in["offer_code"]; + x["memo"] = rec["offer_code"]; x["memo"].set_valid(true); long msg_id = insert_db_record(DBS_VALID, "members_messages", "members_messages_id_seq", x); if (msg_id > 0) { diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index bf59284a..aa7f1d1e 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -151,6 +151,7 @@ $routes->post('/en/wrench/api/v1/payremcard', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/offersinterestlist', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/offersinterestproc', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/offerinterestmsg', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/resources', 'WrenchResources::website'); $routes->post('/en/wrench/api/v1/askresources', 'WrenchResources::aigate'); diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 3478ae06..847ff43a 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -108,6 +108,7 @@ class WrenchApi extends BaseController 'activetaskstatus'=> ['POST'], 'offersinterestlist' => ['POST'], 'offersinterestproc' => ['POST'], + 'offerinterestmsg' => ['POST'], 'payprevcard' => ['POST'], 'paynewcard' => ['POST'], 'paylistcard' => ['POST'], @@ -131,6 +132,9 @@ class WrenchApi extends BaseController case 'payremcard': // pending break; + case 'offerinterestmsg': + $in["action"] = WRENCHBOARD_JOB_MRKTINT_QUEST; + break; case 'offersinterestproc': $in = $this->procOfferInterest($in); break;