Commit c74f6a04 by 宋毅

修改订单

parent 6a1147e8
......@@ -28,6 +28,9 @@ class OrderAPI extends APIBase {
async opActionProcess(pobj, action_type, req) {
var opResult = null;
switch (action_type) {
case "getOrderInfoByChannelOrderNo"://通过渠道订单号获取订单信息
opResult = await this.orderinfoSve.getOrderInfoByChannelOrderNo(pobj.actionBody.channelOrderNo);
break;
case "updateOrderPushStatus"://更新订单推送状态
opResult = await this.orderinfoSve.updateOrderPushStatus(pobj.actionBody);
break;
......@@ -172,7 +175,6 @@ class OrderAPI extends APIBase {
}
return refResult;
}
}
module.exports = OrderAPI;
\ No newline at end of file
......@@ -5,6 +5,7 @@ const ServiceBase = require("../../sve.base");
const uuidv4 = require('uuid/v4');
const sequelize = require('sequelize');
const platformConfig = require("../../../db/metadata/apps/platform.js");
class OrderInfoService extends ServiceBase {
constructor() {
super("dbcorder", ServiceBase.getDaoName(OrderInfoService));
......@@ -21,8 +22,34 @@ class OrderInfoService extends ServiceBase {
this.orderinfofqDao = system.getObject('db.dbcorder.orderinfofqDao');
}
async getOrderInfoByChannelOrderNo(channelOrderNo) {
var item = await this.dao.getItemStatusByOrderNo(channelOrderNo)
if (!item) {
return system.getResult(null, "order data is empty!");
}
if (item.orderStatus > 1) {
return system.getResult(null, "order status is pay!");
}
var resultParams = {
order_info: item,
delivery_content: null,//包含订单联系人orderContact
product_info: null
};
var deliveryInfoResult = await this.getOrderDeliveryInfo(null, {orderNo: item.orderNo});
if (deliveryInfoResult && deliveryInfoResult.status == 0) {
resultParams.delivery_content = deliveryInfoResult.data;
}
var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(item.orderNo);
if (orderProductItem) {
resultParams.product_info = JSON.parse(orderProductItem.serviceItemSnapshot);
}
return system.getResultSuccess(resultParams);
}
/**
* 修改需求商机推送状态
* 修改订单商机推送状态
* @param actionBody
* @returns {Promise<void>}
*/
......@@ -177,6 +204,7 @@ class OrderInfoService extends ServiceBase {
}//渠道购买存在购买者手机号
var orderReceiptVoucher = await this.orderReceiptVoucherDao.create(orderReceiptVoucherObj, t);
}
/**
* 创建商标订单
* @param {*} pobj
......@@ -323,25 +351,24 @@ class OrderInfoService extends ServiceBase {
}
async createTmOrder(pobj) {
var packagingTmResult = await this.packagingTmDeliveryData(pobj, pobj.actionBody);
if (packagingTmResult.status != 0) {
return packagingTmResult;
}
var self = this;
return await self.db.transaction(async function (t) {
var orderNo = await self.getBusUid("tm" + pobj.appInfo.uapp_id);
var item = await self.createOrder(pobj, orderNo, t);
await self.dao.addOrderDelivery(pobj.actionBody.deliveryData, orderNo, t);
return system.getResultSuccess({
orderNo: orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || ""
});
});
}
// async createTmOrder(pobj) {
// var packagingTmResult = await this.packagingTmDeliveryData(pobj, pobj.actionBody);
// if (packagingTmResult.status != 0) {
// return packagingTmResult;
// }
// var self = this;
// return await self.db.transaction(async function (t) {
// var orderNo = await self.getBusUid("tm" + pobj.appInfo.uapp_id);
// var item = await self.createOrder(pobj, orderNo, t);
// await self.dao.addOrderDelivery(pobj.actionBody.deliveryData, orderNo, t);
// return system.getResultSuccess({
// orderNo: orderNo,
// channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
// channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || orderNo,
// channelParams: pobj.actionBody.channelOrder.channelParams || ""
// });
// });
// }
async packagingTmDeliveryData(pobj, actionBody) {//重新组装商标交付信息
if (!actionBody.deliveryData || Object.keys(actionBody.deliveryData).length == 0) {
......@@ -475,12 +502,24 @@ class OrderInfoService extends ServiceBase {
}
*/
async createTmOrder(pobj) {
var packagingTmResult = await this.packagingTmDeliveryData(pobj, pobj.actionBody);
let packagingTmResult = await this.packagingTmDeliveryData(pobj, pobj.actionBody);
if (packagingTmResult.status != 0) {
return packagingTmResult;
}
var self = this;
let self = this;
return await self.db.transaction(async function (t) {
if (pobj.actionBody.channelOrder && pobj.actionBody.channelOrder.channelOrderNo) {
let rtn = await self.dao.findOne({channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo}, t);
if (rtn) {
return system.getResultSuccess({
orderNo: rtn.orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || rtn.orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || rtn.orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || "",
opType: "query"
});
}
}
const orderNo = (await self.getBusUid((pobj.actionBody.quantity > 1 ? "cntm" : "tm") + pobj.appInfo.uapp_id)).toUpperCase();
await self.createOrder(pobj, orderNo, t);
await self.dao.addOrderDelivery(pobj.actionBody.deliveryData, orderNo, t);
......@@ -488,7 +527,8 @@ class OrderInfoService extends ServiceBase {
orderNo: orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || ""
channelParams: pobj.actionBody.channelOrder.channelParams || "",
opType: "add"
});
});
}
......@@ -516,16 +556,19 @@ class OrderInfoService extends ServiceBase {
// }
return system.getResultSuccess(deliveryData);
}
async createLogoOrder(pobj) {
var packagingTmResult = await this.packagingLogoDeliveryData(pobj, pobj.actionBody);
if (packagingTmResult.status != 0) {
return packagingTmResult;
}
if (pobj.actionBody.deliveryData.color_description) {
pobj.actionBody.deliveryData.color_description = pobj.actionBody.deliveryData.color_description.replace(/\"/g, "\\\"");;
pobj.actionBody.deliveryData.color_description = pobj.actionBody.deliveryData.color_description.replace(/\"/g, "\\\"");
;
}
if (pobj.actionBody.deliveryData.font_description) {
pobj.actionBody.deliveryData.font_description = pobj.actionBody.deliveryData.font_description.replace(/\"/g, "\\\"");;
pobj.actionBody.deliveryData.font_description = pobj.actionBody.deliveryData.font_description.replace(/\"/g, "\\\"");
;
}
pobj.actionBody.deliveryData.itemCode = "znlogosjcp";
var sql = "SELECT * FROM " +
......@@ -551,6 +594,7 @@ class OrderInfoService extends ServiceBase {
});
});
}
/**
* 创建其他订单
* @param {*} pobj
......@@ -560,13 +604,14 @@ class OrderInfoService extends ServiceBase {
return await self.db.transaction(async function (t) {
var orderNo = await self.getBusUid("ot" + pobj.appInfo.uapp_id);
if (pobj.actionBody.channelOrder && pobj.actionBody.channelOrder.channelOrderNo) {
var rtn = await self.dao.findOne({ channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo }, t);
var rtn = await self.dao.findOne({channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo}, t);
if (rtn) {
return system.getResultSuccess({
orderNo: rtn.orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || rtn.orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || rtn.orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || ""
channelParams: pobj.actionBody.channelOrder.channelParams || "",
opType: "query"
});
}
}
......@@ -576,7 +621,8 @@ class OrderInfoService extends ServiceBase {
orderNo: orderNo,
channelServiceNo: pobj.actionBody.channelOrder.channelServiceNo || orderNo,
channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo || orderNo,
channelParams: pobj.actionBody.channelOrder.channelParams || ""
channelParams: pobj.actionBody.channelOrder.channelParams || "",
opType: "add"
});
});
......@@ -590,7 +636,7 @@ class OrderInfoService extends ServiceBase {
return await self.db.transaction(async function (t) {
var orderNo = await self.getBusUid("ot" + pobj.appInfo.uapp_id);
if (pobj.actionBody.channelOrder && pobj.actionBody.channelOrder.channelOrderNo) {
var count = await self.dao.findCount({ where: { channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo } });
var count = await self.dao.findCount({where: {channelOrderNo: pobj.actionBody.channelOrder.channelOrderNo}});
if (count > 0) {
return system.getResultFail(-1, "订单不能重复创建s");
}
......@@ -658,7 +704,7 @@ class OrderInfoService extends ServiceBase {
var self = this;
return await self.db.transaction(async function (t) {
var orderNo = await self.getBusUid("ic" + pobj.appInfo.uapp_id);
var needsolutioninfo = await self.needsolutionDao.findOne({ channelSolutionNo: pobj.actionBody.solutionBizId }, t)
var needsolutioninfo = await self.needsolutionDao.findOne({channelSolutionNo: pobj.actionBody.solutionBizId}, t)
pobj.actionBody.channelOrder = {
channelServiceNo: pobj.actionBody.orderNo,
channelOrderNo: pobj.actionBody.orderNo,
......@@ -667,7 +713,7 @@ class OrderInfoService extends ServiceBase {
}
var item = await self.createOrder(pobj, orderNo, t);
// needsolutioninfo.status = "ywc";
await self.needsolutionDao.update({ id: needsolutioninfo.id, status: "dqr" }, t);
await self.needsolutionDao.update({id: needsolutioninfo.id, status: "dqr"}, t);
self.dao.addOrderDelivery(pobj.actionBody.deliveryData, orderNo, t);
return system.getResultSuccess({
orderNo: orderNo,
......@@ -679,9 +725,10 @@ class OrderInfoService extends ServiceBase {
}
//接收方案状态及支付信息
async receiveSolutionPayInfo(channelSolutionNo, status, orderPrice, self, t) {
var needsolutioninfo = await self.needsolutionDao.findOne({ channelSolutionNo: channelSolutionNo }, t);
var needsolutioninfo = await self.needsolutionDao.findOne({channelSolutionNo: channelSolutionNo}, t);
if (!needsolutioninfo || !needsolutioninfo.id) {
return system.getResultFail(-400, "未知方案");
}
......@@ -708,7 +755,6 @@ class OrderInfoService extends ServiceBase {
//----------------------订单创建-----------end----------------------
//=================================修改订单信息==============end======================================
async updateContacts(pobj, actionBody) {//修改订单联系人
......@@ -742,7 +788,7 @@ class OrderInfoService extends ServiceBase {
if (actionBody.orderContact.fax) {
updateFields['fax'] = actionBody.orderContact.fax
}
this.ordercontactsDao.updateByWhere(updateFields, { where: { sourceOrderNo: actionBody.orderNo } });
this.ordercontactsDao.updateByWhere(updateFields, {where: {sourceOrderNo: actionBody.orderNo}});
if (actionBody.notes) {
actionBody.isGetContact = 0;
var itemResult = await this.getOrderDeliveryInfo(pobj, actionBody);
......@@ -753,7 +799,7 @@ class OrderInfoService extends ServiceBase {
}
}
}//修改备注
var resultParams = { orderStatus: orderItem.orderStatus };
var resultParams = {orderStatus: orderItem.orderStatus};
if (orderItem.orderStatus < 4) {
var orderProductItem = await this.orderproductDao.getItemInfoByOrderNo(actionBody.orderNo);
if (orderProductItem) {
......@@ -762,6 +808,7 @@ class OrderInfoService extends ServiceBase {
}
return system.getResultSuccess(resultParams);
}
async updateTmOrder(pobj, actionBody) {//修改商标订单信息
var orderItem = await this.dao.getItemStatusByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id);
if (!orderItem) {
......@@ -866,7 +913,7 @@ class OrderInfoService extends ServiceBase {
}
if (putOrderProductItem.channelItemAppendName) {
self.orderproductDao.updateByWhere(putOrderProductItem, { where: { sourceOrderNo: actionBody.orderNo } });
self.orderproductDao.updateByWhere(putOrderProductItem, {where: {sourceOrderNo: actionBody.orderNo}});
}
}
if (tipsMsg) {
......@@ -940,8 +987,7 @@ class OrderInfoService extends ServiceBase {
const nclThree = tempNclList[g].nclThree;
tempNclList[g].nclPublicExpense = Number(tempNclList[g].nclPublicExpense) + (nclThree.length - 10) * Number(price_additions_item.public_expense);
}
}
else {
} else {
if (price_additions_item) {
isUpdateProduct++;
delete product_info["price_additions_item"];
......@@ -965,11 +1011,11 @@ class OrderInfoService extends ServiceBase {
pfProfitSum: pfProfitSum,//decimal(12,2) //订单平台毛利润总额((100-渠道利润分成比例)/100 * 订单毛利润总额)
channelProfitSum: channelProfitSum//decimal(12,2) //订单渠道分成毛利润总额(订单毛利润总额-平台毛利润总额)
}
self.updateByWhere(putOrderFields, { where: { orderNo: actionBody.orderNo } }, t);
self.orderReceiptVoucherDao.updateByWhere({ totalSum: totalSum }, { where: { sourceOrderNo: actionBody.orderNo } }, t);
self.updateByWhere(putOrderFields, {where: {orderNo: actionBody.orderNo}}, t);
self.orderReceiptVoucherDao.updateByWhere({totalSum: totalSum}, {where: {sourceOrderNo: actionBody.orderNo}}, t);
}
if (isUpdateProduct > 0) {
self.orderproductDao.updateByWhere({ serviceItemSnapshot: JSON.stringify(product_info) }, { where: { sourceOrderNo: actionBody.orderNo } }, t);
self.orderproductDao.updateByWhere({serviceItemSnapshot: JSON.stringify(product_info)}, {where: {sourceOrderNo: actionBody.orderNo}}, t);
}
});
}//未付款进行订单金额修改
......@@ -1008,26 +1054,31 @@ class OrderInfoService extends ServiceBase {
sql = sql.replace('\n', '');
this.customQuery(sql);
}
async addOrderDelivery(data, orderNo, t) {//新增交付信息
await this.dao.addOrderDelivery(data, orderNo, t);
}
async getOrderDelivery(orderNo) {//查询交付信息
var sql = "select * from `c_order_delivery` where sourceOrderNo='" + orderNo + "'";
return await this.customQuery(sql);
}
async delOrder(pobj, actionBody) {//删除订单
await this.dao.delOrderByOrderNo(actionBody.orderNo, pobj.appInfo.uapp_id, pobj.userInfo.channel_userid);
return system.getResultSuccess();
}
//baidureg关闭订单 2020-12-20
async delOrders(pobj, actionBody) {//删除订单
var i;
var len = actionBody.orderNo.length
for(i=0;i<len;i++){
for (i = 0; i < len; i++) {
await this.dao.delOrderByOrderNo(actionBody.orderNo[i], pobj.appInfo.uapp_id, pobj.userInfo.channel_userid);
}
return system.getResultSuccess();
}
// 2020 0918 lin 新增 根据OrderStatus查询订单
async queryVOrderByOrderStatusAndItemCode(pobj, actionBody) {
var sql = "select `id`,`isSolution`,`orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`,"
......@@ -1056,12 +1107,13 @@ class OrderInfoService extends ServiceBase {
// 2020 0923 lin 新增 根据id修改orderStatus,目前用来商标交易更新订单状态
async updateOrderStatusById(pobj, actionBody) {
var orderInfo = await this.dao.model.update({ orderStatus: actionBody.orderStatus }, { where: { id: actionBody.orderId } })
var orderInfo = await this.dao.model.update({orderStatus: actionBody.orderStatus}, {where: {id: actionBody.orderId}})
if (!orderInfo) {
return system.getResult(null, "修改失败");
}
return system.getResultSuccess(orderInfo);
}
//=================================修改订单信息==============end======================================
......@@ -1088,6 +1140,7 @@ class OrderInfoService extends ServiceBase {
}
return system.getResultSuccess(param);
}
/**
* 修改订单收款信息
* @param {*} pobj
......@@ -1096,7 +1149,7 @@ class OrderInfoService extends ServiceBase {
async putReceiptVoucherInfo(pobj, actionBody) {
var isPut = actionBody.isPut || "";
if (isPut > 0) {
await this.orderReceiptVoucherDao.updateByWhere(actionBody.setField, { where: { id: actionBody.receiptVoucherId } });
await this.orderReceiptVoucherDao.updateByWhere(actionBody.setField, {where: {id: actionBody.receiptVoucherId}});
}
return system.getResultSuccess();
}
......@@ -1109,13 +1162,13 @@ class OrderInfoService extends ServiceBase {
actionBody:
{
delivery_content: {},
order_info: { orderStatus: 2 },
order_info: {orderStatus: 2},
product_info: {}
}
};
var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
var paramWhere = { sourceOrderNo: actionBody.orderNo };
var paramWhere = {sourceOrderNo: actionBody.orderNo};
var list = await this.customQuery(sql, paramWhere);
if (list && list.length > 0) {
if (list[0].deliveryContent) {
......@@ -1156,9 +1209,17 @@ class OrderInfoService extends ServiceBase {
paramWhere.uapp_id = pobj.appInfo.uapp_id;
if (pobj.userInfo.channel_userid) {
sql += " and channelUserId=:channelUserId";
sqlCount += " and channelUserId=:channelUserId";
paramWhere.channelUserId = pobj.userInfo.channel_userid;
if (pobj.appInfo.app_code == "jd") {
if (!["syaify", "jd_613f2fd04340f", "13501054442"].includes(pobj.userInfo.channel_userid) && pobj.userInfo.is_admin != 1) {
sql += " and channelUserId=:channelUserId";
sqlCount += " and channelUserId=:channelUserId";
paramWhere.channelUserId = pobj.userInfo.channel_userid;
}
} else {
sql += " and channelUserId=:channelUserId";
sqlCount += " and channelUserId=:channelUserId";
paramWhere.channelUserId = pobj.userInfo.channel_userid;
}
}
if (actionBody.channelItemName) {
sql += " and channelItemName like :channelItemName";
......@@ -1226,25 +1287,25 @@ class OrderInfoService extends ServiceBase {
* @param pobj
* @returns {Promise<void>}
*/
async getOrdersStatisticsByUappId(pobj){
async getOrdersStatisticsByUappId(pobj) {
let ac = pobj.actionBody;
let sql = `SELECT uapp_id,count(*) count,DATE_FORMAT(created_at,'%Y-%m-%d') time FROM c_order_info WHERE deleted_at is null `;
let whereParam = {};
if(ac.start&&ac.end){
if (ac.start && ac.end) {
sql += ` AND created_at >= :start AND created_at <= :end`;
whereParam.start = ac.start;
whereParam.end = ac.end;
}
if(ac.type_code){
if (ac.type_code) {
sql += ` AND typeCode = :type_code`;
whereParam.type_code = ac.type_code;
}
if(ac.status){
if (ac.status) {
sql += ` AND orderStatus = :status`;
whereParam.status = ac.status;
}
sql += ` GROUP BY uapp_id,DATE_FORMAT(created_at,'%Y-%m-%d') ORDER BY created_at ASC`
let result = await this.customQuery(sql,whereParam);
let result = await this.customQuery(sql, whereParam);
return system.getResultSuccess(result);
}
......@@ -1253,53 +1314,54 @@ class OrderInfoService extends ServiceBase {
* @param pobj
* @returns {Promise<void>}
*/
async getOrdersStatisticsByProduct(pobj){
async getOrdersStatisticsByProduct(pobj) {
let ac = pobj.actionBody;
let sql = `SELECT b.channelItemName typeCode,a.uapp_id,count( * ) count FROM c_order_info a left join c_order_product b on a.orderNo = b.sourceOrderNo WHERE b.itemCode is not null `;
let whereParams = {};
if(ac.start&&ac.end){
if (ac.start && ac.end) {
sql += ` and a.created_at >= :start and a.created_at <= :end `;
whereParams.start = ac.start;
whereParams.end = ac.end;
}
sql += ` GROUP BY b.channelItemName,a.uapp_id`;
let result = await this.customQuery(sql,whereParams);
let result = await this.customQuery(sql, whereParams);
return system.getResultSuccess(result);
}
/**
* 订单对比
* @param pobj
* @returns {Promise<void>}
*/
async getOrdersComparison(pobj){
let ab =pobj.actionBody;
async getOrdersComparison(pobj) {
let ab = pobj.actionBody;
let sql1 = `select count(*) count from c_order_info a left join c_order_product b on a.orderNo = b.sourceOrderNo where a.deleted_at is null `;
let whereParams = {};
if(ab.startNow&&ab.endNow){
if (ab.startNow && ab.endNow) {
sql1 += ` and a.created_at >= :start and a.created_at <= :end`;
whereParams.start = ab.startNow;
whereParams.end = ab.endNow;
}
if(ab.uapp_id){
if (ab.uapp_id) {
sql1 += ` and a.uapp_id = :uapp_id`;
whereParams.uapp_id = ab.uapp_id;
}
if(ab.type_code){
if (ab.type_code) {
sql1 += ` and b.itemCode = :type_code`;
whereParams.type_code = ab.type_code;
}
let totalRet1 = await this.customQuery(sql1,whereParams);
if(ab.startLast&&ab.endLast){
let totalRet1 = await this.customQuery(sql1, whereParams);
if (ab.startLast && ab.endLast) {
whereParams.start = ab.startLast;
whereParams.end = ab.endLast;
}
let totalRet2 = await this.customQuery(sql1,whereParams);
let result ={
now:{
total:totalRet1[0].count,
let totalRet2 = await this.customQuery(sql1, whereParams);
let result = {
now: {
total: totalRet1[0].count,
},
last:{
total:totalRet2[0].count,
last: {
total: totalRet2[0].count,
}
}
return system.getResultSuccess(result);
......@@ -1310,7 +1372,7 @@ class OrderInfoService extends ServiceBase {
* @param pobj
* @returns {Promise<void>}
*/
async getOrdersComparisonList(pobj){
async getOrdersComparisonList(pobj) {
let ab = pobj.actionBody;
let pageSize = Number(ab.pageSize || 20);
let pageIndex = Number(ab.pageIndex || 1);
......@@ -1339,51 +1401,51 @@ class OrderInfoService extends ServiceBase {
WHERE
a.deleted_at IS NULL`;
let totalSql = `select count(DISTINCT(a.orderNo)) count from c_order_info a left join c_order_product b on a.orderNo = b.sourceOrderNo LEFT JOIN center_order.c_order_contacts c on a.orderNo = c.sourceOrderNo where a.deleted_at is null `
let whereParams ={};
if(ab.start&&ab.end){
let whereParams = {};
if (ab.start && ab.end) {
listSql += ` and a.created_at >= :start and a.created_at <= :end`;
totalSql += ` and a.created_at >= :start and a.created_at <= :end`;
whereParams.start = ab.start;
whereParams.end = ab.end;
}
if(ab.uapp_id){
if (ab.uapp_id) {
listSql += ` and a.uapp_id = :uapp_id`;
totalSql += ` and a.uapp_id = :uapp_id`;
whereParams.uapp_id = ab.uapp_id;
}
if(ab.status){
if (ab.status) {
listSql += ` and a.orderStatus = :status`;
totalSql += ` and a.orderStatus = :status`;
whereParams.status = ab.status;
}
if(ab.type_code){
if (ab.type_code) {
listSql += ` and b.itemCode = :type_code`;
totalSql += ` and b.itemCode = :type_code`;
whereParams.type_code = ab.type_code;
}
if(ab.fuzzy_code){
if (ab.fuzzy_code) {
listSql += ` and ( a.orderNo like :fuzzy_code or a.channelOrderNo like :fuzzy_code or c.mobile like :fuzzy_code)`;
totalSql += ` and ( a.orderNo like :fuzzy_code or a.channelOrderNo like :fuzzy_code or c.mobile like :fuzzy_code)`;
whereParams.fuzzy_code = "%"+ab.fuzzy_code+"%";
whereParams.fuzzy_code = "%" + ab.fuzzy_code + "%";
}
listSql += ` order by a.created_at desc`;
if(pageSize != -1){
if (pageSize != -1) {
listSql += ` limit ${pageSize} offset ${from}`;
}
let result = await this.customQuery(listSql,whereParams);
let total = await this.customQuery(totalSql,whereParams);
result = result.map(t =>{
if(t.itemName && t.itemName.endsWith('市')){
let result = await this.customQuery(listSql, whereParams);
let total = await this.customQuery(totalSql, whereParams);
result = result.map(t => {
if (t.itemName && t.itemName.endsWith('市')) {
t.itemName = '公司注册';
}
if(t.itemName &&t.itemName.endsWith('区')){
if (t.itemName && t.itemName.endsWith('区')) {
t.itemName = '云上园区注册';
}
return t;
})
let data ={
total:total[0].count,
rows:result
let data = {
total: total[0].count,
rows: result
}
return system.getResult(data);
}
......@@ -1407,7 +1469,7 @@ class OrderInfoService extends ServiceBase {
async getOrderServiceNoByOrderNo(pobj, actionBody) {//根据订单号获取订单信息
var sql = "select `orderNo`,orderServiceNo from v_order where orderNo=:orderNo LIMIT 1";
var paramWhere = { orderNo: actionBody.orderNo };
var paramWhere = {orderNo: actionBody.orderNo};
var list = await this.customQuery(sql, paramWhere);
if (!list || list.length == 0) {
return system.getResult(null, "订单数据为空,30200");
......@@ -1420,7 +1482,7 @@ class OrderInfoService extends ServiceBase {
var sql = "select `orderNo`,`channelServiceNo`,`channelOrderNo`,`channelUserId`,`ownerUserId`,`payTime`,`quantity`,`serviceQuantity`,`orderStatusName`,`orderStatus`,`totalSum`,`payTotalSum`,`refundSum`," +
" `invoiceApplyStatus`,`opNotes`,`notes`,`channelItemCode`,`channelItemName`,`price`,priceDesc,priceTypeName,channelItemAppendName,`serviceItemCode`,`picUrl`,`serviceItemSnapshot`,`orderSnapshot`,created_at from " +
" v_order where uapp_id=:uapp_id and orderNo=:orderNo LIMIT 1";
var paramWhere = { uapp_id: pobj.appInfo.uapp_id, orderNo: actionBody.orderNo };
var paramWhere = {uapp_id: pobj.appInfo.uapp_id, orderNo: actionBody.orderNo};
var list = await this.customQuery(sql, paramWhere);
if (!list || list.length == 0) {
return system.getResult(null, "订单数据为空,30200");
......@@ -1440,7 +1502,7 @@ class OrderInfoService extends ServiceBase {
async getOrderByChannelOrderNo(pobj, actionBody) {// 根据渠道订单号获取订单
var app = pobj.appInfo;
let orderItem = await this.findOne({ channelOrderNo: actionBody.bizId, uapp_id: app.uapp_id });
let orderItem = await this.findOne({channelOrderNo: actionBody.bizId, uapp_id: app.uapp_id});
if (!orderItem) {
return system.getResult(null, "order data is empty");
}
......@@ -1450,7 +1512,7 @@ class OrderInfoService extends ServiceBase {
async getOrderDeliveryInfo(pobj, actionBody) {//获取订单交付信息
var sql = "select * from c_order_delivery where sourceOrderNo=:sourceOrderNo";
var paramWhere = { sourceOrderNo: actionBody.orderNo };
var paramWhere = {sourceOrderNo: actionBody.orderNo};
var list = await this.customQuery(sql, paramWhere);
var result = system.getResultSuccess();
result.data = {};
......@@ -1468,9 +1530,10 @@ class OrderInfoService extends ServiceBase {
}//是否获取联系人,isGetContact有值则不获取
return result;
}
async getOrderDeliveryFlowInfo(pobj, actionBody) {//获取订单交付流程信息
var sql = "select * from c_delivery_official_flow where sourceOrderNo=:sourceOrderNo";
var paramWhere = { sourceOrderNo: actionBody.sourceOrderNo };
var paramWhere = {sourceOrderNo: actionBody.sourceOrderNo};
var list = await this.customQuery(sql, paramWhere);
var result = system.getResultSuccess();
if (list && list.length > 0) {
......@@ -1480,9 +1543,10 @@ class OrderInfoService extends ServiceBase {
}
return result;
}
async getOrderDeliveryFlowList(pobj, actionBody) {//获取订单交付流程列表信息
var sql = "select * from c_delivery_official_flow where sourceOrderNo IN(:sourceOrderNo)";
var paramWhere = { sourceOrderNo: actionBody.sourceOrderNoList };
var paramWhere = {sourceOrderNo: actionBody.sourceOrderNoList};
var list = await this.customQuery(sql, paramWhere);
var tmpList = [];
if (list && list.length > 0) {
......@@ -1498,6 +1562,7 @@ class OrderInfoService extends ServiceBase {
}
return system.getResultSuccess(tmpList);
}
async getOrderLogInfo(pobj, actionBody) {//获取订单日志信息
var list = await this.flowlogDao.getlogListBySourceOrderNo(actionBody.sourceOrderNo);
return system.getResultSuccess(list);
......@@ -1564,13 +1629,12 @@ class OrderInfoService extends ServiceBase {
await this.flowlogDao.create(orderLog);
var sql = null;
if (addi > 0) {
await this.dao.updateByWhere({ orderStatus: 4 }, { where: { id: item.id } });
await this.dao.updateByWhere({orderStatus: 4}, {where: {id: item.id}});
sql = "INSERT INTO `c_delivery_official_flow` (`sourceOrderNo`,`officialFlow`) VALUE('" +
actionBody.orderNo + "','" + JSON.stringify(updateDeliveryInfo) + "')";
}
else {
} else {
if (updateDeliveryInfo.orderDeliveryStatusName == "证件邮寄环节") {
await this.dao.updateByWhere({ orderStatus: 8 }, { where: { id: item.id } });
await this.dao.updateByWhere({orderStatus: 8}, {where: {id: item.id}});
}
sql = "UPDATE `c_delivery_official_flow` SET officialFlow ='" + JSON.stringify(updateDeliveryInfo) + "' where sourceOrderNo='" + actionBody.orderNo + "'";
sql = sql.replace('\n', '');
......@@ -1670,7 +1734,7 @@ class OrderInfoService extends ServiceBase {
try {
await self.db.transaction(async function (t) {
if (Object.keys(updateOrderFields).length > 0) {
self.updateByWhere(updateOrderFields, { where: { orderNo: actionBody.orderNo } }, t);
self.updateByWhere(updateOrderFields, {where: {orderNo: actionBody.orderNo}}, t);
}
await self.flowlogDao.create(orderLog, t);
});
......@@ -1712,8 +1776,7 @@ class OrderInfoService extends ServiceBase {
tmStatusName: actionBody.tmStatusName
});
addi++;
}
else {
} else {
flowList = deliveryFlowInfo.data;
}
var dataIndex = flowList.findIndex(f => f.tmStatus == actionBody.tmStatus);
......@@ -1730,8 +1793,7 @@ class OrderInfoService extends ServiceBase {
if (addi > 0) {
sql = "INSERT INTO `c_delivery_official_flow` (`sourceOrderNo`,`officialFlow`) VALUE('" +
actionBody.officialInfo.tmRegistNum + "','" + JSON.stringify(flowList) + "')";
}
else {
} else {
sql = "UPDATE `c_delivery_official_flow` SET officialFlow ='" + JSON.stringify(flowList) + "' where sourceOrderNo='" + actionBody.officialInfo.tmRegistNum + "'";
sql = sql.replace('\n', '');
}
......@@ -1749,7 +1811,7 @@ class OrderInfoService extends ServiceBase {
}
var self = this;
await self.db.transaction(async function (t) {
await self.dao.updateByWhere({ orderStatus: 2, payTime: new Date() }, { where: { orderNo: parmas.orderNo } }, t);
await self.dao.updateByWhere({orderStatus: 2, payTime: new Date()}, {where: {orderNo: parmas.orderNo}}, t);
var putFields = {
auditStatus: "tg",
accountType: parmas.pay_type,
......@@ -1760,7 +1822,7 @@ class OrderInfoService extends ServiceBase {
buyerAliLogonId: parmas.buyer_logon_id || "",//买家支付宝账号
notes: parmas.paytime || ""//备注下支付时间
};
await self.orderReceiptVoucherDao.updateByWhere(putFields, { where: { sourceOrderNo: parmas.orderNo } }, t);
await self.orderReceiptVoucherDao.updateByWhere(putFields, {where: {sourceOrderNo: parmas.orderNo}}, t);
var orderLog = {
uapp_id: appInfo.uapp_id,
sourceOrderNo: parmas.orderNo,
......@@ -1809,7 +1871,10 @@ class OrderInfoService extends ServiceBase {
}
var self = this;
await self.db.transaction(async function (t) {
await self.dao.updateByWhere({ orderStatus: 2, payTime: parmas.gmt_payment }, { where: { orderNo: parmas.orderNo } }, t);
await self.dao.updateByWhere({
orderStatus: 2,
payTime: parmas.gmt_payment
}, {where: {orderNo: parmas.orderNo}}, t);
var putFields = {
auditStatus: "tg",
accountType: parmas.pay_type,
......@@ -1821,7 +1886,7 @@ class OrderInfoService extends ServiceBase {
updated_at: parmas.gmt_payment,//该笔交易的买家付款时间。格式为yyyy-MM-dd HH:mm:ss。
notes: parmas.gmt_create || ""//该笔交易创建的时间。格式为yyyy-MM-dd HH:mm:ss。
};
await self.orderReceiptVoucherDao.updateByWhere(putFields, { where: { sourceOrderNo: parmas.orderNo } }, t);
await self.orderReceiptVoucherDao.updateByWhere(putFields, {where: {sourceOrderNo: parmas.orderNo}}, t);
var orderLog = {
uapp_id: appInfo.uapp_id,
sourceOrderNo: parmas.orderNo,
......@@ -1863,7 +1928,7 @@ class OrderInfoService extends ServiceBase {
if (applyAddr.indexOf(addArr[i]) >= 0) {
var sql = "update c_order_region set count=count+1 where province=:province";
// 修改条件 省名字相同,appid相同
var paramWhere = { where: { province: addArr[i], uapp_id: item.uapp_id } };
var paramWhere = {where: {province: addArr[i], uapp_id: item.uapp_id}};
var updateFields = {
count: sequelize.literal('count+1')
}
......@@ -1891,7 +1956,10 @@ class OrderInfoService extends ServiceBase {
}
var self = this;
await self.db.transaction(async function (t) {
await self.dao.updateByWhere({ orderStatus: 2, payTime: parmas.time_end }, { where: { orderNo: parmas.orderNo } }, t);
await self.dao.updateByWhere({
orderStatus: 2,
payTime: parmas.time_end
}, {where: {orderNo: parmas.orderNo}}, t);
var putFields = {
auditStatus: "tg",
accountType: parmas.pay_type,
......@@ -1903,7 +1971,7 @@ class OrderInfoService extends ServiceBase {
updated_at: parmas.time_end,//该笔交易的买家付款时间。格式为yyyy-MM-dd HH:mm:ss。
notes: parmas.gmt_create || ""//该笔交易创建的时间。格式为yyyy-MM-dd HH:mm:ss。
};
await self.orderReceiptVoucherDao.updateByWhere(putFields, { where: { sourceOrderNo: parmas.orderNo } }, t);
await self.orderReceiptVoucherDao.updateByWhere(putFields, {where: {sourceOrderNo: parmas.orderNo}}, t);
var orderLog = {
uapp_id: appInfo.uapp_id,
sourceOrderNo: parmas.orderNo,
......@@ -1950,12 +2018,15 @@ class OrderInfoService extends ServiceBase {
if (item.orderStatus > 1) {
return system.getResultSuccess(null, "order status is pay!");
}
if(item.payTotalSum > parmas.payTotalSum){
return system.getResultFail(-1,'支付金额有误!')
if (item.payTotalSum > parmas.payTotalSum) {
return system.getResultFail(-1, '支付金额有误!')
}
var self = this;
await self.db.transaction(async function (t) {
await self.dao.updateByWhere({ orderStatus: 2, payTime: parmas.time_end }, { where: { orderNo: parmas.orderNo } }, t);
await self.dao.updateByWhere({
orderStatus: 2,
payTime: parmas.time_end
}, {where: {orderNo: parmas.orderNo}}, t);
var putFields = {
auditStatus: "tg",
accountType: parmas.pay_type,
......@@ -1967,7 +2038,7 @@ class OrderInfoService extends ServiceBase {
updated_at: new Date(),//该笔交易的买家付款时间。格式为yyyy-MM-dd HH:mm:ss。
notes: parmas.gmt_create || ""//该笔交易创建的时间。格式为yyyy-MM-dd HH:mm:ss。
};
await self.orderReceiptVoucherDao.updateByWhere(putFields, { where: { sourceOrderNo: parmas.orderNo } }, t);
await self.orderReceiptVoucherDao.updateByWhere(putFields, {where: {sourceOrderNo: parmas.orderNo}}, t);
var orderLog = {
uapp_id: appInfo.uapp_id,
sourceOrderNo: parmas.orderNo,
......@@ -2005,6 +2076,7 @@ class OrderInfoService extends ServiceBase {
}
return system.getResultSuccess(resultParams);
}
//-------------------------------服务商通知订单流程-------------end----------------
//商标方案确认
async tmConfirm(pobj) {
......@@ -2032,7 +2104,7 @@ class OrderInfoService extends ServiceBase {
}
//获取订单信息
var orderinfo = await this.dao.model.findOne({
where: { orderNo: orderNo, uapp_id: app.uapp_id }, raw: true
where: {orderNo: orderNo, uapp_id: app.uapp_id}, raw: true
});
if (!orderinfo || !orderinfo.id) {
return system.getResultFail(-110, "未知订单信息");
......@@ -2115,7 +2187,7 @@ class OrderInfoService extends ServiceBase {
async tmRefuse(pobj) {
var ab = pobj.actionBody;
var app = pobj.appInfo;
var orderinfo = await this.findOne({ channelOrderNo: ab.bizId, uapp_id: app.uapp_id });
var orderinfo = await this.findOne({channelOrderNo: ab.bizId, uapp_id: app.uapp_id});
if (!orderinfo) {
return system.getResultFail(-6001, "订单不存在");
}
......@@ -2132,7 +2204,7 @@ class OrderInfoService extends ServiceBase {
//智能选择 尼斯类获取
async getNclByCode(pobj) {
var sql = "select `business_code`,`ncl_content` from b_business_ncl where business_code=:business_code LIMIT 1";
var paramWhere = { business_code: pobj.actionBody.businessCode };
var paramWhere = {business_code: pobj.actionBody.businessCode};
var result = await this.customQuery(sql, paramWhere);
if (Object.keys(result).length == 0) {
return system.getResultFail(-1, 'find err');
......@@ -2202,7 +2274,7 @@ class OrderInfoService extends ServiceBase {
* @param pobj
* @returns {Promise<void>}
*/
async bulkCreateOrders(pobj,req) {
async bulkCreateOrders(pobj, req) {
let ordersArr = [];
let contactsArr = [];
let productsArr = [];
......@@ -2222,9 +2294,9 @@ class OrderInfoService extends ServiceBase {
}*/
let sql = 'select channelOrderNo from c_order_info where uapp_id = :uapp_id';
let whereParam = {
uapp_id:uapp_id
uapp_id: uapp_id
}
let ret = await this.customQuery(sql,whereParam);
let ret = await this.customQuery(sql, whereParam);
let existIds = ret.map(item => {
return item.channelOrderNo;
})
......@@ -2240,7 +2312,7 @@ class OrderInfoService extends ServiceBase {
orderStatus: 2,//订单状态: 1: 待付款, 2: 已付款, 4: 待服务, 8: 已完成
totalSum: order.price, //订单总额(产品价格×优惠费率×订单件数)
payTotalSum: order.price,
created_at:order.createdAt
created_at: order.createdAt
}
if (order.status == '已签收' || order.status == '服务已完成') {
orderObj['orderStatus'] = 8;
......@@ -2249,13 +2321,13 @@ class OrderInfoService extends ServiceBase {
orderObj['orderStatus'] = 32;
}
ordersArr.push(orderObj);
if(order.personName && order.personMobile){
if (order.personName && order.personMobile) {
let customerContactObj = {
uapp_id: uapp_id,
sourceOrderNo: order.number,
contactName: order.personName || "",
mobile: order.personMobile,
created_at:order.createdAt
created_at: order.createdAt
};
contactsArr.push(customerContactObj);
}
......@@ -2283,21 +2355,21 @@ class OrderInfoService extends ServiceBase {
price: order.price,//定价
quantity: 1,// 订单数量(即产品的倍数,默认值为1)
opPayType: "10",// 操作付款类型:00: 创建订单, 10: 补单
created_at:order.createdAt
created_at: order.createdAt
};
productsArr.push(orderProductObj);
}
let orRet = null;
if(ordersArr.length >0){
if (ordersArr.length > 0) {
orRet = await this.dao.bulkCreate(ordersArr);
if(orRet.length ==0){
return system.getResultFail(-1,'保存订单失败');
if (orRet.length == 0) {
return system.getResultFail(-1, '保存订单失败');
}
}
if(contactsArr.length>0){
if (contactsArr.length > 0) {
this.ordercontactsDao.bulkCreate(contactsArr);
}
if(productsArr.length>0){
if (productsArr.length > 0) {
this.orderproductDao.bulkCreate(productsArr);
}
return system.getResultSuccess(orRet);
......@@ -2314,7 +2386,7 @@ class OrderInfoService extends ServiceBase {
let orderDict = {};
for (let i = 0; i < fqOrders.length; i++) {
ids.push(fqOrders[i].channelOrderNo);
orderDict[fqOrders[i].channelOrderNo] = fqOrders[i].orderStatus;
orderDict[fqOrders[i].channelOrderNo] = fqOrders[i].orderStatus;
}
//根据ids 获取企服通需求
let orders = await this.orderinfoDao.getOrdersByIds(ids);
......@@ -2328,30 +2400,30 @@ class OrderInfoService extends ServiceBase {
let ids6 = [];
let ids7 = [];
//已经存在的需求,更改状态
for(let i = 0;i < orders.length; i++){
for (let i = 0; i < orders.length; i++) {
let order = orders[i];
let obj = {
id:order.id,
id: order.id,
}
if(orderDict[order.channelOrderNo] == 1){
if (orderDict[order.channelOrderNo] == 1) {
ids1.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 2){
if (orderDict[order.channelOrderNo] == 2) {
ids2.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 4){
if (orderDict[order.channelOrderNo] == 4) {
ids3.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 8){
if (orderDict[order.channelOrderNo] == 8) {
ids4.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 16){
if (orderDict[order.channelOrderNo] == 16) {
ids5.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 32){
if (orderDict[order.channelOrderNo] == 32) {
ids6.push(order.channelOrderNo);
}
if(orderDict[order.channelOrderNo] == 64){
if (orderDict[order.channelOrderNo] == 64) {
ids7.push(order.channelOrderNo);
}
setObj.push(obj);
......@@ -2361,82 +2433,83 @@ class OrderInfoService extends ServiceBase {
let createObj = [];
let setFqObj1 = [];
let setFqObj2 = [];
for(let i =0;i<fqOrders.length;i++){
for (let i = 0; i < fqOrders.length; i++) {
let fqOrder = fqOrders[i].dataValues;
if(!existIds.includes(fqOrder.channelOrderNo)){
if (!existIds.includes(fqOrder.channelOrderNo)) {
fqOrder.orderNo = fqOrder.channelOrderNo;
if(['360_icp ','360_edi','360_sbzc'].includes(fqOrder.source_code)){
if (['360_icp ', '360_edi', '360_sbzc'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 50;
}
if(['baidu_edi','baidu_gsreg','baidu_icp','baidu_radiotv','baidu_wangwen'].includes(fqOrder.source_code)){
if (['baidu_edi', 'baidu_gsreg', 'baidu_icp', 'baidu_radiotv', 'baidu_wangwen'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 44;
}
if(['edi_ali','ic_ali','icp_ali','tm_ali','tmd_ali'].includes(fqOrder.source_code)){
if (['edi_ali', 'ic_ali', 'icp_ali', 'tm_ali', 'tmd_ali'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 18;
}
if(['youke'].includes(fqOrder.source_code)){
if (['youke'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 40;
}
if(['tm_jdyun'].includes(fqOrder.source_code)){
if (['tm_jdyun'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 31;
}
if(['tm_bw'].includes(fqOrder.source_code)){
if (['tm_bw'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 35;
}
if(['tm_1688'].includes(fqOrder.source_code)){
if (['tm_1688'].includes(fqOrder.source_code)) {
fqOrder.uapp_id = 0;
}
delete fqOrder.sourceName;
delete fqOrder.source_code;
delete fqOrder.handleStatus;
delete fqOrder.id;
if(!setFqObj2.includes(fqOrder.channelOrderNo)){
if (!setFqObj2.includes(fqOrder.channelOrderNo)) {
createObj.push(fqOrder);
setFqObj2.push(fqOrder.channelOrderNo);
}
}else {
} else {
setFqObj1.push(fqOrder.channelOrderNo);
}
}
//企服通 批量更新状态
let updateRet =[];
if(setObj.length>0){
let updateRet = [];
if (setObj.length > 0) {
// updateRet = await this.needinfoDao.bulkUpdate(setObj);
// 1: 待付款, 2: 已付款, 4: 服务中, 8: 已完成, 16: 已退款, 32: 已作废, 64: 已付部分款
if(ids1.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(1,'待付款',ids1);
if (ids1.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(1, '待付款', ids1);
}
if(ids2.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(2,'已付款',ids2);
if (ids2.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(2, '已付款', ids2);
}
if(ids3.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(4,'服务中',ids3);
if (ids3.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(4, '服务中', ids3);
}
if(ids4.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(8,'已完成',ids4);
if (ids4.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(8, '已完成', ids4);
}
if(ids5.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(16,'已退款',ids5);
if (ids5.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(16, '已退款', ids5);
}
if(ids6.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(32,'已作废',ids6);
if (ids6.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(32, '已作废', ids6);
}
if(ids7.length>0){
updateRet = await this.orderinfoDao.bulkUpdateStatus(64,'已付部分款',ids7);
if (ids7.length > 0) {
updateRet = await this.orderinfoDao.bulkUpdateStatus(64, '已付部分款', ids7);
}
if(updateRet.length > 0){
if (updateRet.length > 0) {
updateRet = await this.orderinfofqDao.bulkUpdate(setFqObj1);
}
}
//企服通 批量添加
if(createObj.length>0){
if (createObj.length > 0) {
updateRet = await this.orderinfoDao.bulkCreate(createObj);
if(updateRet.length >0 ){
if (updateRet.length > 0) {
updateRet = await this.orderinfofqDao.bulkUpdate(setFqObj2);
}
}
return system.getResult(updateRet)
}
}
module.exports = OrderInfoService;
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