Skip to content

Z
zhichan
Commit 9180bb7b by 宋毅
Options

Merge branch 'igirl-channel' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel

parents 101ec9c3 7d2b09f4
Showing with 41 additions and 9 deletions
igirl-channel/app/base/service/impl/dborder/customercontactsSve.js
...@@ -6,6 +6,7 @@ class CustomerContactsService extends ServiceBase { ...@@ -6,6 +6,7 @@ class CustomerContactsService extends ServiceBase {
constructor() { constructor() {
super("dborder", ServiceBase.getDaoName(CustomerContactsService)); super("dborder", ServiceBase.getDaoName(CustomerContactsService));
this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve"); this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve");
this.orderflowDao = system.getObject("db.dborder.orderflowDao");
} }
/** /**
* 修改商标交付单联系人(订单详情页面) * 修改商标交付单联系人(订单详情页面)
...@@ -16,16 +17,20 @@ class CustomerContactsService extends ServiceBase { ...@@ -16,16 +17,20 @@ class CustomerContactsService extends ServiceBase {
*/ */
async updateContacts(obj){ async updateContacts(obj){
var user = obj.user; var user = obj.user;
var app = obj.app;
if(!user || !user.id){ if(!user || !user.id){
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
if (!app || !app.id) {
return system.getResultFail(-100, "未知渠道");
}
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
if(!deliveryOrderNo){ if(!deliveryOrderNo){
return system.getResultFail(-101, "deliveryOrderNo参数错误"); return system.getResultFail(-101, "deliveryOrderNo参数错误");
} }
// 1.获取交付单信息 // 1.获取交付单信息
var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({ var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
where:{deliveryOrderNo:deliveryOrderNo}, where:{deliveryOrderNo:deliveryOrderNo,app_id:app.id},
raw:true raw:true
}); });
if(!ordertmproduct || !ordertmproduct.id){ if(!ordertmproduct || !ordertmproduct.id){
...@@ -55,7 +60,9 @@ class CustomerContactsService extends ServiceBase { ...@@ -55,7 +60,9 @@ class CustomerContactsService extends ServiceBase {
contactsObj["tel"]=obj.tel; contactsObj["tel"]=obj.tel;
} }
//修改联系人信息 //修改联系人信息
await self.dao.model.update(contactsObj, { where: { deliveryOrderNo:deliveryOrderNo }, transaction: t }); await self.dao.model.update(contactsObj, { where: { deliveryOrderNo:deliveryOrderNo,app_id: app.id }, transaction: t });
var logMsg = { sourceOrderNo: deliveryOrderNo, opContent: "修改订单信息", app_id: app.id };
await self.orderflowDao.create(logMsg, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
......
igirl-channel/app/base/service/impl/dborder/customerinfoSve.js
...@@ -7,6 +7,7 @@ class CustomerInfoService extends ServiceBase { ...@@ -7,6 +7,7 @@ class CustomerInfoService extends ServiceBase {
super("dborder", ServiceBase.getDaoName(CustomerInfoService)); super("dborder", ServiceBase.getDaoName(CustomerInfoService));
this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve"); this.ordertmproductSve = system.getObject("service.dborder.ordertmproductSve");
this.trademarkDao = system.getObject("db.dbtrademark.trademarkDao"); this.trademarkDao = system.getObject("db.dbtrademark.trademarkDao");
this.orderflowDao = system.getObject("db.dborder.orderflowDao");
} }
/** /**
* 修改申请人信息（订单详情页面使用） * 修改申请人信息（订单详情页面使用）
...@@ -25,16 +26,20 @@ class CustomerInfoService extends ServiceBase { ...@@ -25,16 +26,20 @@ class CustomerInfoService extends ServiceBase {
*/ */
async updateCustomerInfo(obj){ async updateCustomerInfo(obj){
var user = obj.user; var user = obj.user;
var app = obj.app;
if(!user || !user.id){ if(!user || !user.id){
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
if (!app || !app.id) {
return system.getResultFail(-100, "未知渠道");
}
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
if(!deliveryOrderNo){ if(!deliveryOrderNo){
return system.getResultFail(-101, "deliveryOrderNo参数错误"); return system.getResultFail(-101, "deliveryOrderNo参数错误");
} }
// 1.获取交付单信息 // 1.获取交付单信息
var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({ var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
where:{deliveryOrderNo:deliveryOrderNo}, where:{deliveryOrderNo:deliveryOrderNo,app_id:app.id},
raw:true raw:true
}); });
if(!ordertmproduct || !ordertmproduct.id){ if(!ordertmproduct || !ordertmproduct.id){
...@@ -50,7 +55,7 @@ class CustomerInfoService extends ServiceBase { ...@@ -50,7 +55,7 @@ class CustomerInfoService extends ServiceBase {
} }
var customerinfo = await this.dao.model.findOne({ var customerinfo = await this.dao.model.findOne({
where:{ where:{
deliveryOrderNo:deliveryOrderNo deliveryOrderNo:deliveryOrderNo,app_id:app.id
}, },
raw:true raw:true
}); });
...@@ -102,8 +107,10 @@ class CustomerInfoService extends ServiceBase { ...@@ -102,8 +107,10 @@ class CustomerInfoService extends ServiceBase {
if(ordertmproduct.deliveryStatus=="dsccl"){ if(ordertmproduct.deliveryStatus=="dsccl"){
await self.ordertmproductSve.update({id:ordertmproduct.id,deliveryStatus:"dsh"},t); await self.ordertmproductSve.update({id:ordertmproduct.id,deliveryStatus:"dsh"},t);
} }
await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo},transaction:t}); await self.trademarkDao.model.update({officialType:"dsh"},{where:{deliveryOrderNo:deliveryOrderNo,app_id:app.id},transaction:t});
} }
var logMsg = { sourceOrderNo: deliveryOrderNo, opContent: "修改订单信息", app_id: app.id };
await self.orderflowDao.create(logMsg, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
...@@ -121,16 +128,20 @@ class CustomerInfoService extends ServiceBase { ...@@ -121,16 +128,20 @@ class CustomerInfoService extends ServiceBase {
*/ */
async updateOfficial(obj){ async updateOfficial(obj){
var user = obj.user; var user = obj.user;
var app = obj.app;
if(!user || !user.id){ if(!user || !user.id){
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
if (!app || !app.id) {
return system.getResultFail(-100, "未知渠道");
}
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
if(!deliveryOrderNo){ if(!deliveryOrderNo){
return system.getResultFail(-101, "deliveryOrderNo参数错误"); return system.getResultFail(-101, "deliveryOrderNo参数错误");
} }
// 1.获取交付单信息 // 1.获取交付单信息
var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({ var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
where:{deliveryOrderNo:deliveryOrderNo}, where:{deliveryOrderNo:deliveryOrderNo,app_id:app.id},
raw:true raw:true
}); });
if(!ordertmproduct || !ordertmproduct.id){ if(!ordertmproduct || !ordertmproduct.id){
...@@ -146,7 +157,7 @@ class CustomerInfoService extends ServiceBase { ...@@ -146,7 +157,7 @@ class CustomerInfoService extends ServiceBase {
} }
var customerinfo = await this.dao.model.findOne({ var customerinfo = await this.dao.model.findOne({
where:{ where:{
deliveryOrderNo:deliveryOrderNo deliveryOrderNo:deliveryOrderNo,app_id:app.id
}, },
raw:true raw:true
}); });
...@@ -196,6 +207,8 @@ class CustomerInfoService extends ServiceBase { ...@@ -196,6 +207,8 @@ class CustomerInfoService extends ServiceBase {
} }
await self.ordertmproductSve.update(otpObj,t);//商标交付单 修改盖章委托书、说明文件 await self.ordertmproductSve.update(otpObj,t);//商标交付单 修改盖章委托书、说明文件
var logMsg = { sourceOrderNo: deliveryOrderNo, opContent: "修改订单信息", app_id: app.id };
await self.orderflowDao.create(logMsg, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
......
igirl-channel/app/base/service/impl/dbtrademark/trademarkSve.js
...@@ -51,16 +51,20 @@ class TradeMarkService extends ServiceBase { ...@@ -51,16 +51,20 @@ class TradeMarkService extends ServiceBase {
*/ */
async updateTmInfo(obj) { async updateTmInfo(obj) {
var user = obj.user; var user = obj.user;
var app = obj.app;
if (!user || !user.id) { if (!user || !user.id) {
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
if (!app || !app.id) {
return system.getResultFail(-100, "未知渠道");
}
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
if (!deliveryOrderNo) { if (!deliveryOrderNo) {
return system.getResultFail(-101, "deliveryOrderNo参数错误"); return system.getResultFail(-101, "deliveryOrderNo参数错误");
} }
// 1.获取交付单信息 // 1.获取交付单信息
var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({ var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
where: { deliveryOrderNo: deliveryOrderNo }, where: { deliveryOrderNo: deliveryOrderNo,app_id:app.id },
raw: true raw: true
}); });
if (!ordertmproduct || !ordertmproduct.id) { if (!ordertmproduct || !ordertmproduct.id) {
...@@ -98,6 +102,8 @@ class TradeMarkService extends ServiceBase { ...@@ -98,6 +102,8 @@ class TradeMarkService extends ServiceBase {
otpObj["notes"] = obj.notes; otpObj["notes"] = obj.notes;
} }
await self.ordertmproductSve.dao.update(otpObj, t);//商标交付单 修改商标图样 await self.ordertmproductSve.dao.update(otpObj, t);//商标交付单 修改商标图样
var logMsg = { sourceOrderNo: deliveryOrderNo, opContent: "修改订单信息", app_id: app.id };
await self.orderflowDao.create(logMsg, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
...@@ -113,17 +119,21 @@ class TradeMarkService extends ServiceBase { ...@@ -113,17 +119,21 @@ class TradeMarkService extends ServiceBase {
*/ */
async updateNclInfo(obj) { async updateNclInfo(obj) {
var user = obj.user; var user = obj.user;
var app = obj.app;
var self = this; var self = this;
if (!user || !user.id) { if (!user || !user.id) {
return system.getResultFail(-100, "未知用户"); return system.getResultFail(-100, "未知用户");
} }
if (!app || !app.id) {
return system.getResultFail(-100, "未知渠道");
}
var deliveryOrderNo = obj.deliveryOrderNo; var deliveryOrderNo = obj.deliveryOrderNo;
if (!deliveryOrderNo) { if (!deliveryOrderNo) {
return system.getResultFail(-101, "deliveryOrderNo参数错误"); return system.getResultFail(-101, "deliveryOrderNo参数错误");
} }
// 1.获取交付单信息 // 1.获取交付单信息
var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({ var ordertmproduct = await this.ordertmproductSve.dao.model.findOne({
where: { deliveryOrderNo: deliveryOrderNo }, where: { deliveryOrderNo: deliveryOrderNo,app_id:app.id },
raw: true raw: true
}); });
if (!ordertmproduct || !ordertmproduct.id) { if (!ordertmproduct || !ordertmproduct.id) {
...@@ -192,6 +202,8 @@ class TradeMarkService extends ServiceBase { ...@@ -192,6 +202,8 @@ class TradeMarkService extends ServiceBase {
updateuser: user.nickname updateuser: user.nickname
}; };
await self.ordertmproductSve.dao.update(otpObj, t);//商标交付单 修改大类列表 await self.ordertmproductSve.dao.update(otpObj, t);//商标交付单 修改大类列表
var logMsg = { sourceOrderNo: deliveryOrderNo, opContent: "修改订单信息", app_id: app.id };
await self.orderflowDao.create(logMsg, t);
return system.getResultSuccess(); return system.getResultSuccess();
}) })
} }
......
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