优化

admin-web/src/views/admin/investor/index.vue

@@ -168,16 +168,19 @@ const state = reactive({
     data: [] as Array<any>,
     loading: false,
     columns: [
-      {label: '电话号码', prop: 'telephone', resizable: true},
       {label: '客户姓名', prop: 'adminUserName', resizable: true},
+      {label: '电话号码', prop: 'telephone', resizable: true},
       {label: '站点', prop: 'stationId', resizable: true},
+      {label: '分成比例', prop: 'splittingProportion', resizable: true, width: 90},
+      {label: '电损承担比例', prop: 'elecLossProportion', resizable: true, width: 120},
+      {label: '增值税率', prop: 'vatRate', resizable: true, width: 90},
       {label: '账户名', prop: 'accountName', resizable: true},
       {label: '银行卡号', prop: 'bankCardNo', resizable: true, width: 180},
       {label: '开户行名称', prop: 'bankName', resizable: true, width: 180},
       // {label: '备注', prop: 'remark', resizable: true},
-      {label: '状态', prop: 'status', sortable: 'custom', align: 'center'},
-      {label: '创建时间', prop: 'createTime', sortable: 'custom', resizable: true, width: 180},
-      {label: '更新时间', prop: 'updateTime', sortable: 'custom', resizable: true, width: 180},
+      // {label: '状态', prop: 'status', sortable: 'custom', align: 'center'},
+      // {label: '创建时间', prop: 'createTime', sortable: 'custom', resizable: true, width: 180},
+      // {label: '更新时间', prop: 'updateTime', sortable: 'custom', resizable: true, width: 180},
       {
         label: '操作', prop: 'action', width: 180, align: 'center', fixed: 'right',
       }

admin-web/src/views/admin/invoice/index.vue

@@ -234,6 +234,7 @@ const state = reactive({
       {label: '发票金额', prop: 'invoiceAmount', resizable: true, width: 90},
       {label: '订单总额', prop: 'totalMoney', resizable: true, width: 90},
       {label: '总服务费', prop: 'serviceMoney', resizable: true, width: 90},
+      {label: '总服务费', prop: 'elecMoney', resizable: true, width: 90},
       {label: '服务费优惠', prop: 'serviceMoneyDiscount', resizable: true, width: 105},
       {label: '开票人', prop: 'biller', resizable: true, width: 80},
       {label: '公司税号', prop: 'taxId', resizable: true, width: 110},

admin-web/src/views/admin/station/statment/index.vue

@@ -160,22 +160,22 @@ const state = reactive({
     columns: [
       {label: '客户姓名', prop: 'adminUserName', resizable: true, fixed: 'left', width: 150},
       {label: '站点', prop: 'stationId', resizable: true, width: 130},
-      {label: '统计时间（月）', prop: 'statMonth', resizable: true, width: 160},
-      {label: '状态', prop: 'status', sortable: 'custom', align: 'center', width: 130},
-      {label: '实际抄表电费金额', prop: 'actualElecMoney', resizable: true, width: 160},
+      {label: '统计时间（月）', prop: 'statMonth', resizable: true, width: 135},
+      // {label: '状态', prop: 'status', sortable: 'custom', align: 'center', width: 130},
+      {label: '实际抄表电费金额', prop: 'actualElecMoney', resizable: true, width: 150},
       {label: '实际参与分成的服务费', prop: 'actualServiceMoney', resizable: true, width: 180},
-      {label: '实际分成金额', prop: 'actualSplittingAmount', resizable: true, width: 160},
+      {label: '实际分成金额', prop: 'actualSplittingAmount', resizable: true, width: 140},
 
-      {label: '优惠金额', prop: 'discountAmount', resizable: true, width: 160},
-      {label: '电损电费金额', prop: 'elecLossMoney', resizable: true, width: 160},
-      {label: '订单电费金额', prop: 'elecMoney', resizable: true, width: 160},
+      {label: '优惠金额', prop: 'discountAmount', resizable: true, width: 100},
+      {label: '电损电费金额', prop: 'elecLossMoney', resizable: true, width: 120},
+      {label: '订单电费金额', prop: 'elecMoney', resizable: true, width: 120},
 
-      {label: '服务费金额', prop: 'serviceMoney', resizable: true, width: 160},
-      {label: '服务费优惠金额', prop: 'serviceMoneyDiscount', resizable: true, width: 160},
-      {label: '分成金额', prop: 'splittingAmount', resizable: true, width: 160},
+      {label: '服务费金额', prop: 'serviceMoney', resizable: true, width: 120},
+      {label: '服务费优惠金额', prop: 'serviceMoneyDiscount', resizable: true, width: 130},
+      {label: '分成金额', prop: 'splittingAmount', resizable: true, width: 100},
 
-      {label: '订单金额', prop: 'totalMoney', resizable: true, width: 160},
-      {label: '增值税额', prop: 'vatAmount', resizable: true, width: 160},
+      {label: '订单金额', prop: 'totalMoney', resizable: true, width: 100},
+      {label: '增值税额', prop: 'vatAmount', resizable: true, width: 100},
       {label: '创建时间', prop: 'createTime', sortable: 'custom', resizable: true, width: 200, fixed: 'right'},
       {
         label: '操作', prop: 'action', width: 100, align: 'center', fixed: 'right',

service/src/main/java/com/kym/service/miniapp/impl/InvoiceServiceImpl.java

@@ -138,7 +138,8 @@ public class InvoiceServiceImpl extends MPJBaseServiceImpl<InvoiceMapper, Invoic
                 .like(CommUtil.isNotEmptyAndNull(params.getTaxId()), Invoice::getTaxId, params.getTaxId())
                 .like(CommUtil.isNotEmptyAndNull(params.getInvoiceType()), Invoice::getInvoiceType, params.getInvoiceType())
                 .like(CommUtil.isNotEmptyAndNull(params.getEmail()), Invoice::getEmail, params.getEmail())
-                .eq(params.getStatus() != null, Invoice::getStatus, params.getStatus());
+                .eq(params.getStatus() != null, Invoice::getStatus, params.getStatus())
+                .orderByDesc(Invoice::getId);
         var list = selectJoinList(InvoiceVo.class, wrapper);
         return new PageBean<>(list);
     }