Commit ee66b272 by 孙亚楠

d

parent d4452602
...@@ -138,12 +138,14 @@ class SaasOrderService extends ServiceBase { ...@@ -138,12 +138,14 @@ class SaasOrderService extends ServiceBase {
let result = { let result = {
baseInfo: { baseInfo: {
show: true,
id: order.id, id: order.id,
created_at: order.created_at, created_at: order.created_at,
status_name: order.status_name, status_name: order.status_name,
price: system.f2y(order.price), price: system.f2y(order.price),
}, },
regInfo: { regInfo: {
show: (bminfo.legal_name || bminfo.legal_idno || bminfo.legal_mobile || bminfo.company_names || bminfo.idcard_front || bminfo.idcard_back) ? true : false,
legal_name: bminfo.legal_name, legal_name: bminfo.legal_name,
legal_idno: bminfo.legal_idno, legal_idno: bminfo.legal_idno,
legal_mobile: bminfo.legal_mobile, legal_mobile: bminfo.legal_mobile,
...@@ -152,17 +154,20 @@ class SaasOrderService extends ServiceBase { ...@@ -152,17 +154,20 @@ class SaasOrderService extends ServiceBase {
idcard_back: bminfo.idcard_back, idcard_back: bminfo.idcard_back,
}, },
merchantDeliverInfo: { merchantDeliverInfo: {
show: (deliverInfo.merchant_deliver_man || deliverInfo.merchant_deliver_mobile || deliverInfo.merchant_deliver_addr) ? true : false,
merchant_deliver_man: deliverInfo.merchant_deliver_man, merchant_deliver_man: deliverInfo.merchant_deliver_man,
merchant_deliver_mobile: deliverInfo.merchant_deliver_mobile, merchant_deliver_mobile: deliverInfo.merchant_deliver_mobile,
merchant_deliver_addr: deliverInfo.merchant_deliver_addr, merchant_deliver_addr: deliverInfo.merchant_deliver_addr,
}, },
payInfo: { payInfo: {
show: (payInfo.created_at || payInfo.id) ? true : false,
amount: system.f2y(payInfo.amount), amount: system.f2y(payInfo.amount),
created_at: payInfo.created_at, created_at: payInfo.created_at,
trade_no: (payInfo.trade_no || payInfo.id), trade_no: (payInfo.trade_no || payInfo.id),
pay_voucher_img: payInfo.pay_voucher_img, pay_voucher_img: payInfo.pay_voucher_img,
}, },
deliverInfo: { deliverInfo: {
show: (deliverInfo.deliver_express_no || deliverInfo.deliver_express_img) ? true: false,
deliver_express_no: deliverInfo.deliver_express_no, deliver_express_no: deliverInfo.deliver_express_no,
deliver_express_img: deliverInfo.deliver_express_img, deliver_express_img: deliverInfo.deliver_express_img,
}, },
......
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