修改对账单

pz-admin/src/main/java/com/pz/web/controller/system/DataViewController.java

@@ -119,9 +119,11 @@ public class DataViewController extends BaseController {
         }
         }
         return R.ok(iTotalOrderService.platformRevenue(dataViewBo));
         return R.ok(iTotalOrderService.platformRevenue(dataViewBo));
     }
     }
+
     /**
     /**
      * 平台收益/机构收益
      * 平台收益/机构收益
      */
      */
+    @SaIgnore
     @GetMapping("/platformRevenueDiv")
     @GetMapping("/platformRevenueDiv")
     public R<DataOrderVo> platformRevenueDiv(DataViewBo dataViewBo) {
     public R<DataOrderVo> platformRevenueDiv(DataViewBo dataViewBo) {
         Long roleId = getLoginUser().getRoleId();
         Long roleId = getLoginUser().getRoleId();

pz-admin/src/main/java/com/pz/web/controller/system/EmployeesDivideController.java

@@ -3,6 +3,7 @@ package com.pz.web.controller.system;
 import java.util.List;
 import java.util.List;
 import java.util.Arrays;
 import java.util.Arrays;
 
 
+import cn.dev33.satoken.annotation.SaIgnore;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 import javax.validation.constraints.*;
@@ -40,6 +41,7 @@ public class EmployeesDivideController extends BaseController {
     /**
     /**
      * 查询订单分成记录列表
      * 查询订单分成记录列表
      */
      */
+    @SaIgnore
     @SaCheckPermission("merchant:divide:list")
     @SaCheckPermission("merchant:divide:list")
     @GetMapping("/list")
     @GetMapping("/list")
     public TableDataInfo<EmployeesDivideVo> list(EmployeesDivideBo bo, PageQuery pageQuery) {
     public TableDataInfo<EmployeesDivideVo> list(EmployeesDivideBo bo, PageQuery pageQuery) {

pz-system/src/main/java/com/pz/system/domain/vo/DataOrderVo.java

@@ -10,10 +10,16 @@ public class DataOrderVo implements Serializable {
      * 总数量
      * 总数量
      */
      */
     private double dataSum;
     private double dataSum;
-
+    /**
+     * 订单金额
+     */
     private double orderPrice;
     private double orderPrice;
-
+    /**
+     * 机构分成
+     */
     private double dividePrice;
     private double dividePrice;
-
+    /**
+     * 平台分成
+     */
     private double dividePriceAdmin;
     private double dividePriceAdmin;
 }
 }

pz-system/src/main/resources/mapper/merchant/EmployeesDivideMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 left JOIN sys_user s ON s.user_id = t.uid
                 left JOIN sys_user s ON s.user_id = t.uid
                 left JOIN city ci on ci.id = t.city_id
                 left JOIN city ci on ci.id = t.city_id
                 left join services se on se.id = t.service_id
                 left join services se on se.id = t.service_id
+        <where>
             <if test="bo.orderSn != null and bo.orderSn != ''">
             <if test="bo.orderSn != null and bo.orderSn != ''">
                 and t.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
                 and t.order_sn LIKE CONCAT('%', #{bo.orderSn}, '%')
             </if>
             </if>
@@ -57,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.companyId != null ">
             <if test="bo.companyId != null ">
                 and ed.company_id = #{bo.companyId}
                 and ed.company_id = #{bo.companyId}
             </if>
             </if>
+        </where>
     </select>
     </select>