diff --git a/ais-structure/src/modules/helper/connection.js b/ais-structure/src/modules/helper/connection.js index e72c82f..4822d56 100644 --- a/ais-structure/src/modules/helper/connection.js +++ b/ais-structure/src/modules/helper/connection.js @@ -508,7 +508,7 @@ function arrayUrl(arrUrl,url,filter,fields,freeSpace,arrData) } if(loopUrl != "") - arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+")"+fields); + arrUrl.push(url+"?filter=("+filter+"(|"+loopUrl+"))"+fields); return arrUrl; } diff --git a/ais-structure/src/modules/membercard/postMembership.ctrl.js b/ais-structure/src/modules/membercard/postMembership.ctrl.js index 0f9c774..a5175d2 100644 --- a/ais-structure/src/modules/membercard/postMembership.ctrl.js +++ b/ais-structure/src/modules/membercard/postMembership.ctrl.js @@ -34,7 +34,6 @@ exports.postMembership = async function (req, res, next){ if(err.length > 0) { log.addErrorSummary(req,req.body.clientName, postMethod+"_"+getCmd, "null", "Fail"); - // console.log(err); var response = responseMsg.error(req, getCmd, 40300); }else { @@ -99,7 +98,6 @@ exports.postMembership = async function (req, res, next){ log.addSuccessSummary(req,d01,getMethod+"_"+sendMemberCardCmd,resultObj.resultCode,resultObj.resultDescription); var todo = await checkOwnerCard(resultObj.resultData,objectData); - // console.log(todo); if(todo){ var getCustomer = await getCustomerD01(req, objDataGetCustomer); var response = await getCustomerHandler(req, getCustomer, resultObj, objDataMembership); @@ -145,7 +143,6 @@ exports.postMembership = async function (req, res, next){ function validator(req, api) { - // console.log(req.body); var list = []; list.push([true, "body", "commandId", "int"]); list.push([true, "body", "clientName", "string"]); @@ -207,7 +204,6 @@ async function postMemberCardD01(req, data){ isDirect : false }; - // console.log(data) const resultCustomer = await connection.requestJsonToD01(req,data.reqMembership, data.cmd, data.method, data.filter); var resultObj = resultCustomer.response @@ -232,7 +228,6 @@ async function postMemberCardD01(req, data){ async function getCustomerHandler(req, getCustomer, getMemberCard, objDataMembership){ - // console.log(getCustomer.response) if(!getCustomer.isErr){ //if get data exits post membercard if(!getCustomer.isDataNotFound){ @@ -267,7 +262,14 @@ async function getCustomerHandler(req, getCustomer, getMemberCard, objDataMember return result; } - var getResult = await getResultTodo(req, getMemberCard, objDataMembership); + if(!getMemberCard.resultData){ // get membercard data not found do post + var getResult = { + doPost : true, + doNothing : false + } + } else { // get data exits check todo + var getResult = await getResultTodo(req, getMemberCard, objDataMembership); + } if(getResult.doNothing){ var response = responseMsg.success(req,getCmd) @@ -332,7 +334,6 @@ async function checkOwnerCard(resultData,objectData){ } for(var i = 0 ; i < resultData.length ; i++){ - // console.log(resultData[i]) if(resultData[i].cardOwnerIdList.includes(customerId)){ dataCount.userOwnCardCount = dataCount.userOwnCardCount++; } @@ -344,7 +345,6 @@ async function checkOwnerCard(resultData,objectData){ return dataCount; }; var count = await countf(resultData); - // console.log(count); if(count.userOwnCardCount < userMembershipCardLimit && count.cardOwnUserCount < userOwnerCardLimit){ -- libgit2 0.21.2