Skip to content

Z
zhichan
Commit 0dda07ae by 宋毅
Options

tj

parent 357b8ef2
Showing with 407 additions and 142 deletions
igirl-channel/app/base/api/impl/action/tmOrder.js
...@@ -62,7 +62,7 @@ class TmOrderAPI extends APIBase { ...@@ -62,7 +62,7 @@ class TmOrderAPI extends APIBase {
opResult = await this.toolSve.decryptStr(req.app, action_body.opStr); opResult = await this.toolSve.decryptStr(req.app, action_body.opStr);
break; break;
case "op1688ChannelPushOrder"://处理渠道订单信息 case "op1688ChannelPushOrder"://处理渠道订单信息
opResult = await this.orderSve.op1688ChannelPushOrder(action_body); opResult = await this.orderSve.op1688ChannelPushOrderTest(action_body, pobj, req);
if (opResult.status == 0) { if (opResult.status == 0) {
opResult.data = null; opResult.data = null;
var encryptResult = await this.toolSve.encryptStr(req.app, action_body.channelUserId); var encryptResult = await this.toolSve.encryptStr(req.app, action_body.channelUserId);
...@@ -93,6 +93,25 @@ class TmOrderAPI extends APIBase { ...@@ -93,6 +93,25 @@ class TmOrderAPI extends APIBase {
await this.pushData2(opResult, req, pobj, url); await this.pushData2(opResult, req, pobj, url);
} }
break; break;
case "subExistTmOrder"://提交存在商标提报
opResult = await this.ordertmproductSve.addExistTmOrder(action_body);
if (opResult && opResult.status == 0 && opResult.data) {
var returnTms = opResult.data.tm;
for (var i = 0; i < pobj.actionBody.nclones.length; i++) {
var nclone = pobj.actionBody.nclones[i];
for (var j = 0; j < returnTms.length; j++) {
var returnTm = returnTms[j];
if (returnTm.nclOne && nclone.code && returnTm.nclOne == nclone.code) {
pobj.actionBody.nclones[i]["tbCode"] = returnTm.tbCode;
}
}
}
pobj.actionBody["deliveryOrderNo"] = opResult.data.deliveryOrderNo;
// await this.pushData(opResult, req, pobj);
var url = this.pushFqbossDataUrl + "api/channelaccessApi/createChannelOrder"
await this.pushData2(opResult, req, pobj, url);
}
break;
case "getTmOrderList"://商标交付列表 case "getTmOrderList"://商标交付列表
opResult = await this.ordertmproductSve.getTmOrderList(action_body); opResult = await this.ordertmproductSve.getTmOrderList(action_body);
break; break;
...@@ -152,6 +171,9 @@ class TmOrderAPI extends APIBase { ...@@ -152,6 +171,9 @@ class TmOrderAPI extends APIBase {
await this.pushData2(opResult, req, pobj, url); await this.pushData2(opResult, req, pobj, url);
} }
break; break;
case "pushFqBusiness"://推送商机到峰擎
opResult = await this.orderSve.pushFqBusiness(action_body, pobj, req);
break;
default: default:
opResult = system.getResult(null, "action_type参数错误"); opResult = system.getResult(null, "action_type参数错误");
break; break;
......
igirl-channel/app/base/db/impl/dborder/orderDao.js
...@@ -119,5 +119,38 @@ class OrderDao extends Dao { ...@@ -119,5 +119,38 @@ class OrderDao extends Dao {
raw: true raw: true
}); });
} }
async getItemByChannelServiceNo(channelServiceNo, appId) {//通过订单号查询订单
return this.model.findOne({
where: {
channelServiceNo: channelServiceNo,
app_id: appId
},
attributes: ["id",
"orderNo",
"channelUserId",
"channelServiceNo",
"channelOrderNo",
"needNo",
"invoiceApplyStatus",
"orderType",
"salesNum",
"salesDiliverNum",
"minitermNum",
"minitermDiliverNum",
"orderPayStatus",
"notes",
"totalServiceCharge",
"totalPublicExpense",
"totalTaxes",
"totalSum",
"appPayType",
"payTime",
"itemCode",
"itemName",
"buyerMoblie"
],
raw: true
});
}
} }
module.exports = OrderDao; module.exports = OrderDao;
igirl-channel/app/base/db/models/dborder/order.js
...@@ -59,7 +59,8 @@ module.exports = (db, DataTypes) => { ...@@ -59,7 +59,8 @@ module.exports = (db, DataTypes) => {
picUrl :DataTypes.STRING(500),// 产品图片地址 picUrl :DataTypes.STRING(500),// 产品图片地址
productType_id :DataTypes.INTEGER, //产品类型Id productType_id :DataTypes.INTEGER, //产品类型Id
productOneType_id :DataTypes.INTEGER, //产品大类Id productOneType_id :DataTypes.INTEGER, //产品大类Id
serviceItemSnapshot :DataTypes.TEXT, //产品快照 serviceItemSnapshot :DataTypes.TEXT, //产品快照
buyerMoblie :DataTypes.STRING(64), // 买家手机号
}, { }, {
paranoid: false,//假的删除 paranoid: false,//假的删除
underscored: true, underscored: true,
......
igirl-channel/app/base/service/impl/dborder/orderSve.js
...@@ -7,8 +7,10 @@ class OrderService extends ServiceBase { ...@@ -7,8 +7,10 @@ class OrderService extends ServiceBase {
super("dborder", ServiceBase.getDaoName(OrderService)); super("dborder", ServiceBase.getDaoName(OrderService));
this.logCtl = system.getObject("web.common.oplogCtl"); this.logCtl = system.getObject("web.common.oplogCtl");
this.appproductDao = system.getObject("db.dbapp.appproductDao"); this.appproductDao = system.getObject("db.dbapp.appproductDao");
this.ordertmproductDao = system.getObject("db.dborder.ordertmproductDao");
this.execClient = system.getObject("util.execClient");
} }
async op1688ChannelPushOrder(action_body, req) { async op1688ChannelPushOrder(action_body, pobj, req) {
try { try {
var reqUrl = "https://inte-mcp.chanjet.com/gsb/getOrder?token=" + action_body.token; var reqUrl = "https://inte-mcp.chanjet.com/gsb/getOrder?token=" + action_body.token;
var rtn = await this.execClient.execGet("", reqUrl); var rtn = await this.execClient.execGet("", reqUrl);
...@@ -27,18 +29,19 @@ class OrderService extends ServiceBase { ...@@ -27,18 +29,19 @@ class OrderService extends ServiceBase {
}//操作需求 }//操作需求
return system.getResultSuccess(); return system.getResultSuccess();
} catch (e) { } catch (e) {
console.log(e.stack, "渠道回调信息返回结果：error......1.....");
this.logCtl.error({ this.logCtl.error({
appid: req.app.id, appid: req.app.id,
appkey: req.app.uappKey, appkey: req.app.uappKey,
requestId: req.requestId || "", requestId: req.requestId || "",
op: "/igirl-channel/zhichan/igirl-channel/app/base/service/impl/dborder/orderSve/opChannelCallbackData", op: "/igirl-channel/zhichan/igirl-channel/app/base/service/impl/dborder/orderSve/opChannelCallbackData",
content: "请求地址：" + reqUrl + "，error：" + e.stack, content: "error：" + e.stack,
clientIp: pobj.clientIp, clientIp: pobj.clientIp,
optitle: "渠道回调信息返回结果：" + rtn.stdout, optitle: "渠道回调信息返回结果：" + rtn.stdout,
}); });
} }
} }
async op1688ChannelPushOrderTest(action_body, req) { async op1688ChannelPushOrderTest(action_body, pobj, req) {
try { try {
var returnValue = [ var returnValue = [
...@@ -51,7 +54,7 @@ class OrderService extends ServiceBase { ...@@ -51,7 +54,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "W171200000000_44", "orderItemNum": "W171200000000_33",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -67,7 +70,7 @@ class OrderService extends ServiceBase { ...@@ -67,7 +70,7 @@ class OrderService extends ServiceBase {
"bizStatus": "S", "bizStatus": "S",
"paymentAmount": 420, "paymentAmount": 420,
"executePrice": 420, "executePrice": 420,
"orderItemNum": "W171200000000_33", "orderItemNum": "W171200000000_44",
"gmtServiceBegin": "20171231000000000+0800", "gmtServiceBegin": "20171231000000000+0800",
"gmtConfirm": "20171231200329000+0800", "gmtConfirm": "20171231200329000+0800",
"settleItemDtos": [], "settleItemDtos": [],
...@@ -75,10 +78,10 @@ class OrderService extends ServiceBase { ...@@ -75,10 +78,10 @@ class OrderService extends ServiceBase {
"signCustomerUid": "12345678990000" "signCustomerUid": "12345678990000"
} }
]; ];
this.addOrderNeed(action_body, req, returnValue); await this.addOrderNeed(action_body, req, returnValue);
return system.getResultSuccess(); return system.getResultSuccess();
} catch (e) { } catch (e) {
console.log(e.stack, "渠道回调信息返回结果：error...........") console.log(e.stack, "渠道回调信息返回结果：error...........");
this.logCtl.error({ this.logCtl.error({
appid: req.app.id, appid: req.app.id,
appkey: req.app.uappKey, appkey: req.app.uappKey,
...@@ -96,57 +99,144 @@ class OrderService extends ServiceBase { ...@@ -96,57 +99,144 @@ class OrderService extends ServiceBase {
if (!productItem) { if (!productItem) {
return; return;
} }
var self = this;
//创建订单 //创建订单
var ordercode = await this.getBusUid("ts"); var ordercode = await this.getBusUid("ts");
for (let index = 0; index < returnValue.length; index++) { for (let index = 0; index < returnValue.length; index++) {
const element = returnValue[index]; const element = returnValue[index];
if (element) { if (element) {
if (element.bizStatusExt == "service") { if (element.bizStatusExt == "service") {
var orderCount = await self.findCount({ where: { needNo: element.orderItemNum } });
if (orderCount > 0) {
continue;
}
var payTime = null; var payTime = null;
if (element.gmtCreate && element.gmtCreate.length > 14) { if (element.gmtCreate && element.gmtCreate.length > 14) {
payTime = element.gmtCreate.substr(0, 4) + "-" + element.gmtCreate.substr(4, 2) + payTime = element.gmtCreate.substr(0, 4) + "-" + element.gmtCreate.substr(4, 2) +
"-" + element.gmtCreate.substr(6, 2) + " " + element.gmtCreate.substr(8, 2) + ":" + "-" + element.gmtCreate.substr(6, 2) + " " + element.gmtCreate.substr(8, 2) + ":" +
element.gmtCreate.substr(10, 2) + ":" + element.gmtCreate.substr(12, 2); element.gmtCreate.substr(10, 2) + ":" + element.gmtCreate.substr(12, 2);
} }
addOrderList.push({ await self.db.transaction(async function (t) {
app_id: req.app.id,// //创建订单
orderNo: ordercode,// 订单号 var ordercode = await self.getBusUid("tm");
channelServiceNo: element.orderItemNum,// 渠道服务单号 var orderParams = {
payTime: payTime,// app_id: req.app.id,//
itemCode: productItem.itemCode,// orderNo: ordercode,// 订单号
itemName: productItem.itemName,// channelServiceNo: element.orderItemNum,// 渠道服务单号
channelItemCode: productItem.channelItemCode,// 渠道产品编码 payTime: payTime,//
channelItemName: productItem.channelItemName,// 渠道产品名称 itemCode: productItem.itemCode,//
salesNum: 1,//项目订单数量（即服务项目的倍数，默认值为1） itemName: productItem.itemName,//
salesDiliverNum: 0,//项目订单交付数量（即与项目订单数量相对应） channelItemCode: productItem.channelItemCode,// 渠道产品编码
minitermNum: 10,//订单小项数量 channelItemName: productItem.channelItemName,// 渠道产品名称
minitermDiliverNum: 0,//订单小项交付数量 salesNum: 1,//项目订单数量（即服务项目的倍数，默认值为1）
orderType: "dkxd",// 订单类型，zzdd: 自主订单,dkxd: 代客下单 salesDiliverNum: 0,//项目订单交付数量（即与项目订单数量相对应）
orderPayStatus: "yfk",// 订单付款状态dfk: 待付款, zfpz: 已上传支付凭证, yfk: 已付款, ddqx: 订单取消, tkclz: 退款处理中, bfytk: 部分已退款, ytk: 已退款,zfshbtg:支付审核不通过 minitermNum: 10,//订单小项数量
totalServiceCharge: productItem.totalServiceCharge || 0,// 服务费总额（产品配置的服务费*订单件数） minitermDiliverNum: 0,//订单小项交付数量
totalPublicExpense: productItem.totalPublicExpense || 0,// 官费总额（产品配置的官费*订单件数） orderType: "dkxd",// 订单类型，zzdd: 自主订单,dkxd: 代客下单
totalSum: element.executePrice || 0,// 订单总额(产品价格×优惠费率×订单件数) orderPayStatus: "yfk",// 订单付款状态dfk: 待付款, zfpz: 已上传支付凭证, yfk: 已付款, ddqx: 订单取消, tkclz: 退款处理中, bfytk: 部分已退款, ytk: 已退款,zfshbtg:支付审核不通过
refundSum: 0,// 退款金额 totalServiceCharge: productItem.totalServiceCharge || 0,// 服务费总额（产品配置的服务费*订单件数）
// notes: apply.notes, //备注 totalPublicExpense: productItem.totalPublicExpense || 0,// 官费总额（产品配置的官费*订单件数）
appPayType: "00",// 支付类型：00第三方支付，10平台代收款 totalSum: element.executePrice || 0,// 订单总额(产品价格×优惠费率×订单件数)
payAccountType: "other",// 帐户类型（ 支付类型）:cash: 现金, bank: 银行,wx:微信,alipay:支付,other:其它 refundSum: 0,// 退款金额
createuser_id: req.user.id, // notes: apply.notes, //备注
owner_id: req.user.id,// appPayType: "00",// 支付类型：00第三方支付，10平台代收款
creator: req.user.nickname || "", payAccountType: "other",// 帐户类型（ 支付类型）:cash: 现金, bank: 银行,wx:微信,alipay:支付,other:其它
owner: req.user.nickname || "",// createuser_id: req.user.id,
ownerMoblie: req.user.userMoblie || "",// owner_id: req.user.id,//
invoiceApplyStatus: "00",// 发票状态:00: 未申请, 10: 已申请,20:已开票 creator: req.user.nickname || "",
channelUserId: req.user.channelUserId || "",// 渠道用户id owner: req.user.nickname || "",//
needNo: element.orderItemNum || null,//需求单号 ownerMoblie: req.user.userMoblie || "",//
picUrl: productItem.picUrl,// invoiceApplyStatus: "00",// 发票状态:00: 未申请, 10: 已申请,20:已开票
productType_id: productItem.productType_id,//产品类型Id channelUserId: req.user.channelUserId || "",// 渠道用户id
productOneType_id: productItem.productOneType_id,//产品大类Id needNo: element.orderItemNum || null,//需求单号
serviceItemSnapshot: JSON.stringify(productItem),//产品快照 picUrl: productItem.picUrl,//
productType_id: productItem.productType_id,//产品类型Id
productOneType_id: productItem.productOneType_id,//产品大类Id
serviceItemSnapshot: JSON.stringify(productItem),//产品快照
};
var orderItem = await self.dao.create(orderParams, t);//创建订单
if (productItem.itemCode == "zzsbzc") {
var orderProductObj = {
app_id: req.app.id,//
productType_id: productItem.productType_id,//产品类型Id
productOneType_id: productItem.productOneType_id,//产品大类Id
itemCode: productItem.itemCode,//
itemName: productItem.itemName,//
orderServicePayStatus: "yfk",//支付状态:dfk: 待付款, yfk: 已支付
appDataOpType: req.app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托
sourceOrderNo: ordercode,//来源单号
deliveryOrderNo: await self.getBusUid("jf"),
channelServiceNo: element.orderItemNum || null,// 渠道服务单号
needNo: element.orderItemNum || null,//需求单号
sourceType: "00",
channelUserId: req.user.channelUserId || "",// 渠道用户id
createuser_id: req.user.id,//
createuser: req.user.nickname,//
};
//创建服务单
var orderTm = await self.ordertmproductDao.create(orderProductObj, t);//创建商标订单
}
}); });
} }
} }
} }
this.dao.model.bulkCreate(addOrderList); }
async pushFqBusiness(action_body, pobj, req) {
var rc = system.getObject("util.aliyunClient");
var item = await this.dao.getItemByChannelServiceNo(action_body.channelServiceNo, req.app.id);
if (!item) {
return system.getResult(null, "没有找到相关订单信息");
}
if (item.itemCode != "fzsbzc") {
return system.getResult(null, "订单类型有误，请推送商标注册-专家辅助申请的订单");
}
if (item.buyerMoblie) {
return system.getResult(null, "订单已经推送过，请勿重覆推送");
}
var rtn = null;
var reqUrl = "https://yunfuapi.gongsibao.com/crm/order/submit";
try {
var body = {
idempotentId: item.itemCode,// 是 业务 ID
idempotentSource: req.app.appSourceCode ? "tm_" + req.app.appSourceCode : "tm_1688",// 是 业务来源（ali、jd）
idempotentSourceName: req.app.name || "1688应用",// 是 阿里，京东
city: "",// 否 所属城市
phone: action_body.buyerMoblie,// 是 手机号
userId: item.channelUserId,// 否 用户 ID
companyName: "",// 否 公司名称
orderPrice: item.totalSum,// 是 订单金额
productId: "5dc936eb296d1572b9bc5b8d",// 是 产品 ID
productQuantity: item.salesNum,// 是 产品数量
};
rtn = await rc.post(reqUrl, body);
this.logCtl.info({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId || "",
op: "/igirl-channel/zhichan/igirl-channel/app/base/service/impl/dborder/orderSve/pushFqBusiness",
content: "请求地址：" + reqUrl + "，参数：" + JSON.stringify(body) + "，返回结果：" + JSON.stringify(rtn),
clientIp: pobj.clientIp,
optitle: "推送订单商机到FQ信息",
});
if (rtn.code != 200 && rtn.success != true) {
return system.getResult(null, "推送失败，selfrequestId=" + req.requestId + "，requestId=" + rtn.requestId);
}
await this.updateByWhere({ buyerMoblie: action_body.buyerMoblie }, { where: { channelServiceNo: action_body.channelServiceNo } });
return system.getResultSuccess(null, "推送成功");
} catch (e) {
//日志记录
this.logCtl.error({
appid: req.app.id,
appkey: req.app.uappKey,
requestId: req.requestId || "",
op: "/igirl-channel/zhichan/igirl-channel/app/base/service/impl/dborder/orderSve/pushFqBusiness",
content: "error：" + e.stack,
clientIp: pobj.clientIp,
optitle: "推送订单商机到FQ出错",
});
}
} }
} }
module.exports = OrderService; module.exports = OrderService;
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
...@@ -19,6 +19,125 @@ class OrderTmProductService extends ServiceBase { ...@@ -19,6 +19,125 @@ class OrderTmProductService extends ServiceBase {
} }
//------------------------------------------创建订单-------------------开始------------------------- //------------------------------------------创建订单-------------------开始-------------------------
async addExistTmOrder(params) {//创建商标订单信息
var self = this;
var itemCode = params.itemCode;//产品编码
var tm = params.tm;//增加sourceType || "00";//来源类型：00订单，10需求，20服务商
var apply = params.apply;
var app = params.app;
var user = params.user;
var nclones = params.nclones || null;
var channelUser = params.channelUser || null;
var channelOrder = params.channelOrder || null;
var orderType = params.orderType || "dkxd";//订单类型，zzdd: 自主订单,dkxd: 代客下单
if (!nclones || nclones.length < 1) {
return system.getResult(null, "尼斯大类不能为空");
}
if (!itemCode) {
return system.getResult(null, "itemCode参数错误");
}
var productItem = await this.appproductDao.findOneByCode(itemCode, user.app_id);//通过ChannelItemCode获取产品
if (!productItem) {
return system.getResult(null, "未知的产品");
}
if (productItem.status != 1) {
return system.getResult(null, "产品已禁用");
}
if (productItem && productItem.verifyPrice == 1) {
var verifyResult = await self.isOrderVerify(user, 1, tm, productItem, nclones, null);
if (verifyResult) {
return verifyResult;
}
} else {
tm.nclOneCodes = [];
tm.nclCount = 0;
for (var i = 0; i < nclones.length; i++) {
var tbcode = await self.getBusUid("tb");
var nclone = nclones[i];
var nclthreeobj = nclone.nclThree;
if (nclone) {
tm.nclOneCodes.push(nclone.code);
tm.nclCount = tm.nclCount + nclthreeobj.length;
}
}
}
if (tm.tmFormType == "4") {//图形商标
tm["name"] = "图形";
}
return await self.db.transaction(async function (t) {
//创建订单
var ordercode = await self.getBusUid("tm");
var orderAmount = tm;
orderAmount.salesNum = tm.nclOneCodes.length;
orderAmount.minitermNum = tm.nclCount;
var orderResult = await self.orderDao.addOrder(ordercode, orderType, user, app, productItem, channelOrder, channelUser, apply, orderAmount, t);
if (orderResult.status != 0) {
return orderResult;
}
var order = orderResult.data;
var orderProductObj = {
tmName: tm.tmName,//商标名称
tmType: "p",//"p": "普通商标", "j": "集体商标", "z": "证明商标", "t": "特殊商标"
tmFormType: tm.tmFormType,//商标类型形式："1": "立体", "3": "字", "4": "图", "5": "字图", "6": "颜色", "7": "彩色"
nclOneCodes: tm.nclOneCodes ? tm.nclOneCodes.join(",") : null,//尼斯大类列表：格式以,隔开
deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成
picUrl: tm.picUrl || null,//商标图样
colorizedPicUrl: tm.colorizedPicUrl || null,//商标彩色图样
sywjUrl: tm.sywjUrl || null,//声音文件
gzwtsUrl: tm.gzwtsUrl || null,//盖章委托书
smwjUrl: tm.smwjUrl || null,//说明文件
updateuser_id: user.id,//
updateuser: user.nickname,//
notes: tm.notes || "", // 备注信息
nclOneCount: tm.nclOneCodes.length,
nclCount: tm.nclCount,
};
var flowContent = "";
if (apply.customerType == "person") {
if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) {
orderProductObj["deliveryStatus"] = "dsccl";
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
} else {
orderProductObj["deliveryStatus"] = "dsh";
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
}
}
if (apply.customerType == "ent") {
if (!apply.businessLicensePic || !tm.gzwtsUrl) {
orderProductObj["deliveryStatus"] = "dsccl";
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
} else {
orderProductObj["deliveryStatus"] = "dsh";
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
}
}
//订单客户档案添加和修改
await self.opCustomerInfo(user, apply, orderProductObj, t);
//创建服务单
var putWhere = { where: { channelServiceNo: channelOrder.channelServiceNo } };
var orderTm = await self.dao.updateByWhere(orderProductObj, putWhere, t);//创建商标订单--------put
var flowObj = {
app_id: user.app_id,
createuser_id: user.id,
sourceOrderNo: ordercode,
opContent: flowContent
};
await self.orderflowDao.create(flowObj, t);//创建订单流程
flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
await self.orderflowDao.create(flowObj, t);//创建交付流程
orderTm.needNo = channelOrder.needNo || null;//需求单号
var returnTm = await self.opTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t);
return system.getResultSuccess({
deliveryOrderNo: orderProductObj.deliveryOrderNo,
channelServiceNo: channelOrder.channelServiceNo,
channelParams: params.channelParams,
tm: returnTm
});
})
}
async addTmOrder(params) {//创建商标订单信息 async addTmOrder(params) {//创建商标订单信息
var self = this; var self = this;
var itemCode = params.itemCode;//产品编码 var itemCode = params.itemCode;//产品编码
...@@ -79,8 +198,8 @@ class OrderTmProductService extends ServiceBase { ...@@ -79,8 +198,8 @@ class OrderTmProductService extends ServiceBase {
var orderProductObj = { var orderProductObj = {
app_id: user.app_id,// app_id: user.app_id,//
productType_id: productItem.picUrl,//产品类型Id productType_id: productItem.productType_id,//产品类型Id
productOneType_id: productItem.picUrl,//产品大类Id productOneType_id: productItem.productOneType_id,//产品大类Id
itemCode: productItem.itemCode,// itemCode: productItem.itemCode,//
itemName: productItem.itemName,// itemName: productItem.itemName,//
tmName: tm.tmName,//商标名称 tmName: tm.tmName,//商标名称
...@@ -262,15 +381,15 @@ class OrderTmProductService extends ServiceBase { ...@@ -262,15 +381,15 @@ class OrderTmProductService extends ServiceBase {
orderObj.deliveryStatus = "dsccl"; orderObj.deliveryStatus = "dsccl";
} }
else { else {
if(!orderObj.deliveryStatus){ if (!orderObj.deliveryStatus) {
orderObj.deliveryStatus = "dsh"; orderObj.deliveryStatus = "dsh";
} }
} }
} }
// var customer = await this.customerinfoDao.findOneByCodeAndUserId(apply.code, user.id);//查询客户档案 // var customer = await this.customerinfoDao.findOneByCodeAndUserId(apply.code, user.id);//查询客户档案
var customer = await this.customerinfoDao.model.findOne({ var customer = await this.customerinfoDao.model.findOne({
where:{deliveryOrderNo: orderObj.deliveryOrderNo}, where: { deliveryOrderNo: orderObj.deliveryOrderNo },
raw:true raw: true
}); });
if (customer && customer.id) {//客户已存在 则更新 if (customer && customer.id) {//客户已存在 则更新
customerInfoObj["id"] = customer.id; customerInfoObj["id"] = customer.id;
...@@ -291,8 +410,8 @@ class OrderTmProductService extends ServiceBase { ...@@ -291,8 +410,8 @@ class OrderTmProductService extends ServiceBase {
}; };
// var customercontacts = await this.customercontactsDao.findOneByMobile(apply.mobile, customer.id); // var customercontacts = await this.customercontactsDao.findOneByMobile(apply.mobile, customer.id);
var customercontacts = await this.customercontactsDao.model.findOne({ var customercontacts = await this.customercontactsDao.model.findOne({
where:{deliveryOrderNo: orderObj.deliveryOrderNo}, where: { deliveryOrderNo: orderObj.deliveryOrderNo },
raw:true raw: true
}); });
if (!customercontacts) {//客户联系人不存在 则创建 if (!customercontacts) {//客户联系人不存在 则创建
customercontacts = await this.customercontactsDao.create(customerContactObj, t);//创建订单联系人 customercontacts = await this.customercontactsDao.create(customerContactObj, t);//创建订单联系人
...@@ -313,8 +432,8 @@ class OrderTmProductService extends ServiceBase { ...@@ -313,8 +432,8 @@ class OrderTmProductService extends ServiceBase {
for (var i = 0; i < nclones.length; i++) { for (var i = 0; i < nclones.length; i++) {
var tbcode = await self.getBusUid("tb"); var tbcode = await self.getBusUid("tb");
var nclone = nclones[i]; var nclone = nclones[i];
if(nclone.tbCode){//用于辅助注册推送数据 if (nclone.tbCode) {//用于辅助注册推送数据
tbcode=nclone.tbCode; tbcode = nclone.tbCode;
} }
var nclthreeobj = nclone.nclThree; var nclthreeobj = nclone.nclThree;
var nclthreeobjCount = nclone.nclThree.length; var nclthreeobjCount = nclone.nclThree.length;
...@@ -445,7 +564,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -445,7 +564,7 @@ class OrderTmProductService extends ServiceBase {
paramWhere.startTime = startTime; paramWhere.startTime = startTime;
paramWhere.entTime = entTime; paramWhere.entTime = entTime;
} }
sql += " order by o.created_at desc LIMIT " + pageSize + " OFFSET " + from +""; sql += " order by o.created_at desc LIMIT " + pageSize + " OFFSET " + from + "";
var tmpResult = await this.customQuery(sql, paramWhere); var tmpResult = await this.customQuery(sql, paramWhere);
if (!tmpResult || tmpResult.length == 0) { if (!tmpResult || tmpResult.length == 0) {
...@@ -595,7 +714,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -595,7 +714,7 @@ class OrderTmProductService extends ServiceBase {
/** /**
* 接收辅助注册商标数据 * 接收辅助注册商标数据
*/ */
async addAssistTm(params){ async addAssistTm(params) {
// return system.getResultSuccess(null, "接口开发中"); // return system.getResultSuccess(null, "接口开发中");
var self = this; var self = this;
var itemCode = params.itemCode;//产品编码 var itemCode = params.itemCode;//产品编码
...@@ -609,23 +728,23 @@ class OrderTmProductService extends ServiceBase { ...@@ -609,23 +728,23 @@ class OrderTmProductService extends ServiceBase {
return system.getResult(null, "需求编号不能为空"); return system.getResult(null, "需求编号不能为空");
} }
var order = await this.orderDao.model.findOne({ var order = await this.orderDao.model.findOne({
where:{needNo:needNo}, where: { needNo: needNo },
raw:true raw: true
}); });
if(!order || !order.id){ if (!order || !order.id) {
return system.getResult(null, "未知订单"); return system.getResult(null, "未知订单");
} }
//获取渠道用户数据 //获取渠道用户数据
var user = await this.userDao.model.findOne({ var user = await this.userDao.model.findOne({
where:{channelUserId:order.channelUserId,app_id:order.app_id}, where: { channelUserId: order.channelUserId, app_id: order.app_id },
raw:true raw: true
}); });
var app = await this.appDao.model.findOne({ var app = await this.appDao.model.findOne({
where:{id:order.app_id}, where: { id: order.app_id },
raw:true raw: true
}); });
// channelOrder["channelServiceNo"]=order.channelServiceNo; // channelOrder["channelServiceNo"]=order.channelServiceNo;
channelOrder["payTime"]=order.payTime; channelOrder["payTime"] = order.payTime;
if (!nclones || nclones.length < 1) { if (!nclones || nclones.length < 1) {
return system.getResult(null, "尼斯大类不能为空"); return system.getResult(null, "尼斯大类不能为空");
} }
...@@ -633,7 +752,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -633,7 +752,7 @@ class OrderTmProductService extends ServiceBase {
return system.getResult(null, "itemCode参数错误"); return system.getResult(null, "itemCode参数错误");
} }
// itemCode="zzsbzc";//测试 // itemCode="zzsbzc";//测试
var productItem = await this.appproductDao.findOneByCode(itemCode,user.app_id);//获取产品 var productItem = await this.appproductDao.findOneByCode(itemCode, user.app_id);//获取产品
if (!productItem) { if (!productItem) {
return system.getResult(null, "未知的产品"); return system.getResult(null, "未知的产品");
} }
...@@ -663,7 +782,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -663,7 +782,7 @@ class OrderTmProductService extends ServiceBase {
return await self.db.transaction(async function (t) { return await self.db.transaction(async function (t) {
//创建订单 //创建订单
var ordercode = await self.getBusUid("tm"); var ordercode = await self.getBusUid("tm");
if(order.orderNo){ if (order.orderNo) {
ordercode = order.orderNo; ordercode = order.orderNo;
} }
var orderAmount = tm; var orderAmount = tm;
...@@ -684,7 +803,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -684,7 +803,7 @@ class OrderTmProductService extends ServiceBase {
deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成 deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成
appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托 appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托
sourceOrderNo: ordercode,//来源单号 sourceOrderNo: ordercode,//来源单号
deliveryOrderNo:channelOrder.deliveryOrderNo || jfcode, deliveryOrderNo: channelOrder.deliveryOrderNo || jfcode,
channelServiceNo: channelOrder.channelServiceNo,// 渠道服务单号 channelServiceNo: channelOrder.channelServiceNo,// 渠道服务单号
channelOrderNo: channelOrder.channelOrderNo,//渠道订单号列表，多个以,隔开 channelOrderNo: channelOrder.channelOrderNo,//渠道订单号列表，多个以,隔开
needNo: channelOrder.needNo || null,//需求单号 needNo: channelOrder.needNo || null,//需求单号
...@@ -708,7 +827,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -708,7 +827,7 @@ class OrderTmProductService extends ServiceBase {
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款"; flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
} else { } else {
orderProductObj["deliveryStatus"] = "dsh"; orderProductObj["deliveryStatus"] = "dsh";
if(tm.tmStatus && tm.tmStatus=="SUBALITMOK"){ if (tm.tmStatus && tm.tmStatus == "SUBALITMOK") {
orderProductObj["deliveryStatus"] = "dqrfa"; orderProductObj["deliveryStatus"] = "dqrfa";
} }
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款"; flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
...@@ -720,7 +839,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -720,7 +839,7 @@ class OrderTmProductService extends ServiceBase {
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款"; flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待上传材料" : "订单已创建待付款";
} else { } else {
orderProductObj["deliveryStatus"] = "dsh"; orderProductObj["deliveryStatus"] = "dsh";
if(tm.tmStatus && tm.tmStatus=="SUBALITMOK"){ if (tm.tmStatus && tm.tmStatus == "SUBALITMOK") {
orderProductObj["deliveryStatus"] = "dqrfa"; orderProductObj["deliveryStatus"] = "dqrfa";
} }
flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款"; flowContent = channelOrder.payStatus == "yfk" ? "订单已付款待审核" : "订单已创建待付款";
...@@ -729,19 +848,19 @@ class OrderTmProductService extends ServiceBase { ...@@ -729,19 +848,19 @@ class OrderTmProductService extends ServiceBase {
//订单客户档案添加和修改 //订单客户档案添加和修改
await self.opCustomerInfo(user, apply, orderProductObj, t); await self.opCustomerInfo(user, apply, orderProductObj, t);
//获取历史交付单信息 //获取历史交付单信息
var beforeOtp=await self.ordertmproductDao.model.findOne({ var beforeOtp = await self.ordertmproductDao.model.findOne({
where:{deliveryOrderNo:channelOrder.deliveryOrderNo}, where: { deliveryOrderNo: channelOrder.deliveryOrderNo },
raw:true raw: true
}); });
var orderTm = null; var orderTm = null;
if(beforeOtp && beforeOtp.id){//更新交付单 if (beforeOtp && beforeOtp.id) {//更新交付单
orderProductObj["id"] = beforeOtp.id; orderProductObj["id"] = beforeOtp.id;
await self.dao.update(orderProductObj,t); await self.dao.update(orderProductObj, t);
orderTm = await self.ordertmproductDao.model.findOne({ orderTm = await self.ordertmproductDao.model.findOne({
where:{id:beforeOtp.id}, where: { id: beforeOtp.id },
raw:true raw: true
}); });
}else{//创建服务单 } else {//创建服务单
orderTm = await self.dao.create(orderProductObj, t);//创建商标订单 orderTm = await self.dao.create(orderProductObj, t);//创建商标订单
} }
var flowObj = { var flowObj = {
...@@ -755,16 +874,16 @@ class OrderTmProductService extends ServiceBase { ...@@ -755,16 +874,16 @@ class OrderTmProductService extends ServiceBase {
await self.orderflowDao.create(flowObj, t);//创建交付流程 await self.orderflowDao.create(flowObj, t);//创建交付流程
orderTm.needNo = channelOrder.needNo || null;//需求单号 orderTm.needNo = channelOrder.needNo || null;//需求单号
var returnTm = await self.opTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t); var returnTm = await self.opTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t);
var orderObj={ var orderObj = {
id:order.id id: order.id
}; };
if(channelOrder.channelServiceNo){ if (channelOrder.channelServiceNo) {
orderObj["channelServiceNo"]=channelOrder.channelServiceNo; orderObj["channelServiceNo"] = channelOrder.channelServiceNo;
} }
if(channelOrder.channelOrderNo){ if (channelOrder.channelOrderNo) {
orderObj["channelOrderNo"]=channelOrder.channelOrderNo; orderObj["channelOrderNo"] = channelOrder.channelOrderNo;
} }
await self.orderDao.update(orderObj,t); await self.orderDao.update(orderObj, t);
return system.getResultSuccess({ return system.getResultSuccess({
deliveryOrderNo: orderProductObj.deliveryOrderNo, deliveryOrderNo: orderProductObj.deliveryOrderNo,
channelServiceNo: channelOrder.channelServiceNo, channelServiceNo: channelOrder.channelServiceNo,
...@@ -776,71 +895,71 @@ class OrderTmProductService extends ServiceBase { ...@@ -776,71 +895,71 @@ class OrderTmProductService extends ServiceBase {
/** /**
* 接收辅助注册商标修改数据 * 接收辅助注册商标修改数据
*/ */
async editAssistTm(obj){ async editAssistTm(obj) {
// return system.getResultSuccess(null, "接口开发中"); // return system.getResultSuccess(null, "接口开发中");
var self = this; var self = this;
var needNo = obj.needId; var needNo = obj.needId;
if(!needNo){ if (!needNo) {
return system.getResultFail(-101, "needNo参数错误"); return system.getResultFail(-101, "needNo参数错误");
} }
//获取交付单信息 //获取交付单信息
var ordertmproduct = await this.ordertmproductDao.model.findOne({ var ordertmproduct = await this.ordertmproductDao.model.findOne({
where:{needNo:needNo}, where: { needNo: needNo },
raw:true raw: true
}); });
if(!ordertmproduct || !ordertmproduct.id){ if (!ordertmproduct || !ordertmproduct.id) {
return system.getResultFail(-102, "商标交付单不存在"); return system.getResultFail(-102, "商标交付单不存在");
} }
var deliveryOrderNo = ordertmproduct.deliveryOrderNo; var deliveryOrderNo = ordertmproduct.deliveryOrderNo;
//获取交付单状态，判断是否可修改 //获取交付单状态，判断是否可修改
if(ordertmproduct.deliveryStatus=='ddj' || ordertmproduct.deliveryStatus=='ywc'){ if (ordertmproduct.deliveryStatus == 'ddj' || ordertmproduct.deliveryStatus == 'ywc') {
var deliveryStatusName = "待递交"; var deliveryStatusName = "待递交";
if(ordertmproduct.deliveryStatus=='ywc'){ if (ordertmproduct.deliveryStatus == 'ywc') {
deliveryStatusName="已完成"; deliveryStatusName = "已完成";
} }
return system.getResultFail(-103, "该商标交付单状态为"+deliveryStatusName+",不能进行修改"); return system.getResultFail(-103, "该商标交付单状态为" + deliveryStatusName + ",不能进行修改");
} }
//获取渠道用户数据 //获取渠道用户数据
var user = await this.userDao.model.findOne({ var user = await this.userDao.model.findOne({
where:{id:ordertmproduct.createuser_id}, where: { id: ordertmproduct.createuser_id },
raw:true raw: true
}); });
if (!user) { if (!user) {
return system.getResultFail(-104, "未知的用户"); return system.getResultFail(-104, "未知的用户");
} }
//获取渠道数据 //获取渠道数据
var app = await this.appDao.model.findOne({ var app = await this.appDao.model.findOne({
where:{id:ordertmproduct.app_id}, where: { id: ordertmproduct.app_id },
raw:true raw: true
}); });
if (!app) { if (!app) {
return system.getResultFail(-105, "未知的渠道"); return system.getResultFail(-105, "未知的渠道");
} }
var itemCode = obj.itemCode;//产品编码 var itemCode = obj.itemCode;//产品编码
if(!itemCode){ if (!itemCode) {
return system.getResultFail(-106, "产品编码参数错误"); return system.getResultFail(-106, "产品编码参数错误");
} }
var productItem = await this.appproductDao.findOneByCode(itemCode,app.id);//获取产品 var productItem = await this.appproductDao.findOneByCode(itemCode, app.id);//获取产品
if (!productItem) { if (!productItem) {
return system.getResultFail(-107, "未知的产品"); return system.getResultFail(-107, "未知的产品");
} }
return await self.db.transaction(async function (t) { return await self.db.transaction(async function (t) {
var whereObj={ where: { deliveryOrderNo:deliveryOrderNo,app_id:app.id }, transaction: t }; var whereObj = { where: { deliveryOrderNo: deliveryOrderNo, app_id: app.id }, transaction: t };
//申请人 //申请人
var applyObj = obj.apply; var applyObj = obj.apply;
applyObj["updated_at"] = new Date(); applyObj["updated_at"] = new Date();
await self.customerinfoDao.model.update(applyObj,whereObj); await self.customerinfoDao.model.update(applyObj, whereObj);
//联系人 //联系人
var contactObj=obj.contacts; var contactObj = obj.contacts;
contactObj["updated_at"] = new Date(); contactObj["updated_at"] = new Date();
await self.customercontactsDao.model.update(contactObj,whereObj); await self.customercontactsDao.model.update(contactObj, whereObj);
//商标信息 //商标信息
var tmsList=obj.tms; var tmsList = obj.tms;
await self.trademarkDao.bulkDeleteByWhere(whereObj, t); await self.trademarkDao.bulkDeleteByWhere(whereObj, t);
for(var i=0;i<tmsList.length;i++){ for (var i = 0; i < tmsList.length; i++) {
var tm = tmsList[i]; var tm = tmsList[i];
tm["needNo"] = needNo; tm["needNo"] = needNo;
tm["deliveryOrderNo"]=deliveryOrderNo; tm["deliveryOrderNo"] = deliveryOrderNo;
tm["app_id"] = app.id; tm["app_id"] = app.id;
tm["createuser_id"] = user.id; tm["createuser_id"] = user.id;
tm["owner_id"] = user.id; tm["owner_id"] = user.id;
...@@ -851,81 +970,81 @@ class OrderTmProductService extends ServiceBase { ...@@ -851,81 +970,81 @@ class OrderTmProductService extends ServiceBase {
tm["itemName"] = productItem.itemName; tm["itemName"] = productItem.itemName;
tm["channelUserId"] = user.channelUserId; tm["channelUserId"] = user.channelUserId;
tm["updated_at"] = new Date(); tm["updated_at"] = new Date();
if(tm.officialType=="WAITARTIFICIALEXAMINE"){ if (tm.officialType == "WAITARTIFICIALEXAMINE") {
tm.officialType="dsh" tm.officialType = "dsh"
} }
else if(tm.officialType=="FILLEXCEPTION"){ else if (tm.officialType == "FILLEXCEPTION") {
tm.officialType="shbtg" tm.officialType = "shbtg"
} }
else if(tm.officialType=="WAITCOMMIT"){ else if (tm.officialType == "WAITCOMMIT") {
tm.officialType="ddj" tm.officialType = "ddj"
} }
else if(tm.officialType=="ROBOT"){ else if (tm.officialType == "ROBOT") {
tm.officialType="ydj" tm.officialType = "ydj"
}else{ } else {
tm.officialType="dsccl"; tm.officialType = "dsccl";
} }
await self.trademarkDao.create(tm,t); await self.trademarkDao.create(tm, t);
} }
//交付单 //交付单
var otp = obj.order; var otp = obj.order;
if(otp.tmStatus && otp.tmStatus=="SUBALITMOK"){ if (otp.tmStatus && otp.tmStatus == "SUBALITMOK") {
otp["deliveryStatus"] = "dqrfa"; otp["deliveryStatus"] = "dqrfa";
} }
otp["updated_at"] = new Date(); otp["updated_at"] = new Date();
await self.dao.model.update(otp,whereObj); await self.dao.model.update(otp, whereObj);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
async tmConfirm(obj){ async tmConfirm(obj) {
var self = this; var self = this;
var channelUserId = obj.channelUserId; var channelUserId = obj.channelUserId;
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
var isConfirm = obj.isConfirm; var isConfirm = obj.isConfirm;
if(!channelUserId){ if (!channelUserId) {
return system.getResultFail(-101, "渠道用户id不能为空"); return system.getResultFail(-101, "渠道用户id不能为空");
} }
if(!deliveryOrderNo){ if (!deliveryOrderNo) {
return system.getResultFail(-102, "交付单号不能为空"); return system.getResultFail(-102, "交付单号不能为空");
} }
if(!isConfirm){ if (!isConfirm) {
return system.getResultFail(-103, "确认码不能为空"); return system.getResultFail(-103, "确认码不能为空");
} }
//获取交付单信息 //获取交付单信息
var ordertmproduct = await this.ordertmproductDao.model.findOne({ var ordertmproduct = await this.ordertmproductDao.model.findOne({
where:{deliveryOrderNo:deliveryOrderNo}, where: { deliveryOrderNo: deliveryOrderNo },
raw:true raw: true
}); });
if(!ordertmproduct || !ordertmproduct.id){ if (!ordertmproduct || !ordertmproduct.id) {
return system.getResultFail(-104, "未知支付单"); return system.getResultFail(-104, "未知支付单");
} }
if(ordertmproduct.deliveryStatus!="dqrfa"){ if (ordertmproduct.deliveryStatus != "dqrfa") {
return system.getResultFail(-105, "方案确认失败，该方案交付状态为"+ordertmproduct.deliveryStatusName); return system.getResultFail(-105, "方案确认失败，该方案交付状态为" + ordertmproduct.deliveryStatusName);
} }
// if(ordertmproduct.channelUserId!=channelUserId){ // if(ordertmproduct.channelUserId!=channelUserId){
// return system.getResultFail(-105, "方案确认失败，只能确认自己的商标方案"); // return system.getResultFail(-105, "方案确认失败，只能确认自己的商标方案");
// } // }
return await self.db.transaction(async function (t) { return await self.db.transaction(async function (t) {
var otpObj = {id:ordertmproduct.id}; var otpObj = { id: ordertmproduct.id };
if(isConfirm=="0"){ if (isConfirm == "0") {
if(!obj.notes){ if (!obj.notes) {
return system.getResultFail(-106, "方案确认失败，不通过原因不能为空"); return system.getResultFail(-106, "方案确认失败，不通过原因不能为空");
} }
otpObj["deliveryStatus"]="fabtg"; otpObj["deliveryStatus"] = "fabtg";
otpObj["notes"]=obj.notes; otpObj["notes"] = obj.notes;
} }
if(isConfirm=="1"){ if (isConfirm == "1") {
otpObj["deliveryStatus"]="dsh"; otpObj["deliveryStatus"] = "dsh";
otpObj["notes"]=obj.notes || ""; otpObj["notes"] = obj.notes || "";
var tmObj={deliveryOrderNo:deliveryOrderNo,officialType:"dsh"}; var tmObj = { deliveryOrderNo: deliveryOrderNo, officialType: "dsh" };
await self.trademarkDao.model.update(tmObj,{where:{deliveryOrderNo:deliveryOrderNo}, transaction: t}); await self.trademarkDao.model.update(tmObj, { where: { deliveryOrderNo: deliveryOrderNo }, transaction: t });
} }
await self.dao.update(otpObj,t); await self.dao.update(otpObj, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
//------------------------接收辅助注册商标数据--------end--------------------------------------------------------- //------------------------接收辅助注册商标数据--------end---------------------------------------------------------
} }
......
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