Skip to content

Z
zhichan
Commit f3c8d8a8 by 王栋源
Options

wdy

parent feb1d83b
Showing with 38 additions and 28 deletions
brg-user-center/app/base/api/api.base.js
...@@ -9,20 +9,21 @@ class APIBase { ...@@ -9,20 +9,21 @@ class APIBase {
this.userCenterAction = { this.userCenterAction = {
"GetOverviewInfoByUser": "getOverviewInfoByUser", "GetOverviewInfoByUser": "getOverviewInfoByUser",
"GetOrderList": "getOrderList", "GetOrderList": "getOrderList",
"GetQualificationCertificateOrderList": "getQcOrderList",
"GetQcOrderList": "getQcOrderList", "GetQcOrderList": "getQcOrderList",
"GetOrderDetail": "getOrderDetail", "GetOrderDetail": "getOrderDetail",
"GetApplyListByUserAndType": "getApplyListByUserAndType", "GetApplyListByUserAndType": "getApplyListByUserAndType",
"GetApplyAndSolutionInfo": "getApplyAndSolutionInfo", "GetApplyAndSolutionInfo": "getApplyAndSolutionInfo",
"SelPrice2TX": "selPrice2TX", "SelPrice2TX": "selPrice2TX",
"GetOverviewInfoByUser": "getOverviewInfoByUser", "GetOverviewInfoByUser": "getOverviewInfoByUser",
"SubmitGoodsinfo": "submitGoodsinfo", "SubmitGoodsInfo": "submitGoodsinfo",
"SubmitNeed": "needSubmit", "SubmitNeed": "needSubmit",
"GetNeedList": "needList", "GetNeedList": "needList",
"GetNeedDetail": "needDetail", "GetNeedDetail": "needDetail",
"GetOrderListByStatus": "getOrderListByStatus", "GetOrderListByStatus": "getOrderListByStatus",
"GetQualificationCertificateListByUserAndType": "getQualificationCertificateListByUserAndType", "GetQualificationCertificateListByUserAndType": "getQualificationCertificateListByUserAndType",
"GetQualificationCertificateDetail": "getQualificationCertificateDetail", "GetQualificationCertificateDetail": "getQualificationCertificateDetail",
"RefusalSolution": "refusalSolution", "RefuseSolution": "refusalSolution",
"SendVerificationCode": "sendVerificationCode", "SendVerificationCode": "sendVerificationCode",
"CheckBusinessNameList": "checkBusinessNameList", "CheckBusinessNameList": "checkBusinessNameList",
}; };
......
brg-user-center/app/base/api/impl/action/need.js
...@@ -28,15 +28,15 @@ class Need extends APIBase { ...@@ -28,15 +28,15 @@ class Need extends APIBase {
]; ];
var self = this; var self = this;
if (verificationCodeList.indexOf(action_type) > -1) { if (verificationCodeList.indexOf(action_type) > -1) {
if (!pobj.actionBody.ContactsMoblie) { if (!pobj.actionBody.ContactsMobile) {
opResult = system.getResult(null, "contactsMoblie参数错误"); opResult = system.getResult(null, "ContactsMobile参数错误");
return opResult; return opResult;
} }
if (!pobj.actionBody.VerificationCode) { if (!pobj.actionBody.VerificationCode) {
opResult = system.getResult(null, "verificationCode参数错误"); opResult = system.getResult(null, "verificationCode参数错误");
return opResult; return opResult;
} }
var v = await self.utilsMsgSendSve.getVerificationCode(pobj.actionBody.ContactsMoblie); var v = await self.utilsMsgSendSve.getVerificationCode(pobj.actionBody.ContactsMobile);
if (v != pobj.actionBody.VerificationCode) { if (v != pobj.actionBody.VerificationCode) {
opResult = system.getResult(null, "验证码错误"); opResult = system.getResult(null, "验证码错误");
return opResult; return opResult;
......
brg-user-center/app/base/db/impl/order/orderDeliveryDao.js
...@@ -31,7 +31,10 @@ class OrderDeliveryDao extends Dao{ ...@@ -31,7 +31,10 @@ class OrderDeliveryDao extends Dao{
userId:userId, userId:userId,
status:status status:status
}; };
var sql = "select * from v_order_oproduct_odelivery where deleted_at is null and delivery_status = :status "+ var sql = "select `order_num`,`tx_orders_num` as main_orders_num,`need_num`,`user_name`,`user_id`,"+
"`updated_at`,`total_sum`,`refund_sum`,`pay_time`,`order_status`,`order_status_name`,`servicer_code`,"+
"`servicer_name`,`product_type`,`product_type_name`,`order_snapshot`,`end_time`,`time_span`,`time_unit`,"+
"`region_id`,`region_name`,`delivery_status`,`delivery_status_name`,`deliver_content` from v_order_oproduct_odelivery where deleted_at is null and delivery_status = :status "+
" and user_id = :userId "; " and user_id = :userId ";
var list = await this.customQuery(sql, params); var list = await this.customQuery(sql, params);
return list; return list;
......
brg-user-center/app/base/db/models/need/needInfo.js
...@@ -6,7 +6,7 @@ module.exports = (db, DataTypes) => { ...@@ -6,7 +6,7 @@ module.exports = (db, DataTypes) => {
user_id: DataTypes.STRING(100), user_id: DataTypes.STRING(100),
user_name: DataTypes.STRING(100), //user_name 用户名称 user_name: DataTypes.STRING(100), //user_name 用户名称
contacts_name: DataTypes.STRING(20), //contacts_name 联系人姓名 contacts_name: DataTypes.STRING(20), //contacts_name 联系人姓名
contacts_moblie: DataTypes.STRING(20), //contacts_moblie 联系人电话 contacts_mobile: DataTypes.STRING(20), //contacts_mobile 联系人电话
region_id: DataTypes.STRING(100), //region_id 地区id region_id: DataTypes.STRING(100), //region_id 地区id
region_name: DataTypes.STRING(100), //region_name 地区名称 region_name: DataTypes.STRING(100), //region_name 地区名称
consult_type: DataTypes.STRING(100), //consult_type 需求类型（产品二类id） consult_type: DataTypes.STRING(100), //consult_type 需求类型（产品二类id）
......
brg-user-center/app/base/service/impl/need/needInfoSve.js
...@@ -50,8 +50,8 @@ class NeedInfoService extends ServiceBase { ...@@ -50,8 +50,8 @@ class NeedInfoService extends ServiceBase {
*/ */
//创建需求 //创建需求
async needSubmit(actionBody) { async needSubmit(actionBody) {
if (!actionBody.ContactsMoblie) { if (!actionBody.ContactsMobile) {
return system.getResultFail(-102, "contactsMoblie cannot be empty"); return system.getResultFail(-102, "ContactsMobile cannot be empty");
} }
if (!actionBody.RegionId) { if (!actionBody.RegionId) {
return system.getResultFail(-102, "regionId cannot be empty"); return system.getResultFail(-102, "regionId cannot be empty");
...@@ -86,7 +86,7 @@ class NeedInfoService extends ServiceBase { ...@@ -86,7 +86,7 @@ class NeedInfoService extends ServiceBase {
var datavalue = { var datavalue = {
need_num: need_num, need_num: need_num,
user_id: actionBody.UserId, user_id: actionBody.UserId,
contacts_moblie: actionBody.ContactsMoblie, contacts_mobile: actionBody.ContactsMobile,
contacts_name: actionBody.ContactsName || "", contacts_name: actionBody.ContactsName || "",
region_id: actionBody.RegionId, region_id: actionBody.RegionId,
region_name: actionBody.RegionName, region_name: actionBody.RegionName,
...@@ -96,7 +96,9 @@ class NeedInfoService extends ServiceBase { ...@@ -96,7 +96,9 @@ class NeedInfoService extends ServiceBase {
servicer_code: actionBody.ServicerCode, servicer_code: actionBody.ServicerCode,
servicer_name: actionBody.ServicerName, servicer_name: actionBody.ServicerName,
status: 1, status: 1,
user_name: actionBody.UserName user_name: actionBody.UserName,
email: actionBody.Email,
wechat_no: actionBody.WechatNo
} }
if (actionBody.CompanyName) { if (actionBody.CompanyName) {
datavalue.need_info = { datavalue.need_info = {
......
brg-user-center/app/base/service/impl/order/applyInfoSve.js
...@@ -121,10 +121,10 @@ class ApplyInfoService extends ServiceBase { ...@@ -121,10 +121,10 @@ class ApplyInfoService extends ServiceBase {
var waitReceiveFileOrderCount = await this.orderDeliveryDao.findOverviewCount(150, ab.UserId, ab.ProductTypeOne);//待收文件数量 var waitReceiveFileOrderCount = await this.orderDeliveryDao.findOverviewCount(150, ab.UserId, ab.ProductTypeOne);//待收文件数量
// var unpaidCount = await this.orderInfoDao.findCount({where:{order_status:0}});//待支付订单数量 // var unpaidCount = await this.orderInfoDao.findCount({where:{order_status:0}});//待支付订单数量
if(ab.ProductTypeOne == "qcfw"){//资质证照 if(ab.ProductTypeOne == "qcfw"){//资质证照
var icpCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.UserId);//icp数量 var internetContentProviderCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/icp/",ab.UserId);//icp数量
var ediCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.UserId);//edi数量 var electronicDataInterchangeCount = await this.orderInfoDao.findOrderCountByProductPathCode("/qcfw/edi/",ab.UserId);//edi数量
var resultObj = { var resultObj = {
icpCount: icpCount, waitConfirmCount: waitConfirmCount, ediCount: ediCount, internetContentProviderCount: internetContentProviderCount, waitConfirmCount: waitConfirmCount, electronicDataInterchangeCount: electronicDataInterchangeCount,
waitReceiveFileOrderCount: waitReceiveFileOrderCount waitReceiveFileOrderCount: waitReceiveFileOrderCount
}; };
return system.getResult(resultObj); return system.getResult(resultObj);
......
brg-user-center/app/base/service/impl/order/orderInfoSve.js
...@@ -31,7 +31,7 @@ class OrderInfoService extends ServiceBase { ...@@ -31,7 +31,7 @@ class OrderInfoService extends ServiceBase {
attributes: [ attributes: [
"pay_time", "pay_time",
"order_num", "order_num",
"tx_orders_num", //腾讯主订单号 ["tx_orders_num","main_orders_num"], //腾讯主订单号
"need_num", //需求号 "need_num", //需求号
"user_name", //用户名称 "user_name", //用户名称
"quantity", //订单数量 "quantity", //订单数量
...@@ -50,8 +50,8 @@ class OrderInfoService extends ServiceBase { ...@@ -50,8 +50,8 @@ class OrderInfoService extends ServiceBase {
return system.getResultFail(-300, "未知订单信息"); return system.getResultFail(-300, "未知订单信息");
} }
var relatedProductsList = []; var relatedProductsList = [];
if (orderinfo.tx_orders_num) { if (orderinfo.main_orders_num) {
relatedProductsList = await this.getRelatedProductsList(orderinfo.tx_orders_num, ab.UserId, ab.OrderNum); relatedProductsList = await this.getRelatedProductsList(orderinfo.main_orders_num, ab.UserId, ab.OrderNum);
} }
orderinfo["relatedProductsList"] = relatedProductsList; orderinfo["relatedProductsList"] = relatedProductsList;
var deliveryParams = { var deliveryParams = {
...@@ -236,7 +236,9 @@ class OrderInfoService extends ServiceBase { ...@@ -236,7 +236,9 @@ class OrderInfoService extends ServiceBase {
order_num: pobj.actionBody.interface.para.dealName, order_num: pobj.actionBody.interface.para.dealName,
user_id: pobj.actionBody.interface.para.uin, user_id: pobj.actionBody.interface.para.uin,
delivery_status: 1, delivery_status: 1,
user_name: txorderdetail.goodsDetail.formInfo.userName user_name: txorderdetail.goodsDetail.formInfo.userName,
email: txorderdetail.goodsDetail.formInfo.email || "",
wechat_no: txorderdetail.goodsDetail.formInfo.wechatNo || ""
} }
var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t); var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t);
var orderPayobj = { var orderPayobj = {
...@@ -280,7 +282,7 @@ class OrderInfoService extends ServiceBase { ...@@ -280,7 +282,7 @@ class OrderInfoService extends ServiceBase {
"regionId": txorderdetail.goodsDetail.formInfo.serviceCode, "regionId": txorderdetail.goodsDetail.formInfo.serviceCode,
"regionName": txorderdetail.goodsDetail.formInfo.serviceArea, "regionName": txorderdetail.goodsDetail.formInfo.serviceArea,
"contactsName": txorderdetail.goodsDetail.formInfo.contactsName, "contactsName": txorderdetail.goodsDetail.formInfo.contactsName,
"contactsMoblie": txorderdetail.goodsDetail.formInfo.contactsMoblie, "contactsMobile": txorderdetail.goodsDetail.formInfo.contactsMobile,
"productType": txorderdetail.goodsDetail.product.productType, "productType": txorderdetail.goodsDetail.product.productType,
"productTypeName": txorderdetail.goodsDetail.product.productTypeName, "productTypeName": txorderdetail.goodsDetail.product.productTypeName,
"txPriceCode": txorderdetail.goodsDetail.product.txPriceCode, "txPriceCode": txorderdetail.goodsDetail.product.txPriceCode,
...@@ -495,7 +497,9 @@ class OrderInfoService extends ServiceBase { ...@@ -495,7 +497,9 @@ class OrderInfoService extends ServiceBase {
order_num: pobj.actionBody.interface.para.dealName, order_num: pobj.actionBody.interface.para.dealName,
user_id: pobj.actionBody.interface.para.uin, user_id: pobj.actionBody.interface.para.uin,
delivery_status: 1, delivery_status: 1,
user_name: txorderdetail.goodsDetail.formInfo.userName user_name: txorderdetail.goodsDetail.formInfo.userName,
email: txorderdetail.goodsDetail.formInfo.email || "",
wechat_no: txorderdetail.goodsDetail.formInfo.wechatNo || ""
} }
var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t); var orderDeliveryinfo = await self.orderDeliveryDao.create(orderDeliveryobj, t);
var orderPayobj = { var orderPayobj = {
...@@ -539,7 +543,7 @@ class OrderInfoService extends ServiceBase { ...@@ -539,7 +543,7 @@ class OrderInfoService extends ServiceBase {
"regionId": txorderdetail.goodsDetail.formInfo.serviceCode, "regionId": txorderdetail.goodsDetail.formInfo.serviceCode,
"regionName": txorderdetail.goodsDetail.formInfo.serviceArea, "regionName": txorderdetail.goodsDetail.formInfo.serviceArea,
"contactsName": txorderdetail.goodsDetail.formInfo.contactsName, "contactsName": txorderdetail.goodsDetail.formInfo.contactsName,
"contactsMoblie": txorderdetail.goodsDetail.formInfo.contactsMoblie, "contactsMobile": txorderdetail.goodsDetail.formInfo.contactsMobile,
"productType": txorderdetail.goodsDetail.product.productType, "productType": txorderdetail.goodsDetail.product.productType,
"productTypeName": txorderdetail.goodsDetail.product.productTypeName, "productTypeName": txorderdetail.goodsDetail.product.productTypeName,
"txPriceCode": txorderdetail.goodsDetail.product.txPriceCode, "txPriceCode": txorderdetail.goodsDetail.product.txPriceCode,
......
brg-user-center/app/base/service/impl/order/orderProductSve.js
...@@ -21,7 +21,7 @@ class OderproductService extends ServiceBase { ...@@ -21,7 +21,7 @@ class OderproductService extends ServiceBase {
// "regionId":actionbody.regionId, // "regionId":actionbody.regionId,
// "regionName":actionbody.regionName, // "regionName":actionbody.regionName,
// "contactsName":actionbody.contactsName, // "contactsName":actionbody.contactsName,
// "contactsMoblie":actionbody.contactsMoblie, // "contactsMobile":actionbody.contactsMobile,
// "productType":actionbody.productType, // "productType":actionbody.productType,
// "orderSnapshot":order_snapshot // "orderSnapshot":order_snapshot
// } // }
......
brg-user-center/app/front/entry/public/apidoc/pushReceive/push.md
...@@ -25,7 +25,7 @@ servicerName | Y | string | 100 | 服务商名称 ...@@ -25,7 +25,7 @@ servicerName | Y | string | 100 | 服务商名称
regionId | Y | string | 100 | 地区id regionId | Y | string | 100 | 地区id
regionName | Y | string | 100 | 地区名称 regionName | Y | string | 100 | 地区名称
contactsName | Y | string | 100 | 用户名称 contactsName | Y | string | 100 | 用户名称
contactsMoblie | Y | string | 100 | 用户电话 ContactsMobile | Y | string | 100 | 用户电话
consultType | Y | int | 100 | 需求类型 consultType | Y | int | 100 | 需求类型
consultTypeName | Y | int | 100 | 需求类型名称 consultTypeName | Y | int | 100 | 需求类型名称
...@@ -39,7 +39,7 @@ servicerName | Y | string | 100 | 服务商名称 ...@@ -39,7 +39,7 @@ servicerName | Y | string | 100 | 服务商名称
regionId | Y | string | 100 | 地区id regionId | Y | string | 100 | 地区id
regionName | Y | string | 100 | 地区名称 regionName | Y | string | 100 | 地区名称
contactsName | Y | string | 100 | 用户名称 contactsName | Y | string | 100 | 用户名称
contactsMoblie | Y | string | 100 | 用户电话 ContactsMobile | Y | string | 100 | 用户电话
consultType | Y | int | 100 | 需求类型 consultType | Y | int | 100 | 需求类型
consultTypeName | Y | int | 100 | 需求类型名称 consultTypeName | Y | int | 100 | 需求类型名称
companyName | Y | int | 100 | 公司名称 companyName | Y | int | 100 | 公司名称
...@@ -55,7 +55,7 @@ companyName | Y | int | 100 | 公司名称 ...@@ -55,7 +55,7 @@ companyName | Y | int | 100 | 公司名称
"regionId":"1", "regionId":"1",
"regionName":"北京", "regionName":"北京",
"contactsName":"张三", "contactsName":"张三",
"contactsMoblie":"17610163853", "ContactsMobile":"17610163853",
"consultType":"/ic/gsreg/"， "consultType":"/ic/gsreg/"，
"consultTypeName":"/工商服务/公司注册/"， "consultTypeName":"/工商服务/公司注册/"，
"servicerCode: "gsb", "servicerCode: "gsb",
...@@ -94,7 +94,7 @@ servicerName | Y | string | 100 | 服务商名称 ...@@ -94,7 +94,7 @@ servicerName | Y | string | 100 | 服务商名称
regionId | Y | string | 100 | 地区id regionId | Y | string | 100 | 地区id
regionName | Y | string | 100 | 地区名称 regionName | Y | string | 100 | 地区名称
contactsName | Y | string | 100 | 用户名称 contactsName | Y | string | 100 | 用户名称
contactsMoblie | Y | string | 100 | 用户电话 contactsMobile | Y | string | 100 | 用户电话
productType | Y | int | 100 | 产品类型 productType | Y | int | 100 | 产品类型
productTypeName | Y | int | 100 | 产品类型名称 productTypeName | Y | int | 100 | 产品类型名称
...@@ -109,7 +109,7 @@ servicerName | Y | string | 100 | 服务商名称 ...@@ -109,7 +109,7 @@ servicerName | Y | string | 100 | 服务商名称
regionId | Y | string | 100 | 地区id regionId | Y | string | 100 | 地区id
regionName | Y | string | 100 | 地区名称 regionName | Y | string | 100 | 地区名称
contactsName | Y | string | 100 | 用户名称 contactsName | Y | string | 100 | 用户名称
contactsMoblie | Y | string | 100 | 用户电话 contactsMobile | Y | string | 100 | 用户电话
productType | Y | int | 100 | 产品类型 productType | Y | int | 100 | 产品类型
productTypeName | Y | int | 100 | 产品类型名称 productTypeName | Y | int | 100 | 产品类型名称
order_snapshot | Y | string | 500 | 订单快照(json转字符串) order_snapshot | Y | string | 500 | 订单快照(json转字符串)
...@@ -126,7 +126,7 @@ order_snapshot | Y | string | 500 | 订单快照(json转字符串) ...@@ -126,7 +126,7 @@ order_snapshot | Y | string | 500 | 订单快照(json转字符串)
"regionId":"", "regionId":"",
"regionName":"", "regionName":"",
"contactsName":"", "contactsName":"",
"contactsMoblie":"", "contactsMobile":"",
"productType":"" "productType":""
"orderSnapshot":{} "orderSnapshot":{}
} }
......
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