Skip to content

Z
zhichan
Commit 5335520b by 庄冰
Options

aaa

parent db93227d
Showing with 81 additions and 27 deletions
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
...@@ -809,7 +809,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -809,7 +809,7 @@ class OrderTmProductService extends ServiceBase {
tmFormType: tm.tmFormType,//商标类型形式："1": "立体", "3": "字", "4": "图", "5": "字图", "6": "颜色", "7": "彩色" tmFormType: tm.tmFormType,//商标类型形式："1": "立体", "3": "字", "4": "图", "5": "字图", "6": "颜色", "7": "彩色"
nclOneCodes: tm.nclOneCodes ? tm.nclOneCodes.join(",") : null,//尼斯大类列表：格式以,隔开 nclOneCodes: tm.nclOneCodes ? tm.nclOneCodes.join(",") : null,//尼斯大类列表：格式以,隔开
orderServicePayStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付 orderServicePayStatus: channelOrder.payStatus,//支付状态:dfk: 待付款, yfk: 已支付
deliveryStatus: "dsccl",//商标交付状态：dsccl: 待上传材料, dsh: 待审核, ddj: 待递交, ywc: 已完成 deliveryStatus: "dqrfa",//商标交付状态：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,
...@@ -829,31 +829,31 @@ class OrderTmProductService extends ServiceBase { ...@@ -829,31 +829,31 @@ class OrderTmProductService extends ServiceBase {
nclOneCount: tm.nclOneCodes.length, nclOneCount: tm.nclOneCodes.length,
nclCount: tm.nclCount, nclCount: tm.nclCount,
}; };
var flowContent = ""; // var flowContent = "";
if (apply.customerType == "person") { // if (apply.customerType == "person") {
if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) { // if (!apply.businessLicensePic || !apply.identityCardPic || !tm.gzwtsUrl) {
orderProductObj["deliveryStatus"] = "dsccl"; // orderProductObj["deliveryStatus"] = "dsccl";
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" ? "订单已付款待审核" : "订单已创建待付款";
} // }
} // }
if (apply.customerType == "ent") { // if (apply.customerType == "ent") {
if (!apply.businessLicensePic || !tm.gzwtsUrl) { // if (!apply.businessLicensePic || !tm.gzwtsUrl) {
orderProductObj["deliveryStatus"] = "dsccl"; // orderProductObj["deliveryStatus"] = "dsccl";
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" ? "订单已付款待审核" : "订单已创建待付款";
} // }
} // }
//订单客户档案添加和修改 //订单客户档案添加和修改
await self.opCustomerInfo(user, apply, orderProductObj, t); await self.opCustomerInfo(user, apply, orderProductObj, t);
//获取历史交付单信息 //获取历史交付单信息
...@@ -882,7 +882,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -882,7 +882,7 @@ class OrderTmProductService extends ServiceBase {
flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo; flowObj.sourceOrderNo = orderProductObj.deliveryOrderNo;
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.opAssistTmInfo(user, tm, apply, nclones, orderTm, JSON.stringify(productItem), t);
var orderObj = { var orderObj = {
id: order.id id: order.id
}; };
...@@ -901,6 +901,60 @@ class OrderTmProductService extends ServiceBase { ...@@ -901,6 +901,60 @@ class OrderTmProductService extends ServiceBase {
}); });
}) })
} }
async opAssistTmInfo(user, tm, apply, nclones, orderTm, serviceItemSnapshot, t, ) {//商标（商标注册）添加操作
//获取产品快照
var productItem = serviceItemSnapshot;
if (productItem) {
productItem = JSON.parse(productItem);
}
var gf = productItem.publicExpense ? Number(productItem.publicExpense) : 0;//产品官费
var nclSmallPrice = gf / 10;//单个小类官费
nclSmallPrice = Number(nclSmallPrice.toFixed(2));
var self = this;
var returnTm = [];
await this.trademarkDao.bulkDeleteByWhere({ where: { deliveryOrderNo: orderTm.deliveryOrderNo, nclOneCodes: { [self.db.Op.in]: tm.nclOneCodes } } }, t);
for (var i = 0; i < nclones.length; i++) {
var tbcode = await self.getBusUid("tb");
var nclone = nclones[i];
if (nclone.tbCode) {//用于辅助注册推送数据
tbcode = nclone.tbCode;
}
var nclthreeobj = nclone.nclThree;
var nclthreeobjCount = nclone.nclThree.length;
//计算尼斯小类官方总额
var nclgfze = 300;
if (nclthreeobj.length > 10) {
nclgfze = nclgfze + (nclthreeobj.length - 10) * nclSmallPrice;
}
nclthreeobj = JSON.stringify(nclthreeobj);
var trademarkobj = {
tbCode: tbcode,//提报号(自动生成)
deliveryOrderNo: orderTm.deliveryOrderNo,
needNo: orderTm.needNo,//需求单号
officialType: orderTm.deliveryStatus,//"dsccl": "待上传材料", "dsh": "待审核"
app_id: user.app_id,
createuser_id: user.id,
owner_id: user.id,
owner: user.nickname,
ownerMoblie: user.userMoblie,
creator: user.nickname,
nclOneCodes: nclone.code,//尼斯大类
nclSmallCodes: nclthreeobj,//尼斯小类
nclCount: nclthreeobjCount,//尼斯数量
nclPublicExpense: nclgfze,
itemCode: productItem.itemCode,//
itemName: productItem.itemName,//
channelUserId: user.channelUserId
};
var trademark = await self.trademarkDao.create(trademarkobj, t);//创建商标
var returnObj = {
nclOne: nclone.code, tbCode: tbcode
};
returnTm.push(returnObj);
}
return returnTm;
}
/** /**
* 接收辅助注册商标修改数据 * 接收辅助注册商标修改数据
*/ */
......
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