业绩提成BUG修复

hx-sale/src/main/java/com/fjhx/sale/entity/commission/po/Commission.java

@@ -140,4 +140,9 @@ public class Commission extends BasePo {
      * 采购合同币种
      */
     private String purchaseCurrency;
+
+    /**
+     * 退税金额
+     */
+    private BigDecimal taxReturnAmount;
 }

hx-sale/src/main/java/com/fjhx/sale/service/commission/impl/CommissionServiceImpl.java

@@ -44,6 +44,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
         QueryWrapper<Object> query = Wrappers.query();
         query.eq(ObjectUtil.isNotEmpty(dto.getUserId()), "c.user_id", dto.getUserId());
         query.eq(ObjectUtil.isNotEmpty(dto.getTime()), "DATE_FORMAT(c.create_time,'%Y')", dto.getTime());
+        query.like(ObjectUtil.isNotEmpty(dto.getKeyword()),"c.contract_code",dto.getKeyword());
         query.orderByDesc("c.create_time");
         Page<CommissionVo> page = this.baseMapper.getPage(dto.getPage(), query);
         return page;
@@ -124,11 +125,10 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
 
         //计算净收入（总收入 - 总支出 - 售后 - 公共 - 总办）
         BigDecimal netIncome = commissionDto.getTotalIncome()
-                .subtract(commissionDto.getTotalExpenses()
-                        .subtract(commissionDto.getAfterSalesAmount())
-                        .subtract(commissionDto.getPublicAmount())
-                        .subtract(commissionDto.getHaveOverallAmount())
-                ) ;
+                .subtract(commissionDto.getTotalExpenses())
+                .subtract(commissionDto.getAfterSalesAmount())
+                .subtract(commissionDto.getPublicAmount())
+                .subtract(commissionDto.getHaveOverallAmount());
         //计算部门提成金额：（总收入 - 总支出 - 售后 - 公共 - 总办） * 部门占比
         commissionDto.setDepartmentalCommission(netIncome.
                 multiply(commissionRule.getDepartmentalRatio())