Skip to content

Z
zhichan
Commit d05832ff by 宋毅
Options

tj

parent 7becd053
Showing with 106 additions and 182 deletions
brg-user-center/app/base/api/api.base.js
......@@ -87,20 +87,19 @@ class APIBase {
const element = result[tKey];
if (element) {
if (tKey != "data") {
if (tKey != "status") {
newResult.Response[newTKey] = typeof element === 'string' ? element : JSON.stringify(element);
}
else {
newResult.Response[newTKey] = Number(element);
if (typeof element === 'string' || typeof element === "number" || element instanceof Date || !element) {
newResult.Response[newTKey] = element;
} else {
newResult.Response[newTKey] = JSON.stringify(element);
}
} else {
if (typeof element === 'string') {
if (typeof element === 'string' || typeof element === "number" || element instanceof Date || !element) {
newResult.Response[instanceSet] = element;
} else if (element instanceof Array) {
newResult.Response[instanceSet] = [];
for (let h = 0; h < element.length; h++) {
const arrayElement = element[h];
if (typeof arrayElement === 'string') {
if (typeof arrayElement === 'string' || typeof arrayElement === "number" || arrayElement instanceof Date || !arrayElement) {
newResult.Response[instanceSet].push(arrayElement);
} else if (arrayElement instanceof Array) {
newResult.Response[instanceSet].push(JSON.stringify(arrayElement));
......@@ -111,7 +110,11 @@ class APIBase {
const arrayKey = arrayKeys[g];
const newArrayKey = await self.InitialToUpperMulti(self, arrayKey);
const tmpArrayKeyData = arrayElement[arrayKey];
arrayItem[newArrayKey] = typeof tmpArrayKeyData === 'string' || tmpArrayKeyData instanceof Date ? tmpArrayKeyData : JSON.stringify(tmpArrayKeyData);
if (typeof tmpArrayKeyData === 'string' || typeof tmpArrayKeyData === "number" || tmpArrayKeyData instanceof Date || !tmpArrayKeyData) {
arrayItem[newArrayKey] = tmpArrayKeyData;
} else {
arrayItem[newArrayKey] = JSON.stringify(tmpArrayKeyData);
}
}
newResult.Response[instanceSet].push(arrayItem);
}
......@@ -123,10 +126,10 @@ class APIBase {
const dataKey = dataKeys[j];
const newDataKey = await self.InitialToUpperMulti(self, dataKey);
const dataElement = element[dataKey];
if (dataElement) {
newResult.Response[instanceSet][newDataKey] = typeof dataElement === 'string' ? dataElement : JSON.stringify(dataElement);
if (typeof dataElement === 'string' || typeof dataElement === "number" || dataElement instanceof Date || !dataElement) {
newResult.Response[instanceSet][newDataKey] = dataElement;
} else {
newResult.Response[instanceSet][newDataKey] = "";
newResult.Response[instanceSet][newDataKey] = JSON.stringify(dataElement);
}
}
}
......
brg-user-center/app/base/db/dao.base.js
......@@ -96,7 +96,7 @@ class Dao {
qc.where = {};
if (search) {
Object.keys(search).forEach(k => {
console.log(search[k], ":search[k]search[k]search[k]");
// console.log(search[k], ":search[k]search[k]search[k]");
if (search[k] && search[k] != 'undefined' && search[k] != "") {
if ((k.indexOf("Date") >= 0 || k.indexOf("_at") >= 0)) {
if (search[k] != "" && search[k]) {
......@@ -139,8 +139,6 @@ class Dao {
if (attributesObj && attributesObj.length > 0) {
qc.attributes = attributesObj;
}
console.log("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm");
console.log(qc);
return qc;
}
async findAndCountAll(qobj, t) {
......
brg-user-center/app/base/db/impl/common/connection.js
......@@ -18,15 +18,10 @@ class DbFactory {
async initModels() {
var self = this;
var modelpath = path.normalize(path.join(__dirname, '../..')) + "/models/";
console.log("modelpath=====================================================");
console.log(modelpath);
var models = glob.sync(modelpath + "/**/*.js");
console.log(models.length);
models.forEach(function (m) {
console.log(m);
self.db.import(m);
});
console.log("init models....");
}
async initRelations() {
/**
......
brg-user-center/app/base/db/impl/need/needInfoDao.js
......@@ -11,8 +11,6 @@ class NeedInfoDao extends Dao {
sql += "where xp.path_code=:path_code and xp.region_id=:region_id";
try {
var list = await this.customQuery(sql, obj);
console.log(list);
console.log(list[0]);
var rtn = {};
if (list && list.length > 0) {
rtn.servicer_code = list[0].servicer_code;
......@@ -45,7 +43,6 @@ class NeedInfoDao extends Dao {
params.region_name = region_name;
}
var sql = "select * from v_service_allot_business" + (whereSql ? " where " + whereSql : "");
// console.log('-------------------' + sql);
var result = await this.customQuery(sql, params);
return result
}
......
brg-user-center/app/base/db/impl/order/orderInfoDao.js
......@@ -6,24 +6,24 @@ class OrderInfoDao extends Dao{
}
//获取订单列表
async getOrderList(ab){
var pagesize = ab.pagesize? Number(ab.pagesize) : 10;
var currentpage = ab.currentpage? Number(ab.currentpage) : 1;
var pagesize = ab.Pagesize? Number(ab.Pagesize) : 10;
var currentpage = ab.Currentpage? Number(ab.Currentpage) : 1;
var offset = pagesize * (currentpage-1);
var sortType="desc";
if(ab.sortType && ab.sortType=="asc" ){//排序方式：desc ase
if(ab.SortType && ab.SortType=="asc" ){//排序方式：desc ase
sortType = "asc";
}
var sortItem = "updated_at";
if(ab.sortItem && ab.sortItem == "payTime"){
if(ab.SortItem && ab.SortItem == "payTime"){
sortItem="pay_time";
}
if(ab.sortItem && ab.sortItem == "endTime"){
if(ab.SortItem && ab.SortItem == "endTime"){
sortItem="end_time";
}
var params = {
product_type:ab.productType,
user_id:ab.user_id,
product_type:ab.ProductType,
user_id:ab.UserId,
limit:pagesize,
offset:offset
};
......@@ -31,34 +31,34 @@ class OrderInfoDao extends Dao{
var sql = "SELECT order_num,delivery_status,updated_at,order_snapshot "+
" from v_order_oproduct_odelivery where product_type=:product_type and user_id=:user_id";
if(ab.productType=="/ic/gsreg/"){//公司注册筛选条件
if(ab.companyProperties){//公司性质
if(ab.ProductType=="/ic/gsreg/"){//公司注册筛选条件
if(ab.CompanyProperties){//公司性质
sql = sql +" and order_snapshot->'$.companyProperties' =:companyProperties ";
sqlcount = sqlcount +" and order_snapshot->'$.companyProperties' =:companyProperties ";
params["companyProperties"]=ab.companyProperties;
params["companyProperties"]=ab.CompanyProperties;
}
if(ab.taxpayerType){//纳税人类型
if(ab.TaxpayerType){//纳税人类型
sql = sql +" and order_snapshot->'$.taxpayerType' =:taxpayerType ";
sqlcount = sqlcount +" and order_snapshot->'$.taxpayerType' =:taxpayerType ";
params["taxpayerType"]=ab.taxpayerType;
params["taxpayerType"]=ab.TaxpayerType;
}
}
if(ab.productType=="/ic/cpreg/"){//云上园区注册
if(ab.taxpayerType){//纳税人类型
if(ab.ProductType=="/ic/cpreg/"){//云上园区注册
if(ab.TaxpayerType){//纳税人类型
sql = sql +" and order_snapshot->'$.taxpayerType' =:taxpayerType ";
sqlcount = sqlcount +" and order_snapshot->'$.taxpayerType' =:taxpayerType ";
params["taxpayerType"]=ab.taxpayerType;
params["taxpayerType"]=ab.TaxpayerType;
}
if(ab.registeredType){//注册类型
if(ab.RegisteredType){//注册类型
sql = sql +" and order_snapshot->'$.registeredType' =:registeredType ";
sqlcount = sqlcount +" and order_snapshot->'$.registeredType' =:registeredType ";
params["registeredType"]=ab.registeredType;
params["registeredType"]=ab.RegisteredType;
}
}
if(ab.deliveryStatus){//当前状态
if(ab.DeliveryStatus){//当前状态
sql = sql +" and delivery_status =:delivery_status ";
sqlcount = sqlcount +" and delivery_status =:delivery_status ";
params["delivery_status"]=ab.deliveryStatus;
params["delivery_status"]=ab.DeliveryStatus;
}
sql = sql +" order by "+sortItem+" "+sortType+" limit :limit offset :offset ";
var list = await this.customQuery(sql,params);
......@@ -69,23 +69,23 @@ class OrderInfoDao extends Dao{
}
//获取资质订单列表
async getQcOrderList(ab){
var pagesize = ab.pagesize? Number(ab.pagesize) : 10;
var currentpage = ab.currentpage? Number(ab.currentpage) : 1;
var pagesize = ab.Pagesize? Number(ab.Pagesize) : 10;
var currentpage = ab.Currentpage? Number(ab.Currentpage) : 1;
var offset = pagesize * (currentpage-1);
var sortType="desc";
if(ab.sortType && ab.sortType=="asc" ){//排序方式：desc ase
if(ab.SortType && ab.SortType=="asc" ){//排序方式：desc ase
sortType = "asc";
}
var sortItem = "updated_at";
if(ab.sortItem && ab.sortItem == "payTime"){
if(ab.SortItem && ab.SortItem == "payTime"){
sortItem="pay_time";
}
if(ab.sortItem && ab.sortItem == "endTime"){
if(ab.SortItem && ab.SortItem == "endTime"){
sortItem="end_time";
}
var params = {
user_id:ab.user_id,
user_id:ab.UserId,
limit:pagesize,
offset:offset
};
......@@ -93,25 +93,25 @@ class OrderInfoDao extends Dao{
var sql = "SELECT product_type,order_num,delivery_status,updated_at,order_snapshot,deliver_content "+
" from v_order_oproduct_odelivery where (product_type = '/qcfw/icp/' or product_type = '/qcfw/edi/') and user_id=:user_id";
if(ab.productType=="/qcfw/icp/"){//icp
if(ab.ProductType=="/qcfw/icp/"){//icp
sql = sql +" and product_type = :productType ";
sqlcount = sqlcount +" and product_type = :productType ";
params["productType"]=ab.productType;
params["productType"]=ab.ProductType;
}
if(ab.productType=="/qcfw/edi/"){//edi
if(ab.ProductType=="/qcfw/edi/"){//edi
sql = sql +" and product_type = :productType ";
sqlcount = sqlcount +" and product_type = :productType ";
params["productType"]=ab.productType;
params["productType"]=ab.ProductType;
}
if(ab.companyName){//公司名称
if(ab.CompanyName){//公司名称
sql = sql +" and deliver_content->'$.proposerInfo' is not null and deliver_content->'$.proposerInfo.businessLicense' is not null and deliver_content->'$.proposerInfo.businessLicense.name' like :companyName ";
sqlcount = sqlcount +" and deliver_content->'$.proposerInfo' is not null and deliver_content->'$.proposerInfo.businessLicense' is not null and deliver_content->'$.proposerInfo.businessLicense.name' like :companyName ";
params["companyName"]="%"+ab.companyName+"%";
params["companyName"]="%"+ab.CompanyName+"%";
}
if(ab.deliveryStatus){//当前状态
if(ab.DeliveryStatus){//当前状态
sql = sql +" and delivery_status =:delivery_status ";
sqlcount = sqlcount +" and delivery_status =:delivery_status ";
params["delivery_status"]=ab.deliveryStatus;
params["delivery_status"]=ab.DeliveryStatus;
}
sql = sql +" order by "+sortItem+" "+sortType+" limit :limit offset :offset ";
var list = await this.customQuery(sql,params);
......
brg-user-center/app/base/db/impl/order/orderProductDao.js
......@@ -28,13 +28,13 @@ class OrderProductDao extends Dao {
async entTimeCreate(obj, t) {
if (obj.created_at && obj.time_span && obj.time_unit) {
if (obj.time_unit == "y") {
obj.end_time = obj.created_at.setYear(obj.created_at.getYear() + Number(obj.time_span))
obj.end_time = obj.created_at.setFullYear(obj.created_at.getFullYear() + Number(obj.time_span))
}
if (obj.time_unit == "m") {
obj.end_time = obj.created_at.setMonth(obj.created_at.getMonth() + Number(obj.time_span))
}
if (obj.time_unit == "d") {
obj.end_time = obj.created_at.setYear(obj.created_at.getYear() + Number(obj.time_span))
obj.end_time = obj.created_at.setDate(obj.created_at.getDate() + Number(obj.time_span))
}
}
return await this.create(obj, t);
......
brg-user-center/app/base/service/impl/common/txPushLogSve.js
......@@ -71,6 +71,7 @@ class TxPushLogService extends ServiceBase {
if (!pobj.interface.para.resourceId) {
return self.returnTX(-1, "cgateway", "参数错误", null)
}
}
async queryResources(pobj){
......
brg-user-center/app/base/service/impl/order/applyInfoSve.js
......@@ -19,23 +19,23 @@ class ApplyInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.userId) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.applyType) {
if (!ab.ApplyType) {
return system.getResultFail(-103, "申请主体类型不能为空");
}
var limit = ab.pageSize ? Number(ab.pageSize) : 10;
var offset = ab.currentPage ? (Number(ab.currentPage) - 1) * limit : 0
var countObj = { apply_type: ab.applyType, user_id: ab.userId };
var whereObj = { apply_type: ab.applyType, user_id: ab.userId };
if (ab.applyName) {
whereObj["apply_name"] = { [this.db.Op.like]: "%" + ab.applyName + "%" };
countObj["apply_name"] = { [this.db.Op.like]: "%" + ab.applyName + "%" };
var limit = ab.PageSize ? Number(ab.PageSize) : 10;
var offset = ab.CurrentPage ? (Number(ab.CurrentPage) - 1) * limit : 0
var countObj = { apply_type: ab.ApplyType, user_id: ab.UserId };
var whereObj = { apply_type: ab.ApplyType, user_id: ab.UserId };
if (ab.ApplyName) {
whereObj["apply_name"] = { [this.db.Op.like]: "%" + ab.ApplyName + "%" };
countObj["apply_name"] = { [this.db.Op.like]: "%" + ab.ApplyName + "%" };
}
if (ab.domicile) {
whereObj["domicile"] = { [this.db.Op.like]: "%" + ab.domicile + "%" };
countObj["domicile"] = { [this.db.Op.like]: "%" + ab.domicile + "%" };
if (ab.Domicile) {
whereObj["domicile"] = { [this.db.Op.like]: "%" + ab.Domicile + "%" };
countObj["domicile"] = { [this.db.Op.like]: "%" + ab.Domicile + "%" };
}
var count = await this.dao.findCount({ where: countObj });
var list = await this.dao.model.findAll({
......@@ -68,14 +68,14 @@ class ApplyInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.userId) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.creditCode) {
if (!ab.CreditCode) {
return system.getResultFail(-103, "社会统一信用代码不能为空");
}
var applyinfo = await this.dao.model.findOne({
where: { user_id: ab.userId, credit_code: ab.creditCode },
where: { user_id: ab.UserId, credit_code: ab.CreditCode },
attributes: [
"user_id",
"apply_name",
......@@ -94,7 +94,7 @@ class ApplyInfoService extends ServiceBase {
if (!applyinfo || !applyinfo.credit_code) {
return system.getResultFail(-300, "未知申请实体信息");
}
var list = await this.orderProductDao.findByCompanyAndUser(applyinfo.credit_code, ab.userId);
var list = await this.orderProductDao.findByCompanyAndUser(applyinfo.credit_code, ab.UserId);
// var list = await this.dao.getPaidSolutionByApplyInfo(applyinfo);
var result = { applyInfo: applyinfo, productList: list };
return system.getResultSuccess(result);
......@@ -107,22 +107,22 @@ class ApplyInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.userId) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.productTypeOne) {//产品大类
if (!ab.ProductTypeOne) {//产品大类
return system.getResultFail(-103, "产品大类编码不能为空");
}
var productTypeOne = "/" + ab.productTypeOne + "/"
var productTypeOne = "/" + ab.ProductTypeOne + "/"
// { [this.db.Op.like]: productTypeOne }
var companyCount = await this.dao.findCount({ where: { apply_type: 1, user_id: ab.userId } });//公司数量
var selfEmployedPersonCount = await this.dao.findCount({ where: { apply_type: 2, user_id: ab.userId } });//个体户数量
var waitConfirmCount = await this.needInfoDao.findCount({ where: { status: 3, user_id: ab.userId, consult_type: { [this.db.Op.like]: productTypeOne } } });//待确认方案数量
var waitReceiveFileOrderCount = await this.orderDeliveryDao.findOverviewCount(13, ab.userId, ab.productTypeOne);//待收文件数量
var companyCount = await this.dao.findCount({ where: { apply_type: 1, user_id: ab.UserId } });//公司数量
var selfEmployedPersonCount = await this.dao.findCount({ where: { apply_type: 2, user_id: ab.UserId } });//个体户数量
var waitConfirmCount = await this.needInfoDao.findCount({ where: { status: 3, user_id: ab.UserId, consult_type: { [this.db.Op.like]: productTypeOne } } });//待确认方案数量
var waitReceiveFileOrderCount = await this.orderDeliveryDao.findOverviewCount(13, ab.UserId, ab.ProductTypeOne);//待收文件数量
// var unpaidCount = await this.orderInfoDao.findCount({where:{order_status:0}});//待支付订单数量
if(ab.productTypeOne == "qcfw"){//资质证照
var icpCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.userId);//icp数量
var ediCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.userId);//edi数量
if(ab.ProductTypeOne == "qcfw"){//资质证照
var icpCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.UserId);//icp数量
var ediCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.UserId);//edi数量
var resultObj = {
icpCount: icpCount, waitConfirmCount: waitConfirmCount, ediCount: ediCount,
waitReceiveFileOrderCount: waitReceiveFileOrderCount
......
brg-user-center/app/base/service/impl/order/orderDeliverySve.js
......@@ -69,13 +69,13 @@ class OrderDeliveryService extends ServiceBase {
return system.getResultFail(-100,"参数错误");
}
var ab = pobj.actionBody;
if(!ab.userId){
if(!ab.UserId){
return system.getResultFail(-101,"用户id不能为空");
}
if(!ab.status){
if(!ab.Status){
return system.getResultFail(-102,"订单状态不能为空");
}
var list = await this.dao.getOrderListByStatus(ab.userId,ab.status);
var list = await this.dao.getOrderListByStatus(ab.UserId,ab.Status);
return system.getResultSuccess(list);
}
......
brg-user-center/app/base/service/impl/order/orderInfoSve.js
......@@ -17,14 +17,14 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.orderNum) {
if (!ab.OrderNum) {
return system.getResultFail(-101, "订单号不能为空");
}
if (!ab.user_id) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
var queryParam = {
where: { order_num: ab.orderNum, user_id: ab.user_id },
where: { order_num: ab.OrderNum, user_id: ab.UserId },
attributes: [
"order_num",
"tx_orders_num", //腾讯主订单号
......@@ -46,7 +46,7 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-300, "未知订单信息");
}
var deliveryParams = {
where: { order_num: ab.orderNum },
where: { order_num: ab.OrderNum },
attributes: ["deliver_content", "created_at", "updated_at", "delivery_status", "delivery_status_name"],
raw: true
};
......@@ -60,10 +60,10 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.user_id) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.productType) {
if (!ab.ProductType) {
return system.getResultFail(-103, "产品类型不能为空");
}
var result = await this.dao.getOrderList(ab);
......@@ -76,7 +76,7 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.user_id) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
var result = await this.dao.getQcOrderList(ab);
......@@ -312,13 +312,13 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-101, "txorder is error");
}
var txorderdetail = txorder.data.deals[0];
console.log(txorderdetail.goodsDetail);
console.log(txorderdetail.goodsDetail,"....txorderdetail.goodsDetail.....1");
var self = this;
var corder = await self.db.transaction(async function (t) {
var oldorder = await self.findOne({})
//创建订单
var txorderdetail = txorder.data.deals[0];
console.log(txorderdetail.goodsDetail);
console.log(txorderdetail.goodsDetail,"....txorderdetail.goodsDetail...2");
var orderobj = {
tx_orders_num: pobj.actionBody.interface.para.bigDealId,
order_num: pobj.actionBody.interface.para.dealName,
......@@ -434,7 +434,7 @@ class OrderInfoService extends ServiceBase {
if (!pobj.actionBody.registeredType) {
return system.getResultFail(-101, "registeredType is empty");
}
priceName = pobj.actionBody.companyProperties;
priceName = pobj.actionBody.registeredType;
}
//刻章服务
if (pobj.actionBody.pathCode == "/ic/kzfw/") {
......@@ -635,70 +635,8 @@ class OrderInfoService extends ServiceBase {
"url": "https://buy.cloud.tencent.com/order/check",
"param": so
}
console.log(so);
return system.getResultSuccess(robj);
}
// //创建申请实体
// async createApplyInfo(orderNum) {
// try {
// var orderProduct = await this.orderProductDao.model.findOne({
// where: { order_num: orderNum },
// raw: true
// });
// if (orderProduct && orderProduct.order_snapshot && orderProduct.user_id) {
// var order_snapshot = orderProduct.order_snapshot;
// if (order_snapshot.creditCode) {
// var applyinfo = await this.applyInfoDao.model.findOne({
// where: { credit_code: order_snapshot.creditCode, user_id: orderProduct.user_id },
// raw: true
// });
// if (!applyinfo || !applyinfo.id) {//创建申请实体
// var newObj = {
// servicer_code: orderProduct.servicer_code,
// servicer_name: orderProduct.servicer_name,
// user_id: orderProduct.user_id,
// user_name: orderProduct.user_name,
// apply_name: order_snapshot.companyName,
// credit_code: order_snapshot.creditCode,
// apply_type: order_snapshot.companyType == "个体工商户" ? 2 : 1,
// operator: order_snapshot.shareholderName,
// regist_capital: order_snapshot.registeredCapital,
// business_term_start: order_snapshot.businessTerm,
// establish_time: order_snapshot.establishedTime,
// business_term_end: order_snapshot.businessTerm,
// domicile: order_snapshot.residenceAddress,
// ent_type: order_snapshot.companyType,
// business_scope: order_snapshot.businessScope
// };
// applyinfo = await this.applyInfoDao.create(newObj);
// } else {//更新实体信息
// var updateObj = {
// apply_name: order_snapshot.companyName,
// credit_code: order_snapshot.creditCode,
// apply_type: order_snapshot.companyType == "个体工商户" ? 2 : 1,
// operator: order_snapshot.shareholderName,
// regist_capital: order_snapshot.registeredCapital,
// business_term_start: order_snapshot.businessTerm,
// establish_time: order_snapshot.establishedTime,
// business_term_end: order_snapshot.businessTerm,
// domicile: order_snapshot.residenceAddress,
// ent_type: order_snapshot.companyType,
// business_scope: order_snapshot.businessScope
// };
// await this.applyInfoDao.dao.update(updateObj, { where: { id: applyinfo.id } });//更新主体信息
// }
// }
// }
// } catch (e) {
// console.log(e,"创建申请实体异常");
// }
// }
}
module.exports = OrderInfoService;
......
brg-user-center/app/base/service/impl/order/qualificationCertificateSve.js
......@@ -18,22 +18,22 @@ class QualificationCertificateService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.userId) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.licenseType) {
if (!ab.LicenseType) {
return system.getResultFail(-103, "证照类型不能为空");
}
var limit = ab.pageSize ? Number(ab.pageSize) : 10;
var offset = ab.currentPage ? (Number(ab.currentPage) - 1) * limit : 0
var countObj = { license_type: ab.licenseType, user_id: ab.userId };
var whereObj = { license_type: ab.licenseType, user_id: ab.userId };
if (ab.companyName) {
whereObj["company_name"] = { [this.db.Op.like]: "%" + ab.companyName + "%" };
countObj["company_name"] = { [this.db.Op.like]: "%" + ab.companyName + "%" };
var limit = ab.PageSize ? Number(ab.PageSize) : 10;
var offset = ab.CurrentPage ? (Number(ab.CurrentPage) - 1) * limit : 0
var countObj = { license_type: ab.LicenseType, user_id: ab.UserId };
var whereObj = { license_type: ab.LicenseType, user_id: ab.UserId };
if (ab.CompanyName) {
whereObj["company_name"] = { [this.db.Op.like]: "%" + ab.CompanyName + "%" };
countObj["company_name"] = { [this.db.Op.like]: "%" + ab.CompanyName + "%" };
}
var sortType = "desc";
if(ab.sortType && ab.sortType=="asc"){
if(ab.SortType && ab.SortType=="asc"){
sortType = "asc";
}
var count = await this.dao.findCount({ where: countObj });
......@@ -73,15 +73,15 @@ class QualificationCertificateService extends ServiceBase {
return system.getResultFail(-100, "参数错误");
}
var ab = pobj.actionBody;
if (!ab.userId) {
if (!ab.UserId) {
return system.getResultFail(-102, "用户id不能为空");
}
if (!ab.certificateNo) {
if (!ab.CertificateNo) {
return system.getResultFail(-103, "证书编号不能为空");
}
//获取资质证照信息
var qualificationCertificate = await this.dao.model.findOne({
where: { user_id: ab.userId, certificate_no: ab.certificateNo },
where: { user_id: ab.UserId, certificate_no: ab.CertificateNo },
attributes: [
"user_id",
"certificate_no",
......@@ -102,7 +102,7 @@ class QualificationCertificateService extends ServiceBase {
}
var result = { qualificationCertificate: qualificationCertificate, businessLicenseInfo: null, annualReportList:null};
//获取营业执照信息及腾讯订单号
var businessLicenseInfo = await this.orderDeliveryDao.findByCertificateNoAndUser(qualificationCertificate.certificate_no, ab.userId);
var businessLicenseInfo = await this.orderDeliveryDao.findByCertificateNoAndUser(qualificationCertificate.certificate_no, ab.UserId);
if(businessLicenseInfo && businessLicenseInfo.length>0){
result.businessLicenseInfo = businessLicenseInfo[0];
}
......
brg-user-center/app/base/system.js
......@@ -217,7 +217,7 @@ class System {
try {
ClassObj = require(objabspath);
} catch (e) {
// console.log(e)
console.log(e.stack, "......getObject......");
let fname = objsettings[packageName + "base"];
ClassObj = require(fname);
}
......@@ -225,9 +225,6 @@ class System {
let modelname = filename.substring(0, filename.lastIndexOf("Dao"))
return System.register(objabspath, ClassObj, modelname);
}
if (ClassObj.name.indexOf("Ctl") >= 0) {
console.log(ClassObj.name);
}
return System.register(objabspath, ClassObj, groupName, filename);
}
}
......
brg-user-center/app/base/utils/execClient.js
var childproc = require('child_process');
const system = require("../system");
const util = require('util');
const exec = util.promisify(require('child_process').exec);
const settings = require("../../../app/config/settings");
......@@ -107,7 +108,6 @@ class ExecClient {
*/
async execGet(params, url, headData) {
let cmd = this.FetchGetCmd(params, url, headData);
console.log(cmd);
var result = await this.exec(cmd);
return result;
}
......@@ -177,7 +177,6 @@ class ExecClient {
FetchGetCmd(params, url, headData) {
var cmd = this.cmdGetPattern.replace(
/\{data\}/g, params).replace(/\{url\}/g, url);
console.log(cmd);
return cmd;
}
FetchPostCmd(params, url, ContentType, headData) {
......
brg-user-center/app/config/routes/doc.js
......@@ -20,7 +20,6 @@ module.exports = function (app) {
console.log(err);
res.send("文件不存在！");
} else {
console.log(data);
str = marked(data.toString());
res.render('apidoc', { str });
}
......@@ -35,7 +34,6 @@ module.exports = function (app) {
console.log(err);
res.send("文件不存在！");
} else {
console.log(data);
str = marked(data.toString());
res.render('apidoc', { str });
}
......@@ -66,9 +64,7 @@ module.exports = function (app) {
console.log(err);
res.send("文件不存在！");
} else {
console.log(data);
str = marked(data.toString());
console.log(str);
res.render('apidoc', { str });
}
});
......
brg-user-center/app/front/entry/public/apidoc/customer/order.md
This source diff could not be displayed because it is too large. You can view the blob instead.
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