fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/financial/vo/TopDivideOrderVo.java

@@ -104,4 +104,6 @@ public class TopDivideOrderVo {
 	private Long roleId;
 	@ApiModelProperty("订单标准价格(合同金额)")
 	private BigDecimal orderPrice;
+	@ApiModelProperty("税前佣金")
+	private BigDecimal pretaxBrokerage;
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopDivideOrderMapper.xml

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.divide_company_money,
             oo.divide_seller_money,
             oo.brokerage,
+            oo.pretax_brokerage,
             oo.order_price,
             oo.order_from,
             r.role_name,
@@ -42,10 +43,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tdo.order_type = 1
           AND tdo.divide_log_id = #{divideLogId}
         <if test="startPrice != null and startPrice != ''">
-            AND (oo.order_price - oo.brokerage) <![CDATA[ >= ]]> #{startPrice}
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ >= ]]> #{startPrice}
         </if>
         <if test="endPrice != null and endPrice != ''">
-            AND (oo.order_price - oo.brokerage) <![CDATA[ <= ]]> #{endPrice}
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ <= ]]> #{endPrice}
         </if>
     </select>
 
@@ -58,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             oo.remark,
             oo.order_price,
             oo.brokerage,
+            oo.pretax_brokerage,
             tor.divide_money,
             tor.refund_time as order_time
         FROM
@@ -70,10 +72,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tdo.order_type = 2
           AND tdo.divide_log_id = #{divideLogId}
         <if test="startPrice != null and startPrice != ''">
-            AND (oo.order_price - oo.brokerage) <![CDATA[ >= ]]> #{startPrice}
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ >= ]]> #{startPrice}
         </if>
         <if test="endPrice != null and endPrice != ''">
-            AND (oo.order_price - oo.brokerage) <![CDATA[ <= ]]> #{endPrice}
+            AND (oo.order_price - oo.pretax_brokerage) <![CDATA[ <= ]]> #{endPrice}
         </if>
     </select>