From db7fa6a91b9534ac90e219b6f554c54c43c83a5a Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:28:15 +0800
Subject: [PATCH] update

---
 management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js b/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
index 6db31dc..a3d131d 100644
--- a/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
+++ b/management/guns-admin/src/main/webapp/static/modular/system/tRevenue/tRevenue.js
@@ -50,8 +50,28 @@
                     }
                 }
             },
-            {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle'},
-            {title: '佣金提成', field: 'commissionAmount', visible: true, align: 'center', valign: 'middle'},
+            {title: '金额', field: 'amount', visible: true, align: 'center', valign: 'middle',
+                formatter: function (value, row) {
+                    if (row.businessType === 1){
+                        return '+'+row.amount
+                    }else{
+                        return '-'+row.amount
+                    }
+                }
+            },
+            {title: '佣金抽成', field: 'commissionAmount', visible: true, align: 'center', valign: 'middle',
+                formatter: function (value, row) {
+                    if (row.businessType === 1){
+                        if(row.commissionAmount !== 0){
+                            return '-'+row.commissionAmount
+                        }else {
+                            return 0
+                        }
+                    }else {
+                        return ''
+                    }
+                }
+            },
             {title: '优惠券', field: 'discountedPrice', visible: true, align: 'center', valign: 'middle'},
             {title: '余额', field: 'accountBalance', visible: true, align: 'center', valign: 'middle'},
             {title: '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
@@ -68,11 +88,11 @@
         {title: '操作', visible: true, align: 'center', valign: 'middle',width:150,
             formatter: function (value, row) {
                 if (row.businessType === 1){
-                    return '<a href="#" onclick="TRevenue.searchTRevenueOrderDetail('+row.code+')" style="color:blue">详情</a>'
+                    return `<a href="#" onclick="TRevenue.searchTRevenueOrderDetail('${row.code}')" style="color:blue">详情</a>`
                 }else if (row.businessType === 11){
-                    return '<a href="#" onclick="TRevenue.searchTRevenueCommissionDetail('+row.code+')" style="color:blue">详情</a>'
+                    return `<a href="#" onclick="TRevenue.searchTRevenueCommissionDetail('${row.code}')" style="color:blue">详情</a>`
                 }else if (row.businessType === 12){
-                    return '<a href="#" onclick="TRevenue.searchTRevenueBalanceDetail('+row.code+')" style="color:blue">详情</a>'
+                    return `<a href="#" onclick="TRevenue.searchTRevenueBalanceDetail('${row.code}')" style="color:blue">详情</a>`
                 }
             }
         }
@@ -159,6 +179,7 @@
  * 打开查看支付订单详情(使用中)
  */
 TRevenue.searchTRevenueOrderDetail = function (code) {
+    console.log(code)
     var index = layer.open({
         type: 2,
         title: '支付订单详情',

--
Gitblit v1.7.1