From 75c0cf058a9ccd5a11a5efc3a223da7f39593cd4 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 18 Nov 2024 13:10:05 -0500 Subject: [PATCH] Get API --- wrenchboard/src/include/wrenchboard_api.h | 1 + wrenchboard/src/shared_tool/market.cc | 49 +++++++++++++++++++++++ www-api/app/Config/Constants.php | 1 + www-api/app/Config/Routes.php | 2 + www-api/app/Controllers/PromoAdmin.php | 10 ++++- www-api/app/Models/ResultFormatter.php | 2 - 6 files changed, 62 insertions(+), 3 deletions(-) diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index af425823..021ae206 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -462,6 +462,7 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_MARKET_PLAN01_NEXT1 220003 #define WRENCHBOARD_PROMOADMIN_LOGIN 220010 +#define WRENCHBOARD_PROMOADMIN_GETMEMBER 220013 #define WRENCHBOARD_PROMOADMIN_GETLIST 220014 #define WRENCHBOARD_PROMOADMIN_ADDLIST 220015 diff --git a/wrenchboard/src/shared_tool/market.cc b/wrenchboard/src/shared_tool/market.cc index cc77abe9..e27bc7c4 100644 --- a/wrenchboard/src/shared_tool/market.cc +++ b/wrenchboard/src/shared_tool/market.cc @@ -20,6 +20,7 @@ long WrenchPromoLoad(CVars in, CVars &out); long WrenchPromoAdminLogin(CVars in, CVars &out); long WrenchPromoAddList(CVars in, CVars &out); long WrenchPromoGetList( CVars in, CVars &out ); +long WrenchPromoGetMember( CVars in, CVars &out ); long market_calls(CVars in, CVars &out) { logfmt(logINFO, "market_calls()"); @@ -48,6 +49,9 @@ long market_calls(CVars in, CVars &out) { case WRENCHBOARD_PROMOADMIN_GETLIST: return WrenchPromoGetList(in, out); break; + case WRENCHBOARD_PROMOADMIN_GETMEMBER: + return WrenchPromoGetMember(in, out); + break; } } catch (bad_parameter) { @@ -57,6 +61,51 @@ long market_calls(CVars in, CVars &out) { return ret; } +long WrenchPromoGetMember( CVars in, CVars &out ) +{ + char vname[30]; + long ret = PHP_API_BAD_PARAM; + + logfmt( logINFO, "WrenchPromoGetList()" ); + out["result"] = "Yes i go to this back end"; + + try { + long admin_id = REQ_LONG(in, "promo_admin_id", 1, -1); + REQ_STRING (in, "admin_uid", 5, 120, "(.*)"); + REQ_STRING (in, "mebmer_uid", 5, 120, "(.*)"); + OPTIONAL( in, "loc" ) REQ_STRING (in, "loc", 3, 15, "(.*)"); + + + + const PGresult *res; + res = pgsql_query("SELECT count(id) FROM promo_member WHERE admin_id = %lu", admin_id); + out["sum_total_record"] = pgsql_num_rows(res); + + res = pgsql_query("SELECT * FROM promo_member" + " WHERE admin_id = %lu AND uis = '%s' ",admin_id,in["mebmer_uid"].c_str()); + + if (res != NULL && pgsql_num_rows(res) > 0) { + out["total_record"] = pgsql_num_rows(res); + + for (int i = 0, n = pgsql_num_rows(res); i < n; i++) { + mapf = pgsql_fetch_assoc(res, i); + if (f.empty()) continue; + CVars rec; + map_to_cvars(f, rec); + out = rec; + } + } + ret = PHP_API_OK; + out["status"] = "OK"; + } catch (bad_parameter) { + logfmt(logINFO, "ERROR CALL long WrenchPromoGetMember(CVars in, CVars &out)"); + } + + logfmt( logINFO, "/WrenchPromoGetMember()" ); + return 0; +} + + long WrenchPromoGetList( CVars in, CVars &out ) { char vname[30]; diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index 71c6d15a..d21584ce 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -482,6 +482,7 @@ const WRENCHBOARD_MARKET_PLAN01_START = 220001; const WRENCHBOARD_MARKET_PLAN01_NEXT1 = 220003; const WRENCHBOARD_PROMOADMIN_LOGIN = 220010; +const WRENCHBOARD_PROMOADMIN_GETMEMBER = 220013; const WRENCHBOARD_PROMOADMIN_GETLIST = 220014; const WRENCHBOARD_PROMOADMIN_ADDLIST = 220015; const WRENCHBOARD_MARKET_END = 229999; diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index 978fdbec..b18e0fda 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -43,6 +43,8 @@ $routes->post('/en/promo/api/v1/tasks', 'Promo::promoTask'); $routes->post('/en/promoadmin/api/v1/auth', 'Promo::promoAuth'); $routes->post('/en/promoadmin/api/v1/getlist', 'PromoAdmin::promoList'); $routes->post('/en/promoadmin/api/v1/list', 'PromoAdmin::promoAddRef'); +$routes->post('/en/promoadmin/api/v1/getmember', 'PromoAdmin::promoGetMember'); + diff --git a/www-api/app/Controllers/PromoAdmin.php b/www-api/app/Controllers/PromoAdmin.php index dfd441b6..1193d05f 100644 --- a/www-api/app/Controllers/PromoAdmin.php +++ b/www-api/app/Controllers/PromoAdmin.php @@ -29,5 +29,13 @@ class PromoAdmin extends BaseController return $this->respond( $this->summaryReturnData($in,$out), 200); } - + public function promoGetMember(){ + log_message('critical', "***** ***** promoGetMember::promoAddRef ****" ); + $raw_json = file_get_contents('php://input'); + $in = json_decode($raw_json, true); + $out = []; + $in["action"] = WRENCHBOARD_PROMOADMIN_GETMEMBER; + $ret = $this->wrenchboard->wrenchboard_api($in, $out); + return $this->respond( $this->summaryReturnData($in,$out), 200); + } } diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index 01d06879..0f914793 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -115,8 +115,6 @@ class ResultFormatter extends Model } public function processOutJson($in, $out) { - - // id AS coupon_id, ca.code, ca.amount, ca.added::date,ca.status switch ($in["action"]) {