Skip to content

Z
zhichan
Commit ea08e015 by 孙亚楠
Options

d

parent 8099682c
Showing with 33 additions and 3 deletions
xgg-saas-merchant/app/base/api/impl/h5/merchantApi.js
...@@ -26,9 +26,21 @@ class TestAPI extends APIBase { ...@@ -26,9 +26,21 @@ class TestAPI extends APIBase {
this.smsClient = system.getObject("util.smsClient"); this.smsClient = system.getObject("util.smsClient");
} }
doMerchantId(obj) {
if (!obj.merchant_id) {
return;
}
try {
obj.merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
} catch (e) {
console.log(e);
return;
}
}
//H5登录获取验证码 //H5登录获取验证码
async sendMobileCode(obj, obj1, req) { async sendMobileCode(obj, obj1, req) {
this.doMerchantId(obj);
let mobile = obj.mobile; let mobile = obj.mobile;
if (!mobile) { if (!mobile) {
return this.returnFail("请先填写手机号"); return this.returnFail("请先填写手机号");
...@@ -57,6 +69,7 @@ class TestAPI extends APIBase { ...@@ -57,6 +69,7 @@ class TestAPI extends APIBase {
// 登录接口 post // 登录接口 post
async login(obj, obj1, req) { async login(obj, obj1, req) {
this.doMerchantId(obj);
try { try {
if (!obj.mobile) { if (!obj.mobile) {
return this.returnFail("请填写手机号"); return this.returnFail("请填写手机号");
...@@ -77,7 +90,7 @@ class TestAPI extends APIBase { ...@@ -77,7 +90,7 @@ class TestAPI extends APIBase {
} }
let openID = "gtbh5_" + obj.mobile; let openID = "gtbh5_" + obj.mobile;
let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id)); let merchant_id = obj.merchant_id;
let params = { let params = {
saas_merchant_id: merchant_id, saas_merchant_id: merchant_id,
saas_id: null, saas_id: null,
...@@ -102,14 +115,16 @@ class TestAPI extends APIBase { ...@@ -102,14 +115,16 @@ class TestAPI extends APIBase {
//验证登录 //验证登录
async loginUser(obj) { async loginUser(obj) {
this.doMerchantId(obj);
// let merchant_id = decodeURIComponent(obj.merchant_id); // let merchant_id = decodeURIComponent(obj.merchant_id);
let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id)); // let merchant_id = system.decryption(decodeURIComponent(obj.merchant_id));
let user = await this.getLoginUser(merchant_id, obj.openid); let user = await this.getLoginUser(obj.merchant_id, obj.openid);
return this.returnSuccess(user); return this.returnSuccess(user);
} }
async uploadConfig(obj, obj1, req) { async uploadConfig(obj, obj1, req) {
this.doMerchantId(obj);
try { try {
let data = await this.uploadCtl.getOssConfig(); let data = await this.uploadCtl.getOssConfig();
return this.returnSuccess(data); return this.returnSuccess(data);
...@@ -121,6 +136,8 @@ class TestAPI extends APIBase { ...@@ -121,6 +136,8 @@ class TestAPI extends APIBase {
// 保存订单信息 // 保存订单信息
async saveOrder(obj, obj1, req) { async saveOrder(obj, obj1, req) {
this.doMerchantId(obj);
try { try {
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
...@@ -244,6 +261,7 @@ class TestAPI extends APIBase { ...@@ -244,6 +261,7 @@ class TestAPI extends APIBase {
} }
async myOrders(obj, obj1, req) { async myOrders(obj, obj1, req) {
this.doMerchantId(obj);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
if (!loginUser) { if (!loginUser) {
...@@ -285,6 +303,8 @@ class TestAPI extends APIBase { ...@@ -285,6 +303,8 @@ class TestAPI extends APIBase {
* @param {*} loginUser * @param {*} loginUser
*/ */
async orderInfo(obj, obj1, req) { async orderInfo(obj, obj1, req) {
this.doMerchantId(obj);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
...@@ -305,6 +325,8 @@ class TestAPI extends APIBase { ...@@ -305,6 +325,8 @@ class TestAPI extends APIBase {
} }
async idNoValid(obj, obj1, req) { async idNoValid(obj, obj1, req) {
this.doMerchantId(obj);
try { try {
let idno = (obj.idno || "").trim(); let idno = (obj.idno || "").trim();
if (!idno) { if (!idno) {
...@@ -330,6 +352,8 @@ class TestAPI extends APIBase { ...@@ -330,6 +352,8 @@ class TestAPI extends APIBase {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async saasorderbusinessmenPage(params, pobj2, req) { async saasorderbusinessmenPage(params, pobj2, req) {
this.doMerchantId(params);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(params); let loginUser = await this.loginUser(params);
...@@ -350,6 +374,8 @@ class TestAPI extends APIBase { ...@@ -350,6 +374,8 @@ class TestAPI extends APIBase {
* @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>} * @returns {Promise<{msg: string, data: (*|null), bizmsg: string, status: number}>}
*/ */
async saasTradeBusinessmenPage(obj, obj1, req) { async saasTradeBusinessmenPage(obj, obj1, req) {
this.doMerchantId(obj);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
obj.merchant_app_user_id = loginUser.data.id; obj.merchant_app_user_id = loginUser.data.id;
...@@ -390,6 +416,8 @@ class TestAPI extends APIBase { ...@@ -390,6 +416,8 @@ class TestAPI extends APIBase {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async invoiceBycreditCode(obj, obj1, req) { async invoiceBycreditCode(obj, obj1, req) {
this.doMerchantId(obj);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
obj.merchant_app_user_id = loginUser.data.id; obj.merchant_app_user_id = loginUser.data.id;
...@@ -432,6 +460,8 @@ class TestAPI extends APIBase { ...@@ -432,6 +460,8 @@ class TestAPI extends APIBase {
* @returns {Promise<void>} * @returns {Promise<void>}
*/ */
async sendBankMobileCode(obj, obj1, req) { async sendBankMobileCode(obj, obj1, req) {
this.doMerchantId(obj);
// TODO this.loginUser(); // TODO this.loginUser();
let loginUser = await this.loginUser(obj); let loginUser = await this.loginUser(obj);
let mobile = obj.mobile; let mobile = obj.mobile;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment