Skip to content

Z
zhichan
Commit 85631ac0 by 宋毅
Options

tj

parent 0c9de40e
Showing with 10 additions and 10 deletions
igirl-channel/app/base/db/impl/dborder/orderDao.js
...@@ -43,19 +43,19 @@ class OrderDao extends Dao { ...@@ -43,19 +43,19 @@ class OrderDao extends Dao {
var orderObj = { var orderObj = {
app_id: user.app_id,// app_id: user.app_id,//
orderNo: ordercode,// 订单号 orderNo: ordercode,// 订单号
channelServiceNo: channelOrder.channelServiceNo,// 渠道服务单号 channelServiceNo: channelOrder.channelServiceNo || "",// 渠道服务单号
channelOrderNo: channelOrder.channelOrderNo,//渠道订单号列表，多个以,隔开 channelOrderNo: channelOrder.channelOrderNo || "",//渠道订单号列表，多个以,隔开
payTime: channelOrder.payTime || null, payTime: channelOrder.payTime || null,
itemCode: productItem.itemCode,// itemCode: productItem.itemCode,//
itemName: productItem.itemName,// itemName: productItem.itemName,//
channelItemCode: productItem.channelItemCode,// 渠道产品编码 channelItemCode: productItem.channelItemCode,// 渠道产品编码
channelItemName: productItem.channelItemName,// 渠道产品名称 channelItemName: productItem.channelItemName,// 渠道产品名称
salesNum: channelOrder.quantity,//项目订单数量（即服务项目的倍数，默认值为1） salesNum: channelOrder.quantity || 1,//项目订单数量（即服务项目的倍数，默认值为1）
salesDiliverNum: channelOrder.salesDiliverNum,//项目订单交付数量（即与项目订单数量相对应） salesDiliverNum: channelOrder.salesDiliverNum || 0,//项目订单交付数量（即与项目订单数量相对应）
minitermNum: channelOrder.nclCount || 10 * channelOrder.quantity,//订单小项数量 minitermNum: channelOrder.nclCount || 10 * channelOrder.quantity,//订单小项数量
minitermDiliverNum: channelOrder.minitermDiliverNum,//订单小项交付数量 minitermDiliverNum: channelOrder.minitermDiliverNum || 0,//订单小项交付数量
orderType: orderType || "dkxd",// 订单类型，zzdd: 自主订单,dkxd: 代客下单 orderType: orderType || "dkxd",// 订单类型，zzdd: 自主订单,dkxd: 代客下单
orderPayStatus: channelOrder.payStatus,// 订单付款状态dfk: 待付款, zfpz: 已上传支付凭证, yfk: 已付款, ddqx: 订单取消, tkclz: 退款处理中, bfytk: 部分已退款, ytk: 已退款,zfshbtg:支付审核不通过 orderPayStatus: channelOrder.payStatus || "dfk",// 订单付款状态dfk: 待付款, zfpz: 已上传支付凭证, yfk: 已付款, ddqx: 订单取消, tkclz: 退款处理中, bfytk: 部分已退款, ytk: 已退款,zfshbtg:支付审核不通过
totalServiceCharge: orderAmount.totalServiceCharge || 0,// 服务费总额（产品配置的服务费*订单件数） totalServiceCharge: orderAmount.totalServiceCharge || 0,// 服务费总额（产品配置的服务费*订单件数）
totalPublicExpense: orderAmount.totalPublicExpense || 0,// 官费总额（产品配置的官费*订单件数） totalPublicExpense: orderAmount.totalPublicExpense || 0,// 官费总额（产品配置的官费*订单件数）
totalDiscounts: orderAmount.totalDiscounts,// 优惠总额（（服务费总额+官费总额）-订单总额(产品价格×优惠费率×订单件数)>0则有优惠额度） totalDiscounts: orderAmount.totalDiscounts,// 优惠总额（（服务费总额+官费总额）-订单总额(产品价格×优惠费率×订单件数)>0则有优惠额度）
......
igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js
...@@ -167,7 +167,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -167,7 +167,7 @@ class OrderTmProductService extends ServiceBase {
var user = params.user; var user = params.user;
var nclones = params.nclones || null; var nclones = params.nclones || null;
var channelUser = params.channelUser || null; var channelUser = params.channelUser || null;
var channelOrder = params.channelOrder || null; var channelOrder = params.channelOrder || {};
var orderType = params.orderType || "dkxd";//订单类型，zzdd: 自主订单,dkxd: 代客下单 var orderType = params.orderType || "dkxd";//订单类型，zzdd: 自主订单,dkxd: 代客下单
if (!nclones || nclones.length < 1) { if (!nclones || nclones.length < 1) {
...@@ -232,8 +232,8 @@ class OrderTmProductService extends ServiceBase { ...@@ -232,8 +232,8 @@ class OrderTmProductService extends ServiceBase {
appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托 appDataOpType: app.appDataOpType,// 应用数据操作类型：00独立，10全委托，20部分委托
sourceOrderNo: ordercode,//来源单号 sourceOrderNo: ordercode,//来源单号
deliveryOrderNo: await self.getBusUid("jf"), deliveryOrderNo: await self.getBusUid("jf"),
channelServiceNo: channelOrder.channelServiceNo,// 渠道服务单号 channelServiceNo: channelOrder.channelServiceNo || "",// 渠道服务单号
channelOrderNo: channelOrder.channelOrderNo,//渠道订单号列表，多个以,隔开 channelOrderNo: channelOrder.channelOrderNo || "",//渠道订单号列表，多个以,隔开
needNo: channelOrder.needNo || null,//需求单号 needNo: channelOrder.needNo || null,//需求单号
sourceType: tm.sourceType || "00", sourceType: tm.sourceType || "00",
picUrl: tm.picUrl || null,//商标图样 picUrl: tm.picUrl || null,//商标图样
...@@ -284,7 +284,7 @@ class OrderTmProductService extends ServiceBase { ...@@ -284,7 +284,7 @@ class OrderTmProductService extends ServiceBase {
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);
return system.getResultSuccess({ return system.getResultSuccess({
deliveryOrderNo: orderProductObj.deliveryOrderNo, deliveryOrderNo: orderProductObj.deliveryOrderNo,
channelServiceNo: channelOrder.channelServiceNo, orderNo: ordercode,
channelParams: params.channelParams, channelParams: params.channelParams,
tm: returnTm tm: 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